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

Pin cuml dependency in notebook testing environment to nightlies #1110

Merged
merged 4 commits into from
May 1, 2023
Merged

Pin cuml dependency in notebook testing environment to nightlies #1110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf3052b
update cuml pinning
isVoid May 1, 2023
4bd7dad
improve version updater
isVoid May 1, 2023
390ed19
update existing version specifiers
ajschmidt8 May 1, 2023
278ab33
update `update-version.sh` to use `NEXT_SHORT_TAG_PEP440`
ajschmidt8 May 1, 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
18 changes: 10 additions & 8 deletions ci/release/update-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@ sed_runner 's/release = .*/release = '"'${NEXT_FULL_TAG}'"'/g' docs/source/conf.
sed_runner 's/'"branch-.*\/RAPIDS.cmake"'/'"branch-${NEXT_SHORT_TAG}\/RAPIDS.cmake"'/g' fetch_rapids.cmake
sed_runner 's/'"branch-.*\/RAPIDS.cmake"'/'"branch-${NEXT_SHORT_TAG}\/RAPIDS.cmake"'/g' python/cuspatial/CMakeLists.txt

# bump cudf
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/libcudf=${CURRENT_SHORT_TAG}/libcudf=${NEXT_SHORT_TAG}/g" ${FILE};
sed_runner "s/librmm=${CURRENT_SHORT_TAG}/librmm=${NEXT_SHORT_TAG}/g" ${FILE};
done

# Doxyfile update
sed_runner "/PROJECT_NUMBER[ ]*=/ s|=.*|= ${NEXT_FULL_TAG}|g" cpp/doxygen/Doxyfile
sed_runner "/TAGFILES/ s|[0-9]\+.[0-9]\+|${NEXT_SHORT_TAG}|g" cpp/doxygen/Doxyfile
Expand All @@ -62,6 +54,16 @@ sed_runner "s/VERSION_NUMBER=\".*/VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/bui
# Need to distutils-normalize the original version
NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_SHORT_TAG}'))")

# bump rapids libraries
for FILE in dependencies.yaml conda/environments/*.yaml; do
sed_runner "/- &cudf_conda cudf==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}\.*/g" ${FILE}
sed_runner "/- cudf==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}\.*/g" ${FILE}
Comment on lines +59 to +60
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for now there is a bit of duplication necessary here for cudf.

it will be removed in the future when we revamp these scripts and the process around them.

sed_runner "/- cuml==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}\.*/g" ${FILE}
sed_runner "/- rmm==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}\.*/g" ${FILE}
sed_runner "/- libcudf==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}\.*/g" ${FILE}
sed_runner "/- librmm==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}\.*/g" ${FILE}
done

# Dependency versions in dependencies.yaml
sed_runner "/-cu[0-9]\{2\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*/g" dependencies.yaml

Expand Down
10 changes: 5 additions & 5 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 @@ -9,8 +9,8 @@ dependencies:
- c-compiler
- cmake>=3.23.1,!=3.25.0
- cudatoolkit=11.8
- cudf=23.06
- cuml
- cudf==23.6.*
- cuml==23.6.*
- cxx-compiler
- cython>=0.29,<0.30
- doxygen
Expand All @@ -20,8 +20,8 @@ dependencies:
- gtest=1.10.0
- ipython
- ipywidgets
- libcudf=23.06
- librmm=23.06
- libcudf==23.6.*
- librmm==23.6.*
- myst-parser
- nbsphinx
- ninja
Expand All @@ -35,7 +35,7 @@ dependencies:
- pytest-cov
- pytest-xdist
- python>=3.9,<3.11
- rmm=23.06
- rmm==23.6.*
- scikit-build>=0.13.1
- scikit-image
- setuptools
Expand Down
10 changes: 5 additions & 5 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ dependencies:
- cxx-compiler
- gmock=1.10.0
- gtest=1.10.0
- libcudf=23.06
- librmm=23.06
- libcudf==23.6.*
- librmm==23.6.*
- ninja
specific:
- output_types: conda
Expand Down Expand Up @@ -94,7 +94,7 @@ dependencies:
- setuptools
- output_types: conda
packages:
- &cudf_conda cudf=23.06
- &cudf_conda cudf==23.6.*
specific:
- output_types: conda
matrices:
Expand Down Expand Up @@ -170,7 +170,7 @@ dependencies:
common:
- output_types: [conda, requirements]
packages:
- cuml
- cuml==23.6.*
- ipython
- ipywidgets
- notebook
Expand Down Expand Up @@ -200,7 +200,7 @@ dependencies:
- output_types: conda
packages:
- *cudf_conda
- rmm=23.06
- rmm==23.6.*
specific:
- output_types: requirements
matrices:
Expand Down