Skip to content

Commit d287dae

Browse files
cjnoletcjnolet
committed
Revert "Merge branch 'main' into release/26.08"
This reverts commit ae5226c, reversing changes made to 2db820e.
1 parent ae5226c commit d287dae

54 files changed

Lines changed: 425 additions & 478 deletions

Some content is hidden

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"args": {
66
"CUDA": "12.9",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:26.10-cpp-mambaforge"
8+
"BASE": "rapidsai/devcontainers:26.08-cpp-mambaforge"
99
},
1010
"cacheFrom": [
1111
"ghcr.io/rapidsai/cuvs/devcontainer:26.08-cuda12.9-conda"
@@ -14,13 +14,13 @@
1414
"runArgs": [
1515
"--rm",
1616
"--name",
17-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.10-cuda12.9-conda",
17+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.08-cuda12.9-conda",
1818
"--ulimit",
1919
"nofile=500000"
2020
],
2121
"hostRequirements": {"gpu": "optional"},
2222
"features": {
23-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.10": {}
23+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.8": {}
2424
},
2525
"overrideFeatureInstallOrder": [
2626
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"args": {
66
"CUDA": "12.9",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:26.10-cpp-cuda12.9-ucx1.19.0-openmpi5.0.10"
8+
"BASE": "rapidsai/devcontainers:26.08-cpp-cuda12.9-ucx1.19.0-openmpi5.0.10"
99
},
1010
"cacheFrom": [
1111
"ghcr.io/rapidsai/cuvs/devcontainer:26.08-cuda12.9-pip"
@@ -14,20 +14,20 @@
1414
"runArgs": [
1515
"--rm",
1616
"--name",
17-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.10-cuda12.9-pip",
17+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.08-cuda12.9-pip",
1818
"--ulimit",
1919
"nofile=500000"
2020
],
2121
"hostRequirements": {"gpu": "optional"},
2222
"features": {
23-
"ghcr.io/rapidsai/devcontainers/features/cuda:26.10": {
23+
"ghcr.io/rapidsai/devcontainers/features/cuda:26.8": {
2424
"version": "12.9",
2525
"installcuBLAS": true,
2626
"installcuSOLVER": true,
2727
"installcuRAND": true,
2828
"installcuSPARSE": true
2929
},
30-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.10": {}
30+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.8": {}
3131
},
3232
"overrideFeatureInstallOrder": [
3333
"ghcr.io/rapidsai/devcontainers/features/ucx",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"args": {
66
"CUDA": "13.3",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:26.10-cpp-mambaforge"
8+
"BASE": "rapidsai/devcontainers:26.08-cpp-mambaforge"
99
},
1010
"cacheFrom": [
1111
"ghcr.io/rapidsai/cuvs/devcontainer:26.08-cuda13.3-conda"
@@ -14,13 +14,13 @@
1414
"runArgs": [
1515
"--rm",
1616
"--name",
17-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.10-cuda13.3-conda",
17+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.08-cuda13.3-conda",
1818
"--ulimit",
1919
"nofile=500000"
2020
],
2121
"hostRequirements": {"gpu": "optional"},
2222
"features": {
23-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.10": {}
23+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.8": {}
2424
},
2525
"overrideFeatureInstallOrder": [
2626
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"args": {
66
"CUDA": "13.3",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:26.10-cpp-cuda13.3-ucx1.19.0-openmpi5.0.10"
8+
"BASE": "rapidsai/devcontainers:26.08-cpp-cuda13.3-ucx1.19.0-openmpi5.0.10"
99
},
1010
"cacheFrom": [
1111
"ghcr.io/rapidsai/cuvs/devcontainer:26.08-cuda13.3-pip"
@@ -14,20 +14,20 @@
1414
"runArgs": [
1515
"--rm",
1616
"--name",
17-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.10-cuda13.3-pip",
17+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.08-cuda13.3-pip",
1818
"--ulimit",
1919
"nofile=500000"
2020
],
2121
"hostRequirements": {"gpu": "optional"},
2222
"features": {
23-
"ghcr.io/rapidsai/devcontainers/features/cuda:26.10": {
23+
"ghcr.io/rapidsai/devcontainers/features/cuda:26.8": {
2424
"version": "13.3",
2525
"installcuBLAS": true,
2626
"installcuSOLVER": true,
2727
"installcuRAND": true,
2828
"installcuSPARSE": true
2929
},
30-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.10": {}
30+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.8": {}
3131
},
3232
"overrideFeatureInstallOrder": [
3333
"ghcr.io/rapidsai/devcontainers/features/ucx",

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ CMakeLists.txt @NVIDIA/cuvs-cmake-codeowners
2828
cpp/scripts/run-cmake-format.sh @NVIDIA/cuvs-cmake-codeowners
2929

3030
#CI code owners
31-
/.coderabbit.yaml @NVIDIA/adi-ci-codeowners
3231
/.github/ @NVIDIA/adi-ci-codeowners
33-
/.shellcheckrc @NVIDIA/adi-ci-codeowners
34-
/.yamllint.yaml @NVIDIA/adi-ci-codeowners
3532
/ci/ @NVIDIA/adi-ci-codeowners
33+
/.shellcheckrc @NVIDIA/adi-ci-codeowners
34+
/.coderabbit.yaml @NVIDIA/adi-ci-codeowners
3635

3736
#packaging code owners
3837
/.pre-commit-config.yaml @NVIDIA/adi-packaging-codeowners

‎.github/workflows/build.yaml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
packages: read
4444
pull-requests: read
4545
secrets: inherit # zizmor: ignore[secrets-inherit]
46-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
46+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/26.08
4747
with:
4848
build_type: ${{ inputs.build_type || 'branch' }}
4949
branch: ${{ inputs.branch }}
@@ -55,7 +55,7 @@ jobs:
5555
rocky8-clib-standalone-build-matrix:
5656
permissions:
5757
contents: read
58-
uses: rapidsai/shared-workflows/.github/workflows/compute-matrix.yaml@main
58+
uses: rapidsai/shared-workflows/.github/workflows/compute-matrix.yaml@release/26.08
5959
with:
6060
build_type: pull-request
6161
matrix_name: conda-cpp-build
@@ -68,7 +68,7 @@ jobs:
6868
packages: read
6969
pull-requests: read
7070
secrets: inherit # zizmor: ignore[secrets-inherit]
71-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
71+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.08
7272
strategy:
7373
fail-fast: false
7474
matrix: ${{ fromJSON(needs.rocky8-clib-standalone-build-matrix.outputs.matrix) }}
@@ -77,7 +77,7 @@ jobs:
7777
branch: ${{ inputs.branch }}
7878
arch: "${{matrix.ARCH}}"
7979
date: ${{ inputs.date }}
80-
container_image: "rapidsai/ci-wheel:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
80+
container_image: "rapidsai/ci-wheel:26.08-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
8181
node_type: "cpu16"
8282
requires_license_builder: true
8383
script: "ci/build_standalone_c.sh"
@@ -88,7 +88,7 @@ jobs:
8888
needs: cpp-build
8989
permissions:
9090
contents: read
91-
uses: rapidsai/shared-workflows/.github/workflows/compute-matrix.yaml@main
91+
uses: rapidsai/shared-workflows/.github/workflows/compute-matrix.yaml@release/26.08
9292
with:
9393
build_type: pull-request
9494
matrix_name: conda-cpp-build
@@ -102,7 +102,7 @@ jobs:
102102
packages: read
103103
pull-requests: read
104104
secrets: inherit # zizmor: ignore[secrets-inherit]
105-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
105+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.08
106106
# Artifacts are not published from these jobs, so it's safe to run for multiple CUDA versions.
107107
# If these jobs start producing artifacts, the names will have to differentiate between CUDA versions.
108108
strategy:
@@ -113,15 +113,15 @@ jobs:
113113
branch: ${{ inputs.branch }}
114114
arch: "amd64"
115115
date: ${{ inputs.date }}
116-
container_image: "rapidsai/ci-conda:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
116+
container_image: "rapidsai/ci-conda:26.08-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
117117
node_type: "gpu-l4-latest-1"
118118
script: "ci/build_rust.sh"
119119
sha: ${{ inputs.sha }}
120120
go-build-matrix:
121121
needs: cpp-build
122122
permissions:
123123
contents: read
124-
uses: rapidsai/shared-workflows/.github/workflows/compute-matrix.yaml@main
124+
uses: rapidsai/shared-workflows/.github/workflows/compute-matrix.yaml@release/26.08
125125
with:
126126
build_type: pull-request
127127
matrix_name: conda-cpp-build
@@ -135,7 +135,7 @@ jobs:
135135
packages: read
136136
pull-requests: read
137137
secrets: inherit # zizmor: ignore[secrets-inherit]
138-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
138+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.08
139139
# Artifacts are not published from these jobs, so it's safe to run for multiple CUDA versions.
140140
# If these jobs start producing artifacts, the names will have to differentiate between CUDA versions.
141141
strategy:
@@ -146,15 +146,15 @@ jobs:
146146
branch: ${{ inputs.branch }}
147147
arch: "amd64"
148148
date: ${{ inputs.date }}
149-
container_image: "rapidsai/ci-conda:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
149+
container_image: "rapidsai/ci-conda:26.08-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
150150
node_type: "gpu-l4-latest-1"
151151
script: "ci/build_go.sh"
152152
sha: ${{ inputs.sha }}
153153
java-build-matrix:
154154
needs: cpp-build
155155
permissions:
156156
contents: read
157-
uses: rapidsai/shared-workflows/.github/workflows/compute-matrix.yaml@main
157+
uses: rapidsai/shared-workflows/.github/workflows/compute-matrix.yaml@release/26.08
158158
with:
159159
build_type: pull-request
160160
matrix_name: conda-cpp-build
@@ -168,7 +168,7 @@ jobs:
168168
packages: read
169169
pull-requests: read
170170
secrets: inherit # zizmor: ignore[secrets-inherit]
171-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
171+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.08
172172
# Artifacts are not published from these jobs, so it's safe to run for multiple CUDA versions.
173173
# If these jobs start producing artifacts, the names will have to differentiate between CUDA versions.
174174
strategy:
@@ -179,7 +179,7 @@ jobs:
179179
branch: ${{ inputs.branch }}
180180
arch: "amd64"
181181
date: ${{ inputs.date }}
182-
container_image: "rapidsai/ci-conda:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
182+
container_image: "rapidsai/ci-conda:26.08-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
183183
script: "ci/build_java.sh"
184184
artifact-name: "cuvs-java-cuda${{ matrix.CUDA_VER }}"
185185
file_to_upload: "java/cuvs-java/target/"
@@ -193,7 +193,7 @@ jobs:
193193
packages: read
194194
pull-requests: read
195195
secrets: inherit # zizmor: ignore[secrets-inherit]
196-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
196+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/26.08
197197
with:
198198
build_type: ${{ inputs.build_type || 'branch' }}
199199
branch: ${{ inputs.branch }}
@@ -210,7 +210,7 @@ jobs:
210210
id-token: write
211211
packages: read
212212
pull-requests: read
213-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@main
213+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@release/26.08
214214
secrets:
215215
CONDA_RAPIDSAI_NIGHTLY_TOKEN: ${{ secrets.CONDA_RAPIDSAI_NIGHTLY_TOKEN }}
216216
CONDA_RAPIDSAI_TOKEN: ${{ secrets.CONDA_RAPIDSAI_TOKEN }}
@@ -225,7 +225,7 @@ jobs:
225225
permissions:
226226
contents: read
227227
secrets:
228-
GPUTESTER_CRATES_TOKEN: ${{ secrets.GPUTESTER_CRATES_TOKEN }}
228+
GPUTESTER_CRATES_TOKEN: ${{ secrets.GPUTESTER_CRATES_TOKEN }}
229229
uses: ./.github/workflows/publish-rust.yaml
230230
docs-build:
231231
if: github.ref_type == 'branch'
@@ -236,12 +236,12 @@ jobs:
236236
packages: read
237237
pull-requests: read
238238
secrets: inherit # zizmor: ignore[secrets-inherit]
239-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
239+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.08
240240
with:
241241
arch: "amd64"
242242
branch: ${{ inputs.branch }}
243243
build_type: ${{ inputs.build_type || 'branch' }}
244-
container_image: "rapidsai/ci-conda:26.10-latest"
244+
container_image: "rapidsai/ci-conda:26.08-latest"
245245
date: ${{ inputs.date }}
246246
node_type: "gpu-l4-latest-1"
247247
script: "ci/build_docs.sh"
@@ -254,7 +254,7 @@ jobs:
254254
packages: read
255255
pull-requests: read
256256
secrets: inherit # zizmor: ignore[secrets-inherit]
257-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
257+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.08
258258
with:
259259
build_type: ${{ inputs.build_type || 'branch' }}
260260
branch: ${{ inputs.branch }}
@@ -274,7 +274,7 @@ jobs:
274274
id-token: write
275275
packages: read
276276
pull-requests: read
277-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
277+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/26.08
278278
secrets:
279279
CONDA_RAPIDSAI_WHEELS_NIGHTLY_TOKEN: ${{ secrets.CONDA_RAPIDSAI_WHEELS_NIGHTLY_TOKEN }}
280280
RAPIDSAI_PYPI_TOKEN: ${{ secrets.RAPIDSAI_PYPI_TOKEN }}
@@ -295,7 +295,7 @@ jobs:
295295
packages: read
296296
pull-requests: read
297297
secrets: inherit # zizmor: ignore[secrets-inherit]
298-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
298+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.08
299299
with:
300300
build_type: ${{ inputs.build_type || 'branch' }}
301301
branch: ${{ inputs.branch }}
@@ -315,7 +315,7 @@ jobs:
315315
id-token: write
316316
packages: read
317317
pull-requests: read
318-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
318+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/26.08
319319
secrets:
320320
CONDA_RAPIDSAI_WHEELS_NIGHTLY_TOKEN: ${{ secrets.CONDA_RAPIDSAI_WHEELS_NIGHTLY_TOKEN }}
321321
RAPIDSAI_PYPI_TOKEN: ${{ secrets.RAPIDSAI_PYPI_TOKEN }}
@@ -330,7 +330,7 @@ jobs:
330330
devcontainers:
331331
name: Build devcontainers
332332
secrets: inherit # zizmor: ignore[secrets-inherit]
333-
uses: rapidsai/shared-workflows/.github/workflows/build-devcontainers.yaml@main
333+
uses: rapidsai/shared-workflows/.github/workflows/build-devcontainers.yaml@release/26.08
334334
permissions:
335335
packages: write
336336
with:

‎.github/workflows/labeler.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ name: "Pull Request Labeler"
33
# incorrectly. These usages are ok and don't execute any PR-specific
44
# code (and so aren't susceptible to exploits from forked PRs)
55
on: # zizmor: ignore[dangerous-triggers]
6-
- pull_request_target
6+
- pull_request_target
77

88
jobs:
9-
triage:
10-
runs-on: ubuntu-latest
11-
permissions:
12-
contents: read
13-
pull-requests: write
14-
steps:
15-
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5
16-
with:
17-
repo-token: "${{ secrets.GITHUB_TOKEN }}"
9+
triage:
10+
runs-on: ubuntu-latest
11+
permissions:
12+
contents: read
13+
pull-requests: write
14+
steps:
15+
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5
16+
with:
17+
repo-token: "${{ secrets.GITHUB_TOKEN }}"

0 commit comments

Comments
 (0)