Skip to content

Commit

Permalink
Bump CUDA from 11.8 to 12.0 (#514)
Browse files Browse the repository at this point in the history
* Bump CUDA from 11.8 to 12.0

Update Pytorch, Torchvision and Tensorflow to use CUDA 12.0 builds. Also bumped pytorch from 2.0.0 to 2.1.0, torchvision from 0.15.1 to 0.16.1 and tensorflow from 2.14.0 to 2.15.0 because lower versions only has CUDA 11.8 on conda-forge.

* Pin to flax>=0.8.0

* Set with-cuda=12.0 flag on conda-lock lock

* Set CONDA_OVERRIDE_CUDA environment variable

Xref https://conda-forge.org/docs/maintainer/knowledge_base.html#cuda-builds

* Regenerate conda-lock files for ml-notebook and pytorch-notebook

Manually re-locking

* Delete conda-lock.yml files for ml-notebook and pytorch-notebook

* Revert "Delete conda-lock.yml files for ml-notebook and pytorch-notebook"

This reverts commit 7658847.

* Bump conda-lock from 2.3 to 2.5

Bumps [conda-lock](https://github.com/conda/conda-lock) from 2.3.0 to 2.5.5.
- [Release notes](https://github.com/conda/conda-lock/releases)
- [Commits](conda/conda-lock@v2.3.0...v2.5.5)

* Bump conda from 23.11.0 to 24.1.2

Bumps [conda](https://github.com/conda/conda) from 23.11.0 to 24.1.2.
- [Release notes](https://github.com/conda/conda/releases)
- [Changelog](https://github.com/conda/conda/blob/master/CHANGELOG.md)
- [Commits](conda/conda@23.11.0...24.1.2)

* Try manually removing cudatoolkit from conda-lock.yml

Xref mamba-org/mamba#3120

* Revert "Set CONDA_OVERRIDE_CUDA environment variable"

This reverts commit 4d26a19.

* Try removing asterisk in front of cuda120 build string

* Depend on cuda-version=12.0 instead of matching cuda120 build string

* Increase conda-lock timeout minutes from 20 to 30min

* [condalock-command] autogenerated conda-lock files

* Revert "[condalock-command] autogenerated conda-lock files"

This reverts commit 12da355.

* Keep cuda120 build string regex pattern

Partial revert of 537c27f

* Set cuda-version pin as >=12.0 instead of =12.0

Pin minimum version of CUDA to 12.0, instead of specifying exact pin on 12.0

* Add virtual-packages.yml to ml-notebook and pytorch-notebook

Xref https://github.com/conda/conda-lock/tree/v2.5.7?tab=readme-ov-file#--virtual-package-spec

* [condalock-command] autogenerated conda-lock files

---------

Co-authored-by: pangeo-bot <[email protected]>
  • Loading branch information
weiji14 and pangeo-bot authored May 21, 2024
1 parent f0957bf commit 6d4c2ab
Show file tree
Hide file tree
Showing 16 changed files with 1,792 additions and 966 deletions.
4 changes: 2 additions & 2 deletions base-notebook/conda-linux-64.lock
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libxcrypt-4.4.36-hd590300_1.cond
https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda#f36c115f1ee199da648e0597ec2047ad
https://conda.anaconda.org/conda-forge/linux-64/lz4-c-1.9.4-hcb278e6_0.conda#318b08df404f9c9be5712aaa5a6f0bb0
https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.5-h59595ed_0.conda#fcea371545eda051b6deafb24889fc69
https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-hd590300_0.conda#c0f3abb4a16477208bbd43a39bd56f18
https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_1.conda#ba01a2fef8a67913acc4ab8da101dd27
https://conda.anaconda.org/conda-forge/linux-64/pthread-stubs-0.4-h36c2ea0_1001.tar.bz2#22dad4df6e8630e8dff2428f6f6a7036
https://conda.anaconda.org/conda-forge/linux-64/snappy-1.2.0-hdb0a2a9_1.conda#843bbb8ace1d64ac50d64639ff38b014
https://conda.anaconda.org/conda-forge/linux-64/xorg-libxau-1.0.11-hd590300_0.conda#2c80dc38fface310c9bd81b17037fee5
Expand Down Expand Up @@ -213,7 +213,7 @@ https://conda.anaconda.org/conda-forge/noarch/jupyter_server_terminals-0.5.3-pyh
https://conda.anaconda.org/conda-forge/linux-64/libgoogle-cloud-storage-2.24.0-h3d9a0c8_0.conda#a731371833a7b1ab3a87be0fe7e6235a
https://conda.anaconda.org/conda-forge/noarch/mako-1.3.5-pyhd8ed1ab_0.conda#29fddbfa0e2361636a98de4f46ead2ac
https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.4-py311h64a7726_0.conda#a502d7aad449a1206efb366d6a12c52d
https://conda.anaconda.org/conda-forge/noarch/requests-2.31.0-pyhd8ed1ab_0.conda#a30144e4156cdbb236f99ebb49828f8b
https://conda.anaconda.org/conda-forge/noarch/requests-2.32.1-pyhd8ed1ab_0.conda#20ce56db6c7aae9e6654b358ecbfc470
https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-2.0.30-py311h331c9d8_0.conda#2454969ff3b8306a0b1c832f449dc50f
https://conda.anaconda.org/conda-forge/noarch/stack_data-0.6.2-pyhd8ed1ab_0.conda#e7df0fdd404616638df5ece6e69ba7af
https://conda.anaconda.org/conda-forge/noarch/alembic-1.13.1-pyhd8ed1ab_1.conda#7b7b0062b0de9f3f71502d31215fcbbb
Expand Down
14 changes: 7 additions & 7 deletions base-notebook/conda-lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2587,10 +2587,10 @@ package:
dependencies:
ca-certificates: ''
libgcc-ng: '>=12'
url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-hd590300_0.conda
url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.3.0-h4ab18f5_1.conda
hash:
md5: c0f3abb4a16477208bbd43a39bd56f18
sha256: fdbf05e4db88c592366c90bb82e446edbe33c6e49e5130d51c580b2629c0b5d5
md5: ba01a2fef8a67913acc4ab8da101dd27
sha256: addce4c7b00d8b8be6e46a3ba783e1ce56d470aa6399ad91a7703bb844a6be9c
category: main
optional: false
- name: orc
Expand Down Expand Up @@ -3181,7 +3181,7 @@ package:
category: main
optional: false
- name: requests
version: 2.31.0
version: 2.32.1
manager: conda
platform: linux-64
dependencies:
Expand All @@ -3190,10 +3190,10 @@ package:
idna: '>=2.5,<4'
python: '>=3.7'
urllib3: '>=1.21.1,<3'
url: https://conda.anaconda.org/conda-forge/noarch/requests-2.31.0-pyhd8ed1ab_0.conda
url: https://conda.anaconda.org/conda-forge/noarch/requests-2.32.1-pyhd8ed1ab_0.conda
hash:
md5: a30144e4156cdbb236f99ebb49828f8b
sha256: 9f629d6fd3c8ac5f2a198639fe7af87c4db2ac9235279164bfe0fcb49d8c4bad
md5: 20ce56db6c7aae9e6654b358ecbfc470
sha256: 6c64bb15baf632e99c39099cd7ba9201b258a6323b8b47c8a902d0932813ff65
category: main
optional: false
- name: rfc3339-validator
Expand Down
2 changes: 1 addition & 1 deletion base-notebook/packages.txt
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ pyzmq==26.0.3
re2==2023.09.01
readline==8.2
referencing==0.35.1
requests==2.31.0
requests==2.32.1
rfc3339-validator==0.1.4
rfc3986-validator==0.1.1
rpds-py==0.18.1
Expand Down
270 changes: 152 additions & 118 deletions ml-notebook/conda-linux-64.lock

Large diffs are not rendered by default.

Loading

0 comments on commit 6d4c2ab

Please sign in to comment.