Skip to content

Commit ccaf285

Browse files
ajschmidt8ajschmidt8
authored
Fix dependency versions for 23.08 (#3638)
This PR fixes all of the RAPIDS dependency versions for `branch-23.08`. The processes around `update-version.sh` will eventually be improved in the future. For now, this manual fix will resolve the current issues on `branch-23.08`. The script can be (and was) tested locally by running commands like: ``` bash ci/release/update-version.sh 23.08.00 bash ci/release/update-version.sh 23.10.00 ``` Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - Bradley Dice (https://github.com/bdice) - Jake Awe (https://github.com/AyodeAwe) - Ray Douglass (https://github.com/raydouglass) - Chuck Hastings (https://github.com/ChuckHastings) - Rick Ratzel (https://github.com/rlratzel) URL: #3638
1 parent 39f68ac commit ccaf285

File tree

7 files changed

+75
-73
lines changed

7 files changed

+75
-73
lines changed

‎ci/release/update-version.sh‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ CURRENT_SHORT_TAG=${CURRENT_MAJOR}.${CURRENT_MINOR}
3030
NEXT_MAJOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[1]}')
3131
NEXT_MINOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[2]}')
3232
NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR}
33-
NEXT_UCX_PY_VERSION="$(curl -sL https://version.gpuci.io/rapids/${NEXT_SHORT_TAG}).*"
33+
NEXT_UCX_PY_VERSION="$(curl -sL https://version.gpuci.io/rapids/${NEXT_SHORT_TAG})"
3434

3535
echo "Preparing release $CURRENT_TAG => $NEXT_FULL_TAG"
3636

@@ -70,29 +70,47 @@ sed_runner "s/^version = .*/version = \"${NEXT_FULL_TAG}\"/g" python/cugraph-ser
7070
sed_runner "s/^version = .*/version = \"${NEXT_FULL_TAG}\"/g" python/cugraph-service/server/pyproject.toml
7171
sed_runner "s/^version = .*/version = \"${NEXT_FULL_TAG}\"/g" python/pylibcugraph/pyproject.toml
7272

73-
for FILE in conda/environments/*.yaml dependencies.yaml; do
74-
sed_runner "s/libcugraphops=${CURRENT_SHORT_TAG}/libcugraphops=${NEXT_SHORT_TAG}/g" ${FILE};
75-
sed_runner "s/pylibcugraphops=${CURRENT_SHORT_TAG}/pylibcugraphops=${NEXT_SHORT_TAG}/g" ${FILE};
76-
sed_runner "s/cudf=${CURRENT_SHORT_TAG}/cudf=${NEXT_SHORT_TAG}/g" ${FILE};
77-
sed_runner "s/rmm=${CURRENT_SHORT_TAG}/rmm=${NEXT_SHORT_TAG}/g" ${FILE};
78-
sed_runner "s/libraft-headers=${CURRENT_SHORT_TAG}/libraft-headers=${NEXT_SHORT_TAG}/g" ${FILE};
79-
sed_runner "s/libraft=${CURRENT_SHORT_TAG}/libraft=${NEXT_SHORT_TAG}/g" ${FILE};
80-
sed_runner "s/pyraft=${CURRENT_SHORT_TAG}/pyraft=${NEXT_SHORT_TAG}/g" ${FILE};
81-
sed_runner "s/raft-dask=${CURRENT_SHORT_TAG}/raft-dask=${NEXT_SHORT_TAG}/g" ${FILE};
82-
sed_runner "s/pylibraft=${CURRENT_SHORT_TAG}/pylibraft=${NEXT_SHORT_TAG}/g" ${FILE};
83-
sed_runner "s/dask-cuda=${CURRENT_SHORT_TAG}/dask-cuda=${NEXT_SHORT_TAG}/g" ${FILE};
84-
sed_runner "s/dask-cudf=${CURRENT_SHORT_TAG}/dask-cudf=${NEXT_SHORT_TAG}/g" ${FILE};
85-
sed_runner "s/cuxfilter=${CURRENT_SHORT_TAG}/cuxfilter=${NEXT_SHORT_TAG}/g" ${FILE};
86-
sed_runner "s/ucx-py==.*/ucx-py==${NEXT_UCX_PY_VERSION}/g" ${FILE};
73+
# Need to distutils-normalize the original version
74+
NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_SHORT_TAG}'))")
75+
76+
DEPENDENCIES=(
77+
cudf
78+
cugraph
79+
cugraph-service-client
80+
cuxfilter
81+
dask-cuda
82+
dask-cudf
83+
libcudf
84+
libcugraphops
85+
libraft
86+
libraft-headers
87+
librmm
88+
pylibcugraph
89+
pylibcugraphops
90+
pylibraft
91+
pyraft
92+
raft-dask
93+
rmm
94+
ucx-py
95+
)
96+
for DEP in "${DEPENDENCIES[@]}"; do
97+
for FILE in dependencies.yaml conda/environments/*.yaml; do
98+
sed_runner "/-.* ${DEP}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*/g" ${FILE}
99+
sed_runner "/-.* ucx-py==/ s/==.*/==${NEXT_UCX_PY_VERSION}.*/g" ${FILE}
100+
done
101+
for FILE in python/**/pyproject.toml python/**/**/pyproject.toml; do
102+
sed_runner "/\"${DEP}==/ s/==.*\"/==${NEXT_SHORT_TAG_PEP440}.*\"/g" ${FILE}
103+
sed_runner "/\"ucx-py==/ s/==.*\"/==${NEXT_UCX_PY_VERSION}.*\"/g" ${FILE}
104+
done
87105
done
88106

89107
# Doxyfile update
90108
sed_runner "s|PROJECT_NUMBER[[:space:]]*=.*|PROJECT_NUMBER=${NEXT_SHORT_TAG}|" cpp/doxygen/Doxyfile
91109

92110
# ucx-py version
93-
sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}\"/}" conda/recipes/cugraph/conda_build_config.yaml
94-
sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}\"/}" conda/recipes/cugraph-service/conda_build_config.yaml
95-
sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}\"/}" conda/recipes/pylibcugraph/conda_build_config.yaml
111+
sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}.*\"/}" conda/recipes/cugraph/conda_build_config.yaml
112+
sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}.*\"/}" conda/recipes/cugraph-service/conda_build_config.yaml
113+
sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}.*\"/}" conda/recipes/pylibcugraph/conda_build_config.yaml
96114

97115
# CI files
98116
for FILE in .github/workflows/*.yaml; do
@@ -103,19 +121,3 @@ for FILE in .github/workflows/*.yaml; do
103121
sed_runner "s/dask-cuda.git@branch-[0-9][0-9].[0-9][0-9]/dask-cuda.git@branch-${NEXT_SHORT_TAG}/g" "${FILE}"
104122
done
105123
sed_runner "s/VERSION_NUMBER=\".*/VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/build_docs.sh
106-
107-
108-
# Need to distutils-normalize the original version
109-
NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_SHORT_TAG}'))")
110-
111-
# Wheel builds install intra-RAPIDS dependencies from same release
112-
sed_runner "s/rmm==.*\",/rmm==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/cugraph/pyproject.toml
113-
sed_runner "s/pylibraft==.*\",/pylibraft==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/cugraph/pyproject.toml
114-
sed_runner "s/pylibcugraph==.*\",/pylibcugraph==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/cugraph/pyproject.toml
115-
sed_runner "s/raft-dask==.*\",/raft-dask==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/cugraph/pyproject.toml
116-
sed_runner "s/cudf==.*\",/cudf==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/cugraph/pyproject.toml
117-
sed_runner "s/dask-cuda==.*\",/dask-cuda==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/cugraph/pyproject.toml
118-
119-
sed_runner "s/rmm==.*\",/rmm==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/pylibcugraph/pyproject.toml
120-
sed_runner "s/pylibraft==.*\",/pylibraft==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/pylibcugraph/pyproject.toml
121-
sed_runner "s/cudf==.*\",/cudf==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/pylibcugraph/pyproject.toml

‎conda/environments/all_cuda-118_arch-x86_64.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ dependencies:
1111
- c-compiler
1212
- cmake>=3.23.1,!=3.25.0
1313
- cudatoolkit=11.8
14-
- cudf==23.6.*
14+
- cudf==23.8.*
1515
- cupy>=12.0.0
1616
- cxx-compiler
1717
- cython>=0.29,<0.30
1818
- dask-core==2023.3.2
19-
- dask-cuda==23.6.*
20-
- dask-cudf==23.6.*
19+
- dask-cuda==23.8.*
20+
- dask-cudf==23.8.*
2121
- dask==2023.3.2
2222
- distributed==2023.3.2.1
2323
- doxygen
@@ -27,11 +27,11 @@ dependencies:
2727
- graphviz
2828
- gtest>=1.13.0
2929
- ipython
30-
- libcudf=23.6.*
31-
- libcugraphops=23.6.*
32-
- libraft-headers=23.6.*
33-
- libraft=23.6.*
34-
- librmm=23.6.*
30+
- libcudf==23.8.*
31+
- libcugraphops==23.8.*
32+
- libraft-headers==23.8.*
33+
- libraft==23.8.*
34+
- librmm==23.8.*
3535
- nbsphinx
3636
- nccl>=2.9.9
3737
- networkx>=2.5.1
@@ -45,17 +45,17 @@ dependencies:
4545
- pandas
4646
- pre-commit
4747
- pydata-sphinx-theme
48-
- pylibcugraphops=23.6.*
49-
- pylibraft==23.6.*
48+
- pylibcugraphops==23.8.*
49+
- pylibraft==23.8.*
5050
- pytest
5151
- pytest-benchmark
5252
- pytest-cov
5353
- pytest-xdist
5454
- python-louvain
55-
- raft-dask==23.6.*
55+
- raft-dask==23.8.*
5656
- recommonmark
5757
- requests
58-
- rmm==23.6.*
58+
- rmm==23.8.*
5959
- scikit-build>=0.13.1,<0.17.2
6060
- scikit-learn>=0.23.1
6161
- scipy

‎dependencies.yaml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,10 @@ dependencies:
216216
- cxx-compiler
217217
- gmock>=1.13.0
218218
- gtest>=1.13.0
219-
- libcugraphops=23.6.*
220-
- libraft-headers=23.6.*
221-
- libraft=23.6.*
222-
- librmm=23.6.*
219+
- libcugraphops==23.8.*
220+
- libraft-headers==23.8.*
221+
- libraft==23.8.*
222+
- librmm==23.8.*
223223
- openmpi # Required for building cpp-mgtests (multi-GPU tests)
224224
specific:
225225
- output_types: [conda]
@@ -259,7 +259,7 @@ dependencies:
259259
- sphinx-markdown-tables
260260
- sphinx<6
261261
- sphinxcontrib-websupport
262-
- pylibcugraphops=23.6.*
262+
- pylibcugraphops==23.8.*
263263
py_version:
264264
specific:
265265
- output_types: [conda]
@@ -286,38 +286,38 @@ dependencies:
286286
- output_types: [conda, pyproject]
287287
packages:
288288
- cython>=0.29,<0.30
289-
- &pylibraft pylibraft==23.6.*
290-
- &rmm rmm==23.6.*
289+
- &pylibraft pylibraft==23.8.*
290+
- &rmm rmm==23.8.*
291291
- scikit-build>=0.13.1,<0.17.2
292292
python_build_cugraph:
293293
common:
294294
- output_types: [conda, pyproject]
295295
packages:
296-
- pylibcugraph==23.6.*
296+
- pylibcugraph==23.8.*
297297
python_run_cugraph:
298298
common:
299299
- output_types: [conda, pyproject]
300300
packages:
301-
- &cudf cudf==23.6.*
301+
- &cudf cudf==23.8.*
302302
- &dask dask==2023.3.2
303303
- &distributed distributed==2023.3.2.1
304-
- &dask_cuda dask-cuda==23.6.*
305-
- &dask_cudf dask-cudf==23.6.*
304+
- &dask_cuda dask-cuda==23.8.*
305+
- &dask_cudf dask-cudf==23.8.*
306306
- &numba numba>=0.57
307-
- raft-dask==23.6.*
307+
- raft-dask==23.8.*
308308
- *rmm
309309
- &ucx_py ucx-py==0.33.*
310310
- output_types: conda
311311
packages:
312312
- &cupy cupy>=12.0.0
313313
- &dask-core dask-core==2023.3.2
314-
- libcudf=23.6.*
314+
- libcudf==23.8.*
315315
- nccl>=2.9.9
316316
- ucx-proc=*=gpu
317317
- output_types: pyproject
318318
packages:
319319
- &cupy_pip cupy-cuda11x>=12.0.0
320-
- pylibcugraph==23.6.*
320+
- pylibcugraph==23.8.*
321321
python_run_pylibcugraph:
322322
common:
323323
- output_types: [conda, pyproject]
@@ -332,7 +332,7 @@ dependencies:
332332
- &numpy numpy>=1.21
333333
- output_types: [pyproject]
334334
packages:
335-
- &cugraph cugraph==23.6.*
335+
- &cugraph cugraph==23.8.*
336336
python_run_cugraph_pyg:
337337
common:
338338
- output_types: [conda, pyproject]
@@ -369,7 +369,7 @@ dependencies:
369369
packages:
370370
- *cupy_pip
371371
- *cugraph
372-
- cugraph-service-client==23.6.*
372+
- cugraph-service-client==23.8.*
373373
doc:
374374
common:
375375
- output_types: [conda]
@@ -383,7 +383,7 @@ dependencies:
383383
- sphinxcontrib-websupport
384384
- sphinx-markdown-tables
385385
- sphinx-copybutton
386-
- pylibcugraphops=23.6.*
386+
- pylibcugraphops==23.8.*
387387
test_notebook:
388388
common:
389389
- output_types: [conda, requirements]

‎python/cugraph-dgl/pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ authors = [
1919
license = { text = "Apache 2.0" }
2020
requires-python = ">=3.9"
2121
dependencies = [
22-
"cugraph==23.6.*",
22+
"cugraph==23.8.*",
2323
"numba>=0.57",
2424
"numpy>=1.21",
2525
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

‎python/cugraph-pyg/pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ classifiers = [
2626
"Programming Language :: Python :: 3.10",
2727
]
2828
dependencies = [
29-
"cugraph==23.6.*",
29+
"cugraph==23.8.*",
3030
"numba>=0.57",
3131
"numpy>=1.21",
3232
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

‎python/cugraph-service/server/pyproject.toml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ authors = [
1919
license = { text = "Apache 2.0" }
2020
requires-python = ">=3.9"
2121
dependencies = [
22-
"cudf==23.6.*",
23-
"cugraph-service-client==23.6.*",
24-
"cugraph==23.6.*",
22+
"cudf==23.8.*",
23+
"cugraph-service-client==23.8.*",
24+
"cugraph==23.8.*",
2525
"cupy-cuda11x>=12.0.0",
26-
"dask-cuda==23.6.*",
27-
"dask-cudf==23.6.*",
26+
"dask-cuda==23.8.*",
27+
"dask-cudf==23.8.*",
2828
"dask==2023.3.2",
2929
"distributed==2023.3.2.1",
3030
"numba>=0.57",
3131
"numpy>=1.21",
32-
"rmm==23.6.*",
32+
"rmm==23.8.*",
3333
"thriftpy2",
34-
"ucx-py==0.32.*",
34+
"ucx-py==0.33.*",
3535
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`.
3636
classifiers = [
3737
"Intended Audience :: Developers",

‎python/cugraph/pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dependencies = [
3939
"pylibcugraph==23.8.*",
4040
"raft-dask==23.8.*",
4141
"rmm==23.8.*",
42-
"ucx-py==0.32.*",
42+
"ucx-py==0.33.*",
4343
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
4444
classifiers = [
4545
"Intended Audience :: Developers",

0 commit comments

Comments
 (0)