Skip to content

Commit e17b966

Browse files
nirandapereranirandaperera
authored
Merge branch 'branch-25.12' into branch-25.10
2 parents c1bdf78 + 1095845 commit e17b966

File tree

86 files changed

+1143
-641
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1143
-641
lines changed

‎.devcontainer/cuda12.9-conda/devcontainer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
"args": {
66
"CUDA": "12.9",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:25.10-cpp-mambaforge"
8+
"BASE": "rapidsai/devcontainers:25.12-cpp-mambaforge"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.10-cuda12.9-conda",
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.12-cuda12.9-conda",
1515
"--ulimit",
1616
"nofile=500000"
1717
],
1818
"hostRequirements": {"gpu": "optional"},
1919
"features": {
20-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.10": {}
20+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.12": {}
2121
},
2222
"overrideFeatureInstallOrder": [
2323
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

‎.devcontainer/cuda12.9-pip/devcontainer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
"args": {
66
"CUDA": "12.9",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:25.10-cpp-cuda12.9-ucx1.19.0-openmpi5.0.7"
8+
"BASE": "rapidsai/devcontainers:25.12-cpp-cuda12.9-ucx1.19.0-openmpi5.0.7"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.10-cuda12.9-pip",
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.12-cuda12.9-pip",
1515
"--ulimit",
1616
"nofile=500000"
1717
],
1818
"hostRequirements": {"gpu": "optional"},
1919
"features": {
20-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.10": {}
20+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.12": {}
2121
},
2222
"overrideFeatureInstallOrder": [
2323
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

‎.devcontainer/cuda13.0-conda/devcontainer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
"args": {
66
"CUDA": "13.0",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:25.10-cpp-mambaforge"
8+
"BASE": "rapidsai/devcontainers:25.12-cpp-mambaforge"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.10-cuda13.0-conda",
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.12-cuda13.0-conda",
1515
"--ulimit",
1616
"nofile=500000"
1717
],
1818
"hostRequirements": {"gpu": "optional"},
1919
"features": {
20-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.10": {}
20+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.12": {}
2121
},
2222
"overrideFeatureInstallOrder": [
2323
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

‎.devcontainer/cuda13.0-pip/devcontainer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
"args": {
66
"CUDA": "13.0",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:25.10-cpp-cuda13.0-ucx1.19.0-openmpi5.0.7"
8+
"BASE": "rapidsai/devcontainers:25.12-cpp-cuda13.0-ucx1.19.0-openmpi5.0.7"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.10-cuda13.0-pip",
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.12-cuda13.0-pip",
1515
"--ulimit",
1616
"nofile=500000"
1717
],
1818
"hostRequirements": {"gpu": "optional"},
1919
"features": {
20-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.10": {}
20+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.12": {}
2121
},
2222
"overrideFeatureInstallOrder": [
2323
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

‎.github/workflows/build.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ concurrency:
3434
jobs:
3535
conda-cpp-build:
3636
secrets: inherit
37-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.10
37+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.12
3838
with:
3939
build_type: ${{ inputs.build_type || 'branch' }}
4040
branch: ${{ inputs.branch }}
@@ -44,7 +44,7 @@ jobs:
4444
conda-python-build:
4545
needs: [conda-cpp-build]
4646
secrets: inherit
47-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.10
47+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.12
4848
with:
4949
build_type: ${{ inputs.build_type || 'branch' }}
5050
branch: ${{ inputs.branch }}
@@ -54,7 +54,7 @@ jobs:
5454
upload-conda:
5555
needs: [conda-cpp-build, conda-python-build]
5656
secrets: inherit
57-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.10
57+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.12
5858
with:
5959
build_type: ${{ inputs.build_type || 'branch' }}
6060
branch: ${{ inputs.branch }}
@@ -64,19 +64,19 @@ jobs:
6464
if: github.ref_type == 'branch'
6565
needs: conda-python-build
6666
secrets: inherit
67-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.10
67+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.12
6868
with:
6969
arch: "amd64"
7070
branch: ${{ inputs.branch }}
7171
build_type: ${{ inputs.build_type || 'branch' }}
72-
container_image: "rapidsai/ci-conda:25.10-latest"
72+
container_image: "rapidsai/ci-conda:25.12-latest"
7373
date: ${{ inputs.date }}
7474
node_type: "cpu8"
7575
script: "ci/build_docs.sh"
7676
sha: ${{ inputs.sha }}
7777
wheel-build-librapidsmpf:
7878
secrets: inherit
79-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.10
79+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.12
8080
with:
8181
build_type: ${{ inputs.build_type || 'branch' }}
8282
branch: ${{ inputs.branch }}
@@ -90,7 +90,7 @@ jobs:
9090
wheel-publish-librapidsmpf:
9191
needs: wheel-build-librapidsmpf
9292
secrets: inherit
93-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.10
93+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.12
9494
with:
9595
build_type: ${{ inputs.build_type || 'branch' }}
9696
branch: ${{ inputs.branch }}
@@ -101,7 +101,7 @@ jobs:
101101
wheel-build-rapidsmpf:
102102
needs: wheel-build-librapidsmpf
103103
secrets: inherit
104-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.10
104+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.12
105105
with:
106106
build_type: ${{ inputs.build_type || 'branch' }}
107107
branch: ${{ inputs.branch }}
@@ -113,7 +113,7 @@ jobs:
113113
wheel-publish-rapidsmpf:
114114
needs: wheel-build-rapidsmpf
115115
secrets: inherit
116-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.10
116+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.12
117117
with:
118118
build_type: ${{ inputs.build_type || 'branch' }}
119119
branch: ${{ inputs.branch }}
@@ -124,7 +124,7 @@ jobs:
124124
wheel-build-rapidsmpf-singlecomm:
125125
needs: wheel-build-rapidsmpf
126126
secrets: inherit
127-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.10
127+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.12
128128
with:
129129
build_type: ${{ inputs.build_type || 'branch' }}
130130
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ jobs:
2727
- wheel-test
2828
- devcontainer
2929
secrets: inherit
30-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.10
30+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.12
3131
if: always()
3232
with:
3333
needs: ${{ toJSON(needs) }}
3434
changed-files:
3535
secrets: inherit
36-
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@branch-25.10
36+
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@branch-25.12
3737
with:
3838
files_yaml: |
3939
test_cpp:
@@ -59,11 +59,11 @@ jobs:
5959
- '!docs/**'
6060
checks:
6161
secrets: inherit
62-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.10
62+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.12
6363
wheel-build-librapidsmpf:
6464
needs: checks
6565
secrets: inherit
66-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.10
66+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.12
6767
with:
6868
build_type: pull-request
6969
script: ci/build_wheel_librapidsmpf.sh
@@ -74,7 +74,7 @@ jobs:
7474
wheel-build-rapidsmpf:
7575
needs: [checks, wheel-build-librapidsmpf]
7676
secrets: inherit
77-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.10
77+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.12
7878
with:
7979
build_type: pull-request
8080
script: ci/build_wheel_rapidsmpf.sh
@@ -83,7 +83,7 @@ jobs:
8383
wheel-build-rapidsmpf-singlecomm:
8484
needs: [checks, wheel-build-librapidsmpf]
8585
secrets: inherit
86-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.10
86+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.12
8787
with:
8888
build_type: pull-request
8989
script: ci/build_wheel_singlecomm.sh
@@ -93,22 +93,22 @@ jobs:
9393
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
9494
needs: [changed-files, wheel-build-rapidsmpf]
9595
secrets: inherit
96-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.10
96+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.12
9797
with:
9898
build_type: pull-request
9999
container-options: "--cap-add CAP_SYS_PTRACE --shm-size=8g --ulimit=nofile=1000000:1000000"
100100
script: ci/test_wheel.sh
101101
conda-cpp-build:
102102
needs: checks
103103
secrets: inherit
104-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.10
104+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.12
105105
with:
106106
build_type: pull-request
107107
script: ci/build_cpp.sh
108108
conda-cpp-linters:
109109
secrets: inherit
110110
needs: checks
111-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.10
111+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.12
112112
with:
113113
build_type: pull-request
114114
script: "ci/cpp_linters.sh"
@@ -117,31 +117,31 @@ jobs:
117117
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
118118
needs: [changed-files, conda-cpp-build]
119119
secrets: inherit
120-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.10
120+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.12
121121
with:
122122
build_type: pull-request
123123
container-options: "--cap-add CAP_SYS_PTRACE --shm-size=8g --ulimit=nofile=1000000:1000000"
124124
script: ci/test_cpp.sh
125125
conda-cpp-memcheck:
126126
secrets: inherit
127127
needs: conda-cpp-build
128-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.10
128+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.12
129129
with:
130130
build_type: pull-request
131131
script: "ci/test_cpp_memcheck.sh"
132132
node_type: "gpu-l4-latest-1"
133133
conda-python-build:
134134
needs: conda-cpp-build
135135
secrets: inherit
136-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.10
136+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.12
137137
with:
138138
build_type: pull-request
139139
script: ci/build_python.sh
140140
conda-python-tests:
141141
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
142142
needs: [changed-files, conda-python-build]
143143
secrets: inherit
144-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.10
144+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.12
145145
with:
146146
build_type: pull-request
147147
container-options: "--cap-add CAP_SYS_PTRACE --shm-size=8g --ulimit=nofile=1000000:1000000"
@@ -150,16 +150,16 @@ jobs:
150150
docs-build:
151151
needs: conda-python-build
152152
secrets: inherit
153-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.10
153+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.12
154154
with:
155155
build_type: pull-request
156156
node_type: "cpu8"
157157
arch: "amd64"
158-
container_image: "rapidsai/ci-conda:25.10-latest"
158+
container_image: "rapidsai/ci-conda:25.12-latest"
159159
script: "ci/build_docs.sh"
160160
devcontainer:
161161
secrets: inherit
162-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-25.10
162+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-25.12
163163
with:
164164
arch: '["amd64", "arm64"]'
165165
cuda: '["13.0"]'

‎.github/workflows/test.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
jobs:
2626
conda-cpp-tests:
2727
secrets: inherit
28-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.10
28+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.12
2929
with:
3030
build_type: ${{ inputs.build_type }}
3131
branch: ${{ inputs.branch }}
@@ -35,7 +35,7 @@ jobs:
3535
sha: ${{ inputs.sha }}
3636
conda-cpp-memcheck:
3737
secrets: inherit
38-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.10
38+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.12
3939
with:
4040
build_type: ${{ inputs.build_type }}
4141
branch: ${{ inputs.branch }}
@@ -46,7 +46,7 @@ jobs:
4646
sha: ${{ inputs.sha }}
4747
conda-python-tests:
4848
secrets: inherit
49-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.10
49+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.12
5050
with:
5151
build_type: ${{ inputs.build_type }}
5252
branch: ${{ inputs.branch }}
@@ -57,7 +57,7 @@ jobs:
5757
sha: ${{ inputs.sha }}
5858
wheel-test:
5959
secrets: inherit
60-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.10
60+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.12
6161
with:
6262
build_type: ${{ inputs.build_type }}
6363
branch: ${{ inputs.branch }}

‎RAPIDS_BRANCH‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
branch-25.12

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
25.10.00
1+
25.12.00

‎ci/build_docs.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,15 @@ rapids-print-env
3232
RAPIDS_DOCS_DIR="$(mktemp -d)"
3333
export RAPIDS_DOCS_DIR
3434

35+
# Trap ERR so that `EXITCODE` is printed when a command fails and the script
36+
# exits with error status
3537
EXITCODE=0
36-
trap "EXITCODE=1" ERR
38+
# shellcheck disable=SC2317
39+
set_exit_code() {
40+
EXITCODE=$?
41+
rapids-logger "Test failed with exit code ${EXITCODE}"
42+
}
43+
trap set_exit_code ERR
3744
set +e
3845

3946
rapids-logger "Build CPP docs"
@@ -56,4 +63,5 @@ popd
5663

5764
RAPIDS_VERSION_NUMBER="${RAPIDS_VERSION_MAJOR_MINOR}" rapids-upload-docs
5865

66+
rapids-logger "Test script exiting with exit code: $EXITCODE"
5967
exit ${EXITCODE}

0 commit comments

Comments
 (0)