Skip to content

Commit 1cd7cc6

Browse files
authored
prefer system install of UCX in devcontainers, update outdated RAPIDS references (#53)
Contributes to rapidsai/build-planning#118 Proposes the following changes for pip devcontainers: * use UCX 1.17 (ref: rapidsai/cugraph-gnn#79 (comment)) * prefer system installation of ucx to the one provided by the `libucx-cu{11,12}` wheels (ref: rapidsai/devcontainers#421 (comment)) And some other related changes noticed while doing that: * update lingering `24.*` references to `25.02` * fix `update-version.sh` so those will be correctly updated in future releases Similar to rapidsai/cugraph#4792 ## Notes for Reviewers ### How I tested this Relying on CI for most things. But for `update-version.sh`, tested like this: ```shell ./ci/release/update-version.sh '25.02.00' git grep -E '24\.' ``` Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Bradley Dice (https://github.com/bdice) URL: #53
1 parent 0bb7639 commit 1cd7cc6

File tree

7 files changed

+23
-16
lines changed

7 files changed

+23
-16
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ ARG PYTHON_PACKAGE_MANAGER=conda
66
FROM ${BASE} as pip-base
77

88
ENV DEFAULT_VIRTUAL_ENV=rapids
9+
ENV RAPIDS_LIBUCX_PREFER_SYSTEM_LIBRARY=true
910

1011
RUN apt update -y \
1112
&& DEBIAN_FRONTEND=noninteractive apt install -y \

.devcontainer/cuda11.8-conda/devcontainer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
"args": {
66
"CUDA": "11.8",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:24.12-cpp-cuda11.8-mambaforge-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.02-cpp-cuda11.8-mambaforge-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.12-cuda11.8-conda"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.02-cuda11.8-conda"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.12": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.2": {}
1919
},
2020
"overrideFeatureInstallOrder": [
2121
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

.devcontainer/cuda11.8-pip/devcontainer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
"args": {
66
"CUDA": "11.8",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:24.12-cpp-cuda11.8-ucx1.15.0-openmpi-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.02-cpp-cuda11.8-ucx1.17.0-openmpi-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.12-cuda11.8-pip"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.02-cuda11.8-pip"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/cuda:24.12": {
18+
"ghcr.io/rapidsai/devcontainers/features/cuda:25.2": {
1919
"version": "11.8",
2020
"installcuBLAS": true,
2121
"installcuSOLVER": true,
2222
"installcuRAND": true,
2323
"installcuSPARSE": true
2424
},
25-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.12": {}
25+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.2": {}
2626
},
2727
"overrideFeatureInstallOrder": [
2828
"ghcr.io/rapidsai/devcontainers/features/cuda",

.devcontainer/cuda12.5-conda/devcontainer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
"args": {
66
"CUDA": "12.5",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:24.12-cpp-mambaforge-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.02-cpp-mambaforge-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.12-cuda12.5-conda"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.02-cuda12.5-conda"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.12": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.2": {}
1919
},
2020
"overrideFeatureInstallOrder": [
2121
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

.devcontainer/cuda12.5-pip/devcontainer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
"args": {
66
"CUDA": "12.5",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:24.12-cpp-cuda12.5-ucx1.17.0-openmpi-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.02-cpp-cuda12.5-ucx1.17.0-openmpi-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.12-cuda12.5-pip"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.02-cuda12.5-pip"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/cuda:24.12": {
18+
"ghcr.io/rapidsai/devcontainers/features/cuda:25.2": {
1919
"version": "12.5",
2020
"installcuBLAS": true,
2121
"installcuSOLVER": true,
2222
"installcuRAND": true,
2323
"installcuSPARSE": true
2424
},
25-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.12": {}
25+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.2": {}
2626
},
2727
"overrideFeatureInstallOrder": [
2828
"ghcr.io/rapidsai/devcontainers/features/cuda",

.github/workflows/pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- '!notebooks/**'
4343
devcontainer:
4444
secrets: inherit
45-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.12
45+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-25.02
4646
with:
4747
arch: '["amd64"]'
4848
cuda: '["12.5"]'

ci/release/update-version.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,13 @@ for FILE in .github/workflows/*.yaml; do
6262
sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}"
6363
done
6464

65-
sed_runner "s/branch-[0-9][0-9].[0-9][0-9]/branch-${NEXT_SHORT_TAG}/" ./docs/nx-cugraph/source/nx_cugraph/nx_cugraph.md
65+
# .devcontainer files
66+
find .devcontainer/ -type f -name devcontainer.json -print0 | while IFS= read -r -d '' filename; do
67+
sed_runner "s@rapidsai/devcontainers:[0-9.]*@rapidsai/devcontainers:${NEXT_SHORT_TAG}@g" "${filename}"
68+
sed_runner "s@rapidsai/devcontainers/features/cuda:[0-9.]*@rapidsai/devcontainers/features/cuda:${NEXT_SHORT_TAG_PEP440}@" "${filename}"
69+
sed_runner "s@rapidsai/devcontainers/features/rapids-build-utils:[0-9.]*@rapidsai/devcontainers/features/rapids-build-utils:${NEXT_SHORT_TAG_PEP440}@" "${filename}"
70+
sed_runner "s@rapids-\${localWorkspaceFolderBasename}-[0-9.]*@rapids-\${localWorkspaceFolderBasename}-${NEXT_SHORT_TAG}@g" "${filename}"
71+
done
6672

6773
# issue templates
6874
for FILE in ./.github/ISSUE_TEMPLATE/*.yaml; do

0 commit comments

Comments
 (0)