Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix update version and pinnings for 23.08. #5440

Merged
merged 4 commits into from
Jun 2, 2023
Merged

Fix update version and pinnings for 23.08. #5440

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fad2972
Fix update version and pinnings for 23.08.
bdice May 24, 2023
27e927f
Update conda env instructions.
bdice May 24, 2023
50af9b6
Use AJ's suggestion.
bdice May 25, 2023
64a3cc1
Merge branch 'branch-23.08' into fix-update-version
ajschmidt8 Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions BUILD.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,9 @@ To install cuML from source, ensure the following dependencies are met:
It is recommended to use conda for environment/package management. If doing so, development environment .yaml files are located in `conda/environments/all_*.yaml`. These files contains most of the dependencies mentioned above (notable exceptions are `gcc` and `zlib`). To create a development environment named `cuml_dev`, you can use the follow commands:

```bash
conda create -n cuml_dev python=3.9
conda create -n cuml_dev python=3.10
conda activate cuml_dev
conda env update --file=conda/environments/all_cuda-115_arch-x86_64.yaml
```

These conda environments are based on the general RAPIDS meta packages that install common dependencies for RAPIDS projects. To install different versions of packages contained in those meta packages after creating the environment, it is recommended to remove those meta packages (without removing the actual packages contained in the environment) with the following command (having the environment active):

```bash
conda remove --force rapids-build-env rapids-notebook-env rapids-doc-env
conda env update --file=conda/environments/all_cuda-118_arch-x86_64.yaml
```

## Installing from Source:
Expand Down
22 changes: 9 additions & 13 deletions ci/release/update-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,15 @@ sed_runner 's/release = .*/release = '"'${NEXT_FULL_TAG}'"'/g' docs/source/conf.
sed_runner "s/\(PROJECT_NUMBER.*=\).*/\1 \"${NEXT_SHORT_TAG}\"/g" cpp/Doxyfile.in

for FILE in dependencies.yaml conda/environments/*.yaml; do
sed_runner "s/cudf=${CURRENT_SHORT_TAG}/cudf=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/rmm=${CURRENT_SHORT_TAG}/rmm=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/dask-cuda=${CURRENT_SHORT_TAG}/dask-cuda=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/dask-cudf=${CURRENT_SHORT_TAG}/dask-cudf=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/libcumlprims=${CURRENT_SHORT_TAG}/libcumlprims=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/libraft-headers=${CURRENT_SHORT_TAG}/libraft-headers=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/libraft-distance=${CURRENT_SHORT_TAG}/libraft-distance=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/libraft-nn=${CURRENT_SHORT_TAG}/libraft-nn=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/raft-dask=${CURRENT_SHORT_TAG}/raft-dask=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/pylibraft=${CURRENT_SHORT_TAG}/pylibraft=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/rapids-build-env=${CURRENT_SHORT_TAG}/rapids-build-env=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/rapids-notebook-env=${CURRENT_SHORT_TAG}/rapids-notebook-env=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/rapids-doc-env=${CURRENT_SHORT_TAG}/rapids-doc-env=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/rmm==.*\",/rmm==${NEXT_SHORT_TAG_PEP440}.*\",/g" ${FILE};
sed_runner "s/cudf==.*\",/cudf==${NEXT_SHORT_TAG_PEP440}.*\",/g" ${FILE};
sed_runner "s/dask-cuda==.*\",/dask-cuda==${NEXT_SHORT_TAG_PEP440}.*\",/g" ${FILE};
sed_runner "s/dask-cudf==.*\",/dask-cudf==${NEXT_SHORT_TAG_PEP440}.*\",/g" ${FILE};
sed_runner "s/libcumlprims==.*\",/libcumlprims==${NEXT_SHORT_TAG_PEP440}.*\",/g" ${FILE};
sed_runner "s/libraft-headers==.*\",/libraft-headers==${NEXT_SHORT_TAG_PEP440}.*\",/g" ${FILE};
sed_runner "s/libraft==.*\",/libraft==${NEXT_SHORT_TAG_PEP440}.*\",/g" ${FILE};
sed_runner "s/raft-dask==.*\",/raft-dask==${NEXT_SHORT_TAG_PEP440}.*\",/g" ${FILE};
sed_runner "s/pylibraft==.*\",/pylibraft==${NEXT_SHORT_TAG_PEP440}.*\",/g" ${FILE};
bdice marked this conversation as resolved.
Show resolved Hide resolved
done

sed_runner "s|/branch-.*?/|/branch-${NEXT_SHORT_TAG}/|g" README.md
Expand Down
20 changes: 10 additions & 10 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ dependencies:
- cmake>=3.23.1,!=3.25.0
- cuda-python>=11.7.1,<12.0
- cudatoolkit=11.8
- cudf==23.6.*
- cudf==23.8.*
- cupy>=12.0.0
- cxx-compiler
- cython>=0.29,<0.30
- dask-core==2023.3.2
- dask-cuda==23.6.*
- dask-cudf==23.6.*
- dask-cuda==23.8.*
- dask-cudf==23.8.*
- dask-ml
- dask==2023.3.2
- distributed==2023.3.2.1
Expand All @@ -33,34 +33,34 @@ dependencies:
- libcublas=11.11.3.6
- libcufft-dev=10.9.0.58
- libcufft=10.9.0.58
- libcumlprims==23.6.*
- libcumlprims==23.8.*
- libcurand-dev=10.3.0.86
- libcurand=10.3.0.86
- libcusolver-dev=11.4.1.48
- libcusolver=11.4.1.48
- libcusparse-dev=11.7.5.86
- libcusparse=11.7.5.86
- libraft-headers==23.6.*
- libraft==23.6.*
- librmm==23.6.*
- libraft-headers==23.8.*
- libraft==23.8.*
- librmm==23.8.*
- nbsphinx
- ninja
- nltk
- numba>=0.56.4,<0.57
- numpydoc
- pip
- pydata-sphinx-theme
- pylibraft==23.6.*
- pylibraft==23.8.*
- pynndescent==0.5.8
- pytest
- pytest-benchmark
- pytest-cases
- pytest-cov
- pytest-xdist
- python>=3.9,<3.11
- raft-dask==23.6.*
- raft-dask==23.8.*
- recommonmark
- rmm==23.6.*
- rmm==23.8.*
- scikit-build>=0.13.1,<0.17.2
- scikit-learn==1.2
- scipy
Expand Down
8 changes: 4 additions & 4 deletions conda/environments/cpp_all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ dependencies:
- libcublas=11.11.3.6
- libcufft-dev=10.9.0.58
- libcufft=10.9.0.58
- libcumlprims==23.6.*
- libcumlprims==23.8.*
- libcurand-dev=10.3.0.86
- libcurand=10.3.0.86
- libcusolver-dev=11.4.1.48
- libcusolver=11.4.1.48
- libcusparse-dev=11.7.5.86
- libcusparse=11.7.5.86
- libraft-headers==23.6.*
- libraft==23.6.*
- librmm==23.6.*
- libraft-headers==23.8.*
- libraft==23.8.*
- librmm==23.8.*
- ninja
- sysroot_linux-64==2.17
name: cpp_all_cuda-118_arch-x86_64
20 changes: 10 additions & 10 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ dependencies:
packages:
- c-compiler
- cxx-compiler
- libcumlprims==23.6.*
- libraft==23.6.*
- libraft-headers==23.6.*
- librmm==23.6.*
- libcumlprims==23.8.*
- libraft==23.8.*
- libraft-headers==23.8.*
- librmm==23.8.*
specific:
- output_types: conda
matrices:
Expand All @@ -116,8 +116,8 @@ dependencies:
- scikit-build>=0.13.1,<0.17.2
- cython>=0.29,<0.30
- &treelite treelite==3.2.0
- pylibraft==23.6.*
- rmm==23.6.*
- pylibraft==23.8.*
- rmm==23.8.*
- output_types: pyproject
packages:
- wheel
Expand All @@ -127,10 +127,10 @@ dependencies:
common:
- output_types: [conda, requirements, pyproject]
packages:
- cudf==23.6.*
- cudf==23.8.*
- dask==2023.3.2
- dask-cuda==23.6.*
- dask-cudf==23.6.*
- dask-cuda==23.8.*
- dask-cudf==23.8.*
- distributed==2023.3.2.1
- joblib>=0.11
- numba>=0.56.4,<0.57
Expand All @@ -139,7 +139,7 @@ dependencies:
# installation/run_constrained for conda)?
- seaborn
- scipy
- raft-dask==23.6.*
- raft-dask==23.8.*
- *treelite
- output_types: [conda, requirements]
packages:
Expand Down
2 changes: 1 addition & 1 deletion python/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ requires-python = ">=3.9"
dependencies = [
"cudf==23.8.*",
"cupy-cuda11x>=12.0.0",
"dask-cuda==23.6.*",
"dask-cuda==23.8.*",
"dask-cudf==23.8.*",
"dask==2023.3.2",
"distributed==2023.3.2.1",
Expand Down