Skip to content

Commit

Permalink
Update Lilypad references to reflect moving repo ownership/GH org
Browse files Browse the repository at this point in the history
  • Loading branch information
Zorlin committed Mar 18, 2024
1 parent 5998449 commit 8ce9a6d
Show file tree
Hide file tree
Showing 60 changed files with 193 additions and 193 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
release:
go build -v -ldflags="\
-X 'github.com/bacalhau-project/lilypad/cmd/lilypad.VERSION=$$(git describe --tags --abbrev=0)' \
-X 'github.com/bacalhau-project/lilypad/cmd/lilypad.COMMIT_SHA=$$(git rev-parse HEAD)' \
-X 'github.com/lilypad-tech/lilypad/cmd/lilypad.VERSION=$$(git describe --tags --abbrev=0)' \
-X 'github.com/lilypad-tech/lilypad/cmd/lilypad.COMMIT_SHA=$$(git rev-parse HEAD)' \
" -o bin/
./bin/lilypad version

Expand Down
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This cloud is just someone else's computer.

![image](https://github.com/bacalhau-project/lilypad/assets/264658/d91dad9a-ca46-43d4-a94b-d33454efc7ae)
![image](https://github.com/lilypad-tech/lilypad/assets/264658/d91dad9a-ca46-43d4-a94b-d33454efc7ae)

Lilypad enables users to run AI workloads easily in a decentralized GPU network where anyone can get paid to connect their compute nodes to the network and run jobs. Users have access to easy Stable Diffusion XL and cutting edge open source LLMs both on chain, from CLI and via [Lilypad AI Studio](https://lilypad.tech) on the web.

Expand Down Expand Up @@ -47,7 +47,7 @@ OSNAME=$(uname -s | awk '{if ($1 == "Darwin") print "darwin"; else if ($1 == "Li
Then Download & Install
```
# Download the latest production build
curl -sSL -o lilypad https://github.com/bacalhau-project/lilypad/releases/download/v2.0.0-d63a7ff/lilypad-$OSNAME-$OSARCH
curl -sSL -o lilypad https://github.com/lilypad-tech/lilypad/releases/download/v2.0.0-d63a7ff/lilypad-$OSNAME-$OSARCH
# Make Lilypad executable and install it
chmod +x lilypad
sudo mv lilypad /usr/local/bin/lilypad
Expand Down Expand Up @@ -76,7 +76,7 @@ lilypad run cowsay:v0.0.1 -i Message="moo"
lilypad run sdxl:v0.9-lilypad1 -i PromptEnv="PROMPT=beautiful view of iceland with a record player"
```

![image-42](https://github.com/bacalhau-project/lilypad/assets/264658/d48bb897-79a0-4f3a-b938-e85a8cfa3f0e)
![image-42](https://github.com/lilypad-tech/lilypad/assets/264658/d48bb897-79a0-4f3a-b938-e85a8cfa3f0e)

Not working?
Try ```rm -rf /tmp/lilypad/data/repos``` uninstall lilypad path and reinstall from the start
Expand All @@ -87,21 +87,21 @@ Try ```rm -rf /tmp/lilypad/data/repos``` uninstall lilypad path and reinstall fr
lilypad serve
```

systemd units & more details [here](https://github.com/bacalhau-project/lilypad/tree/main/ops)
systemd units & more details [here](https://github.com/lilypad-tech/lilypad/tree/main/ops)

## Available modules

Check the github releases page for each module or just use the git hash as the tag.

* [sdxl](https://github.com/bacalhau-project/lilypad-module-sdxl)
* [stable-diffusion](https://github.com/bacalhau-project/lilypad-module-stable-diffusion)
* [duckdb](https://github.com/bacalhau-project/lilypad-module-duckdb)
* [fastchat](https://github.com/bacalhau-project/lilypad-module-fastchat)
* [lora-inference](https://github.com/bacalhau-project/lilypad-module-lora-inference)
* [lora-training](https://github.com/bacalhau-project/lilypad-module-lora-training)
* [filecoin-data-prep](https://github.com/bacalhau-project/lilypad-module-filecoin-data-prep)
* [wasm](https://github.com/bacalhau-project/lilypad-module-wasm)
* [cowsay](https://github.com/bacalhau-project/lilypad-module-cowsay)
* [sdxl](https://github.com/lilypad-tech/lilypad-module-sdxl)
* [stable-diffusion](https://github.com/lilypad-tech/lilypad-module-stable-diffusion)
* [duckdb](https://github.com/lilypad-tech/lilypad-module-duckdb)
* [fastchat](https://github.com/lilypad-tech/lilypad-module-fastchat)
* [lora-inference](https://github.com/lilypad-tech/lilypad-module-lora-inference)
* [lora-training](https://github.com/lilypad-tech/lilypad-module-lora-training)
* [filecoin-data-prep](https://github.com/lilypad-tech/lilypad-module-filecoin-data-prep)
* [wasm](https://github.com/lilypad-tech/lilypad-module-wasm)
* [cowsay](https://github.com/lilypad-tech/lilypad-module-cowsay)


## Write a module
Expand All @@ -112,7 +112,7 @@ Module versions are just git tags.

In your repo, create a file called `lilypad_module.json.tmpl`

See [cowsay](https://github.com/bacalhau-project/lilypad-module-cowsay) for example
See [cowsay](https://github.com/lilypad-tech/lilypad-module-cowsay) for example

This is a json template with Go text/template style `{{.Message}}` sections which will be replaced by Lilypad with json encoded inputs to modules. You can also do fancy things with go templates like setting defaults, see cowsay for example. While developing a module, you can use the git hash to test it.

Expand All @@ -137,7 +137,7 @@ If your module is not deterministic, compute providers will not adopt it and bla
.### Writing Advanced Modules

1. `subt`:
The `subt` function allows for substitutions in your template, a feature that addresses the issue outlined in [#14](https://github.com/bacalhau-project/lilypad/issues/14).
The `subt` function allows for substitutions in your template, a feature that addresses the issue outlined in [#14](https://github.com/lilypad-tech/lilypad/issues/14).

This function is a workaround for the lack of direct substitution support in the module. It implements the [printf](https://pkg.go.dev/text/template#Template.Funcs) function under the hood, which allows you to format strings with placeholders.

Expand Down
8 changes: 4 additions & 4 deletions cmd/lilypad/jobcreator.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package lilypad

import (
"github.com/bacalhau-project/lilypad/pkg/jobcreator"
optionsfactory "github.com/bacalhau-project/lilypad/pkg/options"
"github.com/bacalhau-project/lilypad/pkg/system"
"github.com/bacalhau-project/lilypad/pkg/web3"
"github.com/lilypad-tech/lilypad/pkg/jobcreator"
optionsfactory "github.com/lilypad-tech/lilypad/pkg/options"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
"github.com/spf13/cobra"
)

Expand Down
10 changes: 5 additions & 5 deletions cmd/lilypad/mediator.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package lilypad

import (
"github.com/bacalhau-project/lilypad/pkg/executor/bacalhau"
"github.com/bacalhau-project/lilypad/pkg/mediator"
optionsfactory "github.com/bacalhau-project/lilypad/pkg/options"
"github.com/bacalhau-project/lilypad/pkg/system"
"github.com/bacalhau-project/lilypad/pkg/web3"
"github.com/lilypad-tech/lilypad/pkg/executor/bacalhau"
"github.com/lilypad-tech/lilypad/pkg/mediator"
optionsfactory "github.com/lilypad-tech/lilypad/pkg/options"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
)
Expand Down
10 changes: 5 additions & 5 deletions cmd/lilypad/resource-provider.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package lilypad

import (
"github.com/bacalhau-project/lilypad/pkg/executor/bacalhau"
optionsfactory "github.com/bacalhau-project/lilypad/pkg/options"
"github.com/bacalhau-project/lilypad/pkg/resourceprovider"
"github.com/bacalhau-project/lilypad/pkg/system"
"github.com/bacalhau-project/lilypad/pkg/web3"
"github.com/lilypad-tech/lilypad/pkg/executor/bacalhau"
optionsfactory "github.com/lilypad-tech/lilypad/pkg/options"
"github.com/lilypad-tech/lilypad/pkg/resourceprovider"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
"github.com/spf13/cobra"
)

Expand Down
10 changes: 5 additions & 5 deletions cmd/lilypad/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"syscall"
"time"

"github.com/bacalhau-project/lilypad/pkg/data"
"github.com/bacalhau-project/lilypad/pkg/jobcreator"
optionsfactory "github.com/bacalhau-project/lilypad/pkg/options"
"github.com/bacalhau-project/lilypad/pkg/solver"
"github.com/bacalhau-project/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/jobcreator"
optionsfactory "github.com/lilypad-tech/lilypad/pkg/options"
"github.com/lilypad-tech/lilypad/pkg/solver"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/fatih/color"
"github.com/spf13/cobra"

Expand Down
10 changes: 5 additions & 5 deletions cmd/lilypad/solver.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package lilypad

import (
optionsfactory "github.com/bacalhau-project/lilypad/pkg/options"
"github.com/bacalhau-project/lilypad/pkg/solver"
memorystore "github.com/bacalhau-project/lilypad/pkg/solver/store/memory"
"github.com/bacalhau-project/lilypad/pkg/system"
"github.com/bacalhau-project/lilypad/pkg/web3"
optionsfactory "github.com/lilypad-tech/lilypad/pkg/options"
"github.com/lilypad-tech/lilypad/pkg/solver"
memorystore "github.com/lilypad-tech/lilypad/pkg/solver/store/memory"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/lilypad/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ import (

"github.com/spf13/cobra"

optionsfactory "github.com/bacalhau-project/lilypad/pkg/options"
"github.com/bacalhau-project/lilypad/pkg/system"
optionsfactory "github.com/lilypad-tech/lilypad/pkg/options"
"github.com/lilypad-tech/lilypad/pkg/system"
)

var VERSION string

var COMMIT_SHA string

const GO_BINARY_URL = "https://github.com/bacalhau-project/lilypad/releases/"
const GO_BINARY_URL = "https://github.com/lilypad-tech/lilypad/releases/"

func newVersionCmd() *cobra.Command {
options := optionsfactory.NewSolverOptions()
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/bacalhau-project/lilypad
module github.com/lilypad-tech/lilypad

go 1.20

Expand Down
4 changes: 2 additions & 2 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ default: go build

release:
go build -v -ldflags="\
-X 'github.com/bacalhau-project/lilypad/cmd/lilypad.VERSION=$$(git describe --tags --abbrev=0)' \
-X 'github.com/bacalhau-project/lilypad/cmd/lilypad.COMMIT_SHA=$$(git rev-parse HEAD)' \
-X 'github.com/lilypad-tech/lilypad/cmd/lilypad.VERSION=$$(git describe --tags --abbrev=0)' \
-X 'github.com/lilypad-tech/lilypad/cmd/lilypad.COMMIT_SHA=$$(git rev-parse HEAD)' \
" .
./lilypad version
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/bacalhau-project/lilypad/cmd/lilypad"
"github.com/lilypad-tech/lilypad/cmd/lilypad"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion ops/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cd /
sudo mkdir app
sudo chown $USER app
cd /app/
git clone https://github.com/bacalhau-project/lilypad
git clone https://github.com/lilypad-tech/lilypad
cd lilypad
(cd hardhat && yarn install)
```
Expand Down
2 changes: 1 addition & 1 deletion pkg/data/types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package data

import (
"github.com/bacalhau-project/lilypad/pkg/data/bacalhau"
"github.com/lilypad-tech/lilypad/pkg/data/bacalhau"
)

// used by resource providers to describe their resources
Expand Down
2 changes: 1 addition & 1 deletion pkg/data/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"math/big"

"github.com/bacalhau-project/lilypad/pkg/web3/bindings/controller"
"github.com/lilypad-tech/lilypad/pkg/web3/bindings/controller"
"github.com/ethereum/go-ethereum/common"

mdag "github.com/ipfs/go-merkledag"
Expand Down
8 changes: 4 additions & 4 deletions pkg/executor/bacalhau/bacalhau.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"path/filepath"
"strings"

"github.com/bacalhau-project/lilypad/pkg/data"
"github.com/bacalhau-project/lilypad/pkg/data/bacalhau"
executorlib "github.com/bacalhau-project/lilypad/pkg/executor"
"github.com/bacalhau-project/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/data/bacalhau"
executorlib "github.com/lilypad-tech/lilypad/pkg/executor"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/rs/zerolog/log"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/executor/noop/noop.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"path/filepath"

"github.com/bacalhau-project/lilypad/pkg/data"
executorlib "github.com/bacalhau-project/lilypad/pkg/executor"
"github.com/bacalhau-project/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/data"
executorlib "github.com/lilypad-tech/lilypad/pkg/executor"
"github.com/lilypad-tech/lilypad/pkg/system"
)

const RESULTS_DIR = "noop-results"
Expand Down
2 changes: 1 addition & 1 deletion pkg/executor/types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package executor

import (
"github.com/bacalhau-project/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/data"
)

type ExecutorResults struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/http/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"net/url"
"strings"

"github.com/bacalhau-project/lilypad/pkg/web3"
"github.com/lilypad-tech/lilypad/pkg/web3"
"github.com/hashicorp/go-retryablehttp"
"github.com/rs/zerolog/log"
)
Expand Down
14 changes: 7 additions & 7 deletions pkg/jobcreator/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"fmt"
"time"

"github.com/bacalhau-project/lilypad/pkg/data"
"github.com/bacalhau-project/lilypad/pkg/http"
"github.com/bacalhau-project/lilypad/pkg/solver"
"github.com/bacalhau-project/lilypad/pkg/solver/store"
"github.com/bacalhau-project/lilypad/pkg/system"
"github.com/bacalhau-project/lilypad/pkg/web3"
"github.com/bacalhau-project/lilypad/pkg/web3/bindings/storage"
"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/http"
"github.com/lilypad-tech/lilypad/pkg/solver"
"github.com/lilypad-tech/lilypad/pkg/solver/store"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
"github.com/lilypad-tech/lilypad/pkg/web3/bindings/storage"
)

type JobOfferSubscriber func(offer data.JobOfferContainer)
Expand Down
6 changes: 3 additions & 3 deletions pkg/jobcreator/jobcreator.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package jobcreator
import (
"context"

"github.com/bacalhau-project/lilypad/pkg/data"
"github.com/bacalhau-project/lilypad/pkg/system"
"github.com/bacalhau-project/lilypad/pkg/web3"
"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
)

type JobCreatorMediationOptions struct {
Expand Down
8 changes: 4 additions & 4 deletions pkg/jobcreator/onchain_jobcreator.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"math/big"
"strings"

"github.com/bacalhau-project/lilypad/pkg/data"
"github.com/bacalhau-project/lilypad/pkg/system"
"github.com/bacalhau-project/lilypad/pkg/web3"
jobcreatorweb3 "github.com/bacalhau-project/lilypad/pkg/web3/bindings/jobcreator"
"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
jobcreatorweb3 "github.com/lilypad-tech/lilypad/pkg/web3/bindings/jobcreator"
"github.com/davecgh/go-spew/spew"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/jobcreator/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"time"

"github.com/bacalhau-project/lilypad/pkg/data"
"github.com/bacalhau-project/lilypad/pkg/system"
"github.com/bacalhau-project/lilypad/pkg/web3"
"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
)

type RunJobResults struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/jobcreator/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"time"

"github.com/bacalhau-project/lilypad/pkg/data"
"github.com/bacalhau-project/lilypad/pkg/module"
"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/module"
)

// this will load the module in the offer options
Expand Down
16 changes: 8 additions & 8 deletions pkg/mediator/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import (
"sync"
"time"

"github.com/bacalhau-project/lilypad/pkg/data"
"github.com/bacalhau-project/lilypad/pkg/executor"
"github.com/bacalhau-project/lilypad/pkg/http"
"github.com/bacalhau-project/lilypad/pkg/module"
"github.com/bacalhau-project/lilypad/pkg/solver"
"github.com/bacalhau-project/lilypad/pkg/solver/store"
"github.com/bacalhau-project/lilypad/pkg/system"
"github.com/bacalhau-project/lilypad/pkg/web3"
"github.com/lilypad-tech/lilypad/pkg/data"
"github.com/lilypad-tech/lilypad/pkg/executor"
"github.com/lilypad-tech/lilypad/pkg/http"
"github.com/lilypad-tech/lilypad/pkg/module"
"github.com/lilypad-tech/lilypad/pkg/solver"
"github.com/lilypad-tech/lilypad/pkg/solver/store"
"github.com/lilypad-tech/lilypad/pkg/system"
"github.com/lilypad-tech/lilypad/pkg/web3"
"github.com/rs/zerolog/log"
)

Expand Down
Loading

0 comments on commit 8ce9a6d

Please sign in to comment.