diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 120018bfe..cae29e22e 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -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 @@ -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} + 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 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 71950145f..a428c0b6d 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -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 @@ -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 @@ -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 diff --git a/dependencies.yaml b/dependencies.yaml index 6b79c0959..f078c3716 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -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 @@ -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: @@ -170,7 +170,7 @@ dependencies: common: - output_types: [conda, requirements] packages: - - cuml + - cuml==23.6.* - ipython - ipywidgets - notebook @@ -200,7 +200,7 @@ dependencies: - output_types: conda packages: - *cudf_conda - - rmm=23.06 + - rmm==23.6.* specific: - output_types: requirements matrices: