Skip to content

Commit 5a3f8f3

Browse files
committed
Merge remote-tracking branch 'upstream/branch-22.08' into thrust-includes
2 parents ac19e15 + 46ff41a commit 5a3f8f3

5 files changed

Lines changed: 26 additions & 21 deletions

File tree

ci/release/update-version.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ sed_runner 's/'"branch-.*\/RAPIDS.cmake"'/'"branch-${NEXT_SHORT_TAG}\/RAPIDS.cma
3838
sed_runner 's/'"branch-.*\/RAPIDS.cmake"'/'"branch-${NEXT_SHORT_TAG}\/RAPIDS.cmake"'/g' python/pylibraft/CMakeLists.txt
3939

4040
for FILE in conda/environments/*.yml; do
41+
sed_runner "s/dask-cuda=${CURRENT_SHORT_TAG}/dask-cuda=${NEXT_SHORT_TAG}/g" ${FILE};
42+
sed_runner "s/rapids-build-env=${CURRENT_SHORT_TAG}/rapids-build-env=${NEXT_SHORT_TAG}/g" ${FILE};
43+
sed_runner "s/rapids-doc-env=${CURRENT_SHORT_TAG}/rapids-doc-env=${NEXT_SHORT_TAG}/g" ${FILE};
44+
sed_runner "s/rapids-notebook-env=${CURRENT_SHORT_TAG}/rapids-notebook-env=${NEXT_SHORT_TAG}/g" ${FILE};
45+
sed_runner "s/rmm=${CURRENT_SHORT_TAG}/rmm=${NEXT_SHORT_TAG}/g" ${FILE};
4146
sed_runner "s/ucx-py=.*/ucx-py=${NEXT_UCX_PY_VERSION}/g" ${FILE};
4247
done
4348

conda/environments/raft_dev_cuda11.0.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ dependencies:
1111
- cython>=0.29,<0.30
1212
- cmake>=3.20.1,!=3.23.0
1313
- scikit-build>=0.13.1
14-
- rapids-build-env=22.02.*
15-
- rapids-notebook-env=22.02.*
16-
- rapids-doc-env=22.02.*
17-
- rmm=22.02.*
18-
- dask-cuda=22.02.*
14+
- rapids-build-env=22.08.*
15+
- rapids-notebook-env=22.08.*
16+
- rapids-doc-env=22.08.*
17+
- rmm=22.08.*
18+
- dask-cuda=22.08.*
1919
- ucx>=1.12.1
2020
- ucx-py=0.27.*
2121
- ucx-proc=*=gpu

conda/environments/raft_dev_cuda11.2.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ dependencies:
1111
- cython>=0.29,<0.30
1212
- cmake>=3.20.1,!=3.23.0
1313
- scikit-build>=0.13.1
14-
- rapids-build-env=22.02.*
15-
- rapids-notebook-env=22.02.*
16-
- rapids-doc-env=22.02.*
17-
- rmm=22.02.*
18-
- dask-cuda=22.02.*
14+
- rapids-build-env=22.08.*
15+
- rapids-notebook-env=22.08.*
16+
- rapids-doc-env=22.08.*
17+
- rmm=22.08.*
18+
- dask-cuda=22.08.*
1919
- ucx>=1.12.1
2020
- ucx-py=0.27.*
2121
- ucx-proc=*=gpu
@@ -28,7 +28,7 @@ dependencies:
2828
- breathe
2929
- git+https://github.com/dask/dask.git@main
3030
- git+https://github.com/dask/distributed.git@main
31-
31+
3232
# rapids-build-env, notebook-env and doc-env are defined in
3333
# https://docs.rapids.ai/maintainers/depmgmt/
3434

conda/environments/raft_dev_cuda11.4.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ dependencies:
1111
- cython>=0.29,<0.30
1212
- cmake>=3.20.1,!=3.23.0
1313
- scikit-build>=0.13.1
14-
- rapids-build-env=22.02.*
15-
- rapids-notebook-env=22.02.*
16-
- rapids-doc-env=22.02.*
17-
- rmm=22.02.*
18-
- dask-cuda=22.02.*
14+
- rapids-build-env=22.08.*
15+
- rapids-notebook-env=22.08.*
16+
- rapids-doc-env=22.08.*
17+
- rmm=22.08.*
18+
- dask-cuda=22.08.*
1919
- ucx>=1.12.1
2020
- ucx-py=0.27.*
2121
- ucx-proc=*=gpu

conda/environments/raft_dev_cuda11.5.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ dependencies:
1212
- cython>=0.29,<0.30
1313
- cmake>=3.20.1,!=3.23.0
1414
- scikit-build>=0.13.1
15-
- rapids-build-env=22.02.*
16-
- rapids-notebook-env=22.02.*
17-
- rapids-doc-env=22.02.*
18-
- rmm=22.02.*
19-
- dask-cuda=22.02.*
15+
- rapids-build-env=22.08.*
16+
- rapids-notebook-env=22.08.*
17+
- rapids-doc-env=22.08.*
18+
- rmm=22.08.*
19+
- dask-cuda=22.08.*
2020
- ucx>=1.12.1
2121
- ucx-py=0.27.*
2222
- ucx-proc=*=gpu

0 commit comments

Comments
 (0)