Skip to content

Commit ad5bf28

Browse files
cjnoletcjnolet
authored
Merge branch 'branch-25.08' into cagra-fix-nnd-init
2 parents 89e10d2 + 9bb888f commit ad5bf28

322 files changed

Lines changed: 16115 additions & 24402 deletions

File tree

Some content is hidden

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

‎.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:25.06-cpp-cuda11.8-mambaforge-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.08-cpp-cuda11.8-mambaforge-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda11.8-conda"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.08-cuda11.8-conda"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.6": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.8": {}
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:25.06-cpp-cuda11.8-ucx1.18.0-openmpi-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.08-cpp-cuda11.8-ucx1.18.0-openmpi-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda11.8-pip"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.08-cuda11.8-pip"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/cuda:25.6": {
18+
"ghcr.io/rapidsai/devcontainers/features/cuda:25.8": {
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:25.6": {}
25+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.8": {}
2626
},
2727
"overrideFeatureInstallOrder": [
2828
"ghcr.io/rapidsai/devcontainers/features/ucx",

‎.devcontainer/cuda12.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": "12.8",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:25.06-cpp-mambaforge-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.08-cpp-mambaforge-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda12.8-conda"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.08-cuda12.8-conda"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.6": {}
18+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.8": {}
1919
},
2020
"overrideFeatureInstallOrder": [
2121
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

‎.devcontainer/cuda12.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": "12.8",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:25.06-cpp-cuda12.8-ucx1.18.0-openmpi-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.08-cpp-cuda12.8-ucx1.18.0-openmpi-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda12.8-pip"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.08-cuda12.8-pip"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
18-
"ghcr.io/rapidsai/devcontainers/features/cuda:25.6": {
18+
"ghcr.io/rapidsai/devcontainers/features/cuda:25.8": {
1919
"version": "12.8",
2020
"installcuBLAS": true,
2121
"installcuSOLVER": true,
2222
"installcuRAND": true,
2323
"installcuSPARSE": true
2424
},
25-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.6": {}
25+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.8": {}
2626
},
2727
"overrideFeatureInstallOrder": [
2828
"ghcr.io/rapidsai/devcontainers/features/ucx",

‎.github/workflows/build.yaml‎

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,25 @@ concurrency:
2828
jobs:
2929
cpp-build:
3030
secrets: inherit
31-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.06
31+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.08
3232
with:
3333
build_type: ${{ inputs.build_type || 'branch' }}
3434
branch: ${{ inputs.branch }}
3535
date: ${{ inputs.date }}
36+
script: ci/build_cpp.sh
3637
sha: ${{ inputs.sha }}
3738
rust-build:
3839
needs: cpp-build
3940
secrets: inherit
40-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
41+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.08
4142
with:
4243
build_type: ${{ inputs.build_type || 'branch' }}
4344
branch: ${{ inputs.branch }}
4445
arch: "amd64"
4546
date: ${{ inputs.date }}
4647
container_image: "rapidsai/ci-conda:latest"
4748
node_type: "gpu-l4-latest-1"
48-
run_script: "ci/build_rust.sh"
49+
script: "ci/build_rust.sh"
4950
sha: ${{ inputs.sha }}
5051
rust-publish:
5152
needs: rust-build
@@ -54,29 +55,43 @@ jobs:
5455
go-build:
5556
needs: cpp-build
5657
secrets: inherit
57-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
58+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.08
5859
with:
5960
build_type: ${{ inputs.build_type || 'branch' }}
6061
branch: ${{ inputs.branch }}
6162
arch: "amd64"
6263
date: ${{ inputs.date }}
6364
container_image: "rapidsai/ci-conda:latest"
6465
node_type: "gpu-l4-latest-1"
65-
run_script: "ci/build_go.sh"
66+
script: "ci/build_go.sh"
67+
sha: ${{ inputs.sha }}
68+
java-build:
69+
needs: cpp-build
70+
secrets: inherit
71+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
72+
with:
73+
build_type: ${{ inputs.build_type || 'branch' }}
74+
branch: ${{ inputs.branch }}
75+
arch: "amd64"
76+
date: ${{ inputs.date }}
77+
container_image: "rapidsai/ci-conda:latest"
78+
script: "ci/build_java.sh"
79+
file_to_upload: "java/cuvs-java/target/"
6680
sha: ${{ inputs.sha }}
6781
python-build:
6882
needs: [cpp-build]
6983
secrets: inherit
70-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06
84+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.08
7185
with:
7286
build_type: ${{ inputs.build_type || 'branch' }}
7387
branch: ${{ inputs.branch }}
7488
date: ${{ inputs.date }}
89+
script: ci/build_python.sh
7590
sha: ${{ inputs.sha }}
7691
upload-conda:
7792
needs: [cpp-build, python-build]
7893
secrets: inherit
79-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.06
94+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.08
8095
with:
8196
build_type: ${{ inputs.build_type || 'branch' }}
8297
branch: ${{ inputs.branch }}
@@ -87,19 +102,19 @@ jobs:
87102
if: github.ref_type == 'branch'
88103
needs: python-build
89104
secrets: inherit
90-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
105+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.08
91106
with:
92107
arch: "amd64"
93108
branch: ${{ inputs.branch }}
94109
build_type: ${{ inputs.build_type || 'branch' }}
95110
container_image: "rapidsai/ci-conda:latest"
96111
date: ${{ inputs.date }}
97112
node_type: "gpu-l4-latest-1"
98-
run_script: "ci/build_docs.sh"
113+
script: "ci/build_docs.sh"
99114
sha: ${{ inputs.sha }}
100115
wheel-build-libcuvs:
101116
secrets: inherit
102-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
117+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.08
103118
with:
104119
build_type: ${{ inputs.build_type || 'branch' }}
105120
branch: ${{ inputs.branch }}
@@ -108,12 +123,12 @@ jobs:
108123
script: ci/build_wheel_libcuvs.sh
109124
# build for every combination of arch and CUDA version, but only for the latest Python
110125
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
126+
package-name: libcuvs
111127
package-type: cpp
112-
wheel-name: libcuvs
113128
wheel-publish-libcuvs:
114129
needs: wheel-build-libcuvs
115130
secrets: inherit
116-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.06
131+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.08
117132
with:
118133
build_type: ${{ inputs.build_type || 'branch' }}
119134
branch: ${{ inputs.branch }}
@@ -124,19 +139,19 @@ jobs:
124139
wheel-build-cuvs:
125140
needs: wheel-build-libcuvs
126141
secrets: inherit
127-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
142+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.08
128143
with:
129144
build_type: ${{ inputs.build_type || 'branch' }}
130145
branch: ${{ inputs.branch }}
131146
sha: ${{ inputs.sha }}
132147
date: ${{ inputs.date }}
133148
script: ci/build_wheel_cuvs.sh
149+
package-name: cuvs
134150
package-type: python
135-
wheel-name: cuvs
136151
wheel-publish-cuvs:
137152
needs: wheel-build-cuvs
138153
secrets: inherit
139-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.06
154+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.08
140155
with:
141156
build_type: ${{ inputs.build_type || 'branch' }}
142157
branch: ${{ inputs.branch }}

0 commit comments

Comments
 (0)