Skip to content

Commit

Permalink
rebase
Browse files Browse the repository at this point in the history
Signed-off-by: Keming <[email protected]>
  • Loading branch information
kemingy committed Jan 16, 2025
2 parents 1564c96 + 6d0c0c8 commit f18d951
Show file tree
Hide file tree
Showing 19 changed files with 158 additions and 120 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
with:
python-version: '3.11'
- name: Build wheels
uses: pypa/cibuildwheel@v2.19.2
uses: pypa/cibuildwheel@v2.22.0
env:
CIBW_ARCHS_MACOS: arm64, x86_64
CIBW_ARCHS_LINUX: auto64
Expand Down Expand Up @@ -174,16 +174,15 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
build_func: ["build", "build_gpu_11_2", "build_gpu_11_3", "build_gpu_11_6"]
include:
- build_func: build
tag_suffix: ""
- build_func: build_gpu_11_2
tag_suffix: "-cuda-11.2.2-cudnn-8"
- build_func: build_gpu_11_3
tag_suffix: "-cuda-11.3.1-cudnn-8"
- build_func: build_gpu_11_6
tag_suffix: "-cuda-11.6.2-cudnn-8"
- build_func: build_gpu_11_8
tag_suffix: "-cuda-11.8.0-cudnn-8"
- build_func: build_gpu_12_3
tag_suffix: "-cuda-12.3.2-cudnn-9"
needs: image_publish
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -216,5 +215,5 @@ jobs:
run: ./base-images/remote-cache/build-and-push-remote-cache.sh
env:
BUILD_FUNC: ${{ matrix.build_func }}
TAG_SUFFIX: ${{ matrix.TAG_SUFFIX }}
TAG_SUFFIX: ${{ matrix.tag_suffix }}
ENVD_BUILD_OWNER: 1000
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
# Changelog

## v0.3.47 (2025-01-09)

* [95bb1c3](https://github.com/tensorchord/envd/commit/95bb1c37f177c6e6e4ba49d4429e6e8a1ebc6ea5) feat(cache): update cuda & cudnn version (#1943)

### Contributors

* Keming

## v0.3.46 (2025-01-08)

* [da83a62](https://github.com/tensorchord/envd/commit/da83a6268ddc154090d08ef0606f418461823e97) fix(cve): containers/image, fix toto conflicts (#1938)
* [d7ef20d](https://github.com/tensorchord/envd/commit/d7ef20df3444915a2b2793a9d6137caf01f3d3a2) fix(cve): docker & buildkit (#1936)
* [c504c66](https://github.com/tensorchord/envd/commit/c504c66e389c6a3bfc57686b5a47d550f3853125) feat(ci): adopt ruff & lychee (#1935)
* [812de36](https://github.com/tensorchord/envd/commit/812de3622975c7244d7b9b6d1e939b355f35009d) fix(cve): go-get & x/crypto (#1934)
* [d61ca2e](https://github.com/tensorchord/envd/commit/d61ca2e543fd5ec6d8ce238304fb329ee8ed3440) feat: envd up with --gpu-set (#1861)

### Contributors

* Keming
* zhang-wei

## v0.3.45 (2024-01-24)

* [639c188](https://github.com/tensorchord/envd/commit/639c188536181c1d621bd45d04b2243fef72c467) fix: go-git security issue GHSA-mw99-9chc-xw7r (#1844)
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ envd-quick-start http://localhost:42779 envd-quick-start.envd /home/g

## Difference between v0 and v1

> **Note**
> [!NOTE]
> To use the `v1` config file, add `# syntax=v1` to the first line of your `build.envd` file.
| Features | v0 | v1 |
Expand All @@ -261,11 +261,11 @@ envd-quick-start http://localhost:42779 envd-quick-start.envd /home/g
| support installing multiple languages | ⚠️ ||
| support `moby` builder || ✅ <sup>[(a)](#v1-moby)</sup> |

> **Note**
> [!NOTE]
> <a name="v1-moby">(a)</a> To use the `moby` builder, you will need to create a new context with `envd context create --name moby-test --builder moby-worker --use`.
> For more information about the `moby` builder, check the [issue-1693](https://github.com/tensorchord/envd/issues/1693).
> **Important**
> [!IMPORTANT]
> For more details, check the [upgrade to v1](https://envd.tensorchord.ai/guide/v1.html) doc.
## More on documentation 📝
Expand Down
12 changes: 12 additions & 0 deletions base-images/remote-cache/build.envd
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,15 @@ def build_gpu_11_6():
"""pytorch"""
base(os="ubuntu22.04", language="python3")
install.cuda(version="11.6.2", cudnn="8")


def build_gpu_11_8():
"""pytorch"""
base(os="ubuntu20.04", language="python3")
install.cuda(version="11.8.0", cudnn="8")


def build_gpu_12_3():
"""pytorch"""
base(os="ubuntu20.04", language="python3")
install.cuda(version="12.3.2", cudnn="9")
2 changes: 1 addition & 1 deletion e2e/v0/cli/testdata/custom-image-test/build.envd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
def build():
base(language="python", image="python:3.9-slim")
base(language="python", image="python:3.11-slim")
install.python_packages(
name=[
"via",
Expand Down
2 changes: 1 addition & 1 deletion e2e/v1/cli/testdata/custom-image-test/build.envd
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


def build():
base(image="python:3.9-slim", dev=False)
base(image="python:3.11-slim", dev=False)
install.python_packages(
name=[
"via",
Expand Down
2 changes: 1 addition & 1 deletion envd/api/v0/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def base(os: str, language: str, image: Optional[str]):
Args:
os (str): The operating system (i.e. `ubuntu22.04`)
language (str): The programming language dependency (i.e. `python3.8`)
image (Optional[str]): Custom image (i.e. `python:3.9-slim`)
image (Optional[str]): Custom image (i.e. `python:3.11-slim`)
"""


Expand Down
2 changes: 1 addition & 1 deletion envd/api/v1/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
from typing import Optional, Sequence


def python(version: str = "3.9"):
def python(version: str = "3.11"):
"""Install python.
If `install.conda` is not used, this will create a solo Python environment. Otherwise, it
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-image/build.envd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
def build():
base(language="python", image="python:3.9-slim")
base(language="python", image="python:3.11-slim")
install.python_packages(
name=[
"via",
Expand Down
2 changes: 1 addition & 1 deletion examples/dpgen2/build.envd
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def install_kubectl_kind(env_name):


def build():
base(os="ubuntu22.04", language="python3.9")
base(os="ubuntu22.04", language="python3.11")
install.python_packages(
name=[
"pydflow",
Expand Down
55 changes: 25 additions & 30 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/tensorchord/envd

go 1.22.0
go 1.22.6

toolchain go1.23.4

Expand All @@ -11,8 +11,8 @@ require (
github.com/charmbracelet/lipgloss v0.8.0
github.com/cockroachdb/errors v1.11.1
github.com/containerd/console v1.0.4
github.com/containerd/containerd v1.7.24
github.com/containers/image/v5 v5.25.0
github.com/containerd/log v0.1.0
github.com/containers/image/v5 v5.33.0
github.com/creack/pty v1.1.18
github.com/docker/cli v27.4.0-rc.2+incompatible
github.com/docker/docker v27.4.0-rc.2+incompatible
Expand Down Expand Up @@ -54,13 +54,13 @@ require (

require (
cloud.google.com/go v0.112.0 // indirect
cloud.google.com/go/compute/metadata v0.3.0 // indirect
cloud.google.com/go/compute/metadata v0.5.0 // indirect
cloud.google.com/go/iam v1.1.5 // indirect
cloud.google.com/go/storage v1.36.0 // indirect
dario.cat/mergo v1.0.0 // indirect
dario.cat/mergo v1.0.1 // indirect
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/BurntSushi/toml v1.4.0 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ProtonMail/go-crypto v1.1.3 // indirect
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
Expand All @@ -71,21 +71,21 @@ require (
github.com/cloudflare/circl v1.3.7 // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/containerd/containerd v1.7.24 // indirect
github.com/containerd/containerd/api v1.7.19 // indirect
github.com/containerd/continuity v0.4.5 // indirect
github.com/containerd/errdefs v0.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/containerd/ttrpc v1.2.5 // indirect
github.com/containerd/typeurl/v2 v2.2.3 // indirect
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
github.com/containers/ocicrypt v1.1.10 // indirect
github.com/containers/storage v1.46.0 // indirect
github.com/containers/ocicrypt v1.2.0 // indirect
github.com/containers/storage v1.56.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker-credential-helpers v0.8.2 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
Expand All @@ -108,7 +108,7 @@ require (
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/greatroar/blobloom v0.7.2 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand All @@ -118,21 +118,19 @@ require (
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/in-toto/in-toto-golang v0.5.0 // indirect
github.com/in-toto/in-toto-golang v0.9.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/klauspost/pgzip v1.2.6-0.20220930104621-17e8dac29df8 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-localereader v0.0.1 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/minio/sha256-simd v1.0.1 // indirect
github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75 // indirect
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
Expand All @@ -143,30 +141,29 @@ require (
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/sys/capability v0.3.0 // indirect
github.com/moby/sys/mountinfo v0.7.2 // indirect
github.com/moby/sys/signal v0.7.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/moby/sys/user v0.3.0 // indirect
github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/reflow v0.3.0 // indirect
github.com/muesli/termenv v0.15.2 // indirect
github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d // indirect
github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473 // indirect
github.com/opencontainers/runc v1.1.12 // indirect
github.com/opencontainers/runtime-spec v1.2.0 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761 // indirect
github.com/pierrec/lz4/v4 v4.1.18 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
github.com/segmentio/backo-go v1.0.0 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/shibumi/go-pathspec v1.3.0 // indirect
Expand All @@ -178,13 +175,11 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/syncthing/notify v0.0.0-20210616190510-c6b7342338d2 // indirect
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
github.com/thejerf/suture/v4 v4.0.2 // indirect
github.com/tonistiigi/fsutil v0.0.0-20241121093142-31cf1f437184 // indirect
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/vbatts/tar-split v0.11.5 // indirect
github.com/ulikunitz/xz v0.5.12 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
Expand All @@ -198,17 +193,17 @@ require (
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/tools v0.29.0 // indirect
google.golang.org/api v0.155.0 // indirect
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/grpc v1.66.3 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/grpc v1.67.0 // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
Expand Down
Loading

0 comments on commit f18d951

Please sign in to comment.