Skip to content

Commit 2e181f9

Browse files
tfehertfeher
authored
Merge branch 'branch-24.02' into ivf_flat_host_dataset
2 parents eb2ceb9 + ea8c3ed commit 2e181f9

Some content is hidden

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

42 files changed

+464
-295
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"args": {
66
"CUDA": "11.8",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:23.12-cpp-llvm16-cuda11.8-mambaforge-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:24.02-cpp-llvm16-cuda11.8-mambaforge-ubuntu22.04"
99
}
1010
},
1111
"hostRequirements": {"gpu": "optional"},
1212
"features": {
13-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.12": {}
13+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.2": {}
1414
},
1515
"overrideFeatureInstallOrder": [
1616
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"args": {
66
"CUDA": "11.8",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:23.12-cpp-llvm16-cuda11.8-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:24.02-cpp-llvm16-cuda11.8-ubuntu22.04"
99
}
1010
},
1111
"hostRequirements": {"gpu": "optional"},
1212
"features": {
13-
"ghcr.io/rapidsai/devcontainers/features/ucx:23.12": {"version": "1.14.1"},
14-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.12": {}
13+
"ghcr.io/rapidsai/devcontainers/features/ucx:24.2": {"version": "1.14.1"},
14+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.2": {}
1515
},
1616
"overrideFeatureInstallOrder": [
1717
"ghcr.io/rapidsai/devcontainers/features/ucx",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"args": {
66
"CUDA": "12.0",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:23.12-cpp-mambaforge-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:24.02-cpp-mambaforge-ubuntu22.04"
99
}
1010
},
1111
"hostRequirements": {"gpu": "optional"},
1212
"features": {
13-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.12": {}
13+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.2": {}
1414
},
1515
"overrideFeatureInstallOrder": [
1616
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"args": {
66
"CUDA": "12.0",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:23.12-cpp-llvm16-cuda12.0-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:24.02-cpp-llvm16-cuda12.0-ubuntu22.04"
99
}
1010
},
1111
"hostRequirements": {"gpu": "optional"},
1212
"features": {
13-
"ghcr.io/rapidsai/devcontainers/features/ucx:23.12": {"version": "1.14.1"},
14-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.12": {}
13+
"ghcr.io/rapidsai/devcontainers/features/ucx:24.2": {"version": "1.14.1"},
14+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.2": {}
1515
},
1616
"overrideFeatureInstallOrder": [
1717
"ghcr.io/rapidsai/devcontainers/features/ucx",

‎.github/workflows/build.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ concurrency:
2828
jobs:
2929
cpp-build:
3030
secrets: inherit
31-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.12
31+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.02
3232
with:
3333
build_type: ${{ inputs.build_type || 'branch' }}
3434
branch: ${{ inputs.branch }}
@@ -37,7 +37,7 @@ jobs:
3737
python-build:
3838
needs: [cpp-build]
3939
secrets: inherit
40-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-23.12
40+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.02
4141
with:
4242
build_type: ${{ inputs.build_type || 'branch' }}
4343
branch: ${{ inputs.branch }}
@@ -46,7 +46,7 @@ jobs:
4646
upload-conda:
4747
needs: [cpp-build, python-build]
4848
secrets: inherit
49-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.12
49+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.02
5050
with:
5151
build_type: ${{ inputs.build_type || 'branch' }}
5252
branch: ${{ inputs.branch }}
@@ -57,7 +57,7 @@ jobs:
5757
if: github.ref_type == 'branch'
5858
needs: python-build
5959
secrets: inherit
60-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-23.12
60+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.02
6161
with:
6262
arch: "amd64"
6363
branch: ${{ inputs.branch }}
@@ -69,7 +69,7 @@ jobs:
6969
sha: ${{ inputs.sha }}
7070
wheel-build-pylibraft:
7171
secrets: inherit
72-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-23.12
72+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.02
7373
with:
7474
build_type: ${{ inputs.build_type || 'branch' }}
7575
branch: ${{ inputs.branch }}
@@ -79,7 +79,7 @@ jobs:
7979
wheel-publish-pylibraft:
8080
needs: wheel-build-pylibraft
8181
secrets: inherit
82-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-23.12
82+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.02
8383
with:
8484
build_type: ${{ inputs.build_type || 'branch' }}
8585
branch: ${{ inputs.branch }}
@@ -89,7 +89,7 @@ jobs:
8989
wheel-build-raft-dask:
9090
needs: wheel-publish-pylibraft
9191
secrets: inherit
92-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-23.12
92+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.02
9393
with:
9494
build_type: ${{ inputs.build_type || 'branch' }}
9595
branch: ${{ inputs.branch }}
@@ -99,7 +99,7 @@ jobs:
9999
wheel-publish-raft-dask:
100100
needs: wheel-build-raft-dask
101101
secrets: inherit
102-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-23.12
102+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.02
103103
with:
104104
build_type: ${{ inputs.build_type || 'branch' }}
105105
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,49 +25,49 @@ jobs:
2525
- wheel-tests-raft-dask
2626
- devcontainer
2727
secrets: inherit
28-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-23.12
28+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.02
2929
checks:
3030
secrets: inherit
31-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-23.12
31+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.02
3232
with:
3333
enable_check_generated_files: false
3434
conda-cpp-build:
3535
needs: checks
3636
secrets: inherit
37-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.12
37+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.02
3838
with:
3939
build_type: pull-request
4040
node_type: cpu16
4141
conda-cpp-tests:
4242
needs: conda-cpp-build
4343
secrets: inherit
44-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.12
44+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.02
4545
with:
4646
build_type: pull-request
4747
conda-cpp-checks:
4848
needs: conda-cpp-build
4949
secrets: inherit
50-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-23.12
50+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.02
5151
with:
5252
build_type: pull-request
5353
enable_check_symbols: true
5454
symbol_exclusions: (void (thrust::|cub::)|_ZN\d+raft_cutlass)
5555
conda-python-build:
5656
needs: conda-cpp-build
5757
secrets: inherit
58-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-23.12
58+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.02
5959
with:
6060
build_type: pull-request
6161
conda-python-tests:
6262
needs: conda-python-build
6363
secrets: inherit
64-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-23.12
64+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.02
6565
with:
6666
build_type: pull-request
6767
docs-build:
6868
needs: conda-python-build
6969
secrets: inherit
70-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-23.12
70+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.02
7171
with:
7272
build_type: pull-request
7373
node_type: "gpu-v100-latest-1"
@@ -77,34 +77,34 @@ jobs:
7777
wheel-build-pylibraft:
7878
needs: checks
7979
secrets: inherit
80-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-23.12
80+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.02
8181
with:
8282
build_type: pull-request
8383
script: ci/build_wheel_pylibraft.sh
8484
wheel-tests-pylibraft:
8585
needs: wheel-build-pylibraft
8686
secrets: inherit
87-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-23.12
87+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.02
8888
with:
8989
build_type: pull-request
9090
script: ci/test_wheel_pylibraft.sh
9191
wheel-build-raft-dask:
9292
needs: wheel-tests-pylibraft
9393
secrets: inherit
94-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-23.12
94+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.02
9595
with:
9696
build_type: pull-request
9797
script: "ci/build_wheel_raft_dask.sh"
9898
wheel-tests-raft-dask:
9999
needs: wheel-build-raft-dask
100100
secrets: inherit
101-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-23.12
101+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.02
102102
with:
103103
build_type: pull-request
104104
script: ci/test_wheel_raft_dask.sh
105105
devcontainer:
106106
secrets: inherit
107-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-23.12
107+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.02
108108
with:
109109
build_command: |
110110
sccache -z;

‎.github/workflows/test.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
jobs:
1717
conda-cpp-checks:
1818
secrets: inherit
19-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-23.12
19+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.02
2020
with:
2121
build_type: nightly
2222
branch: ${{ inputs.branch }}
@@ -26,23 +26,23 @@ jobs:
2626
symbol_exclusions: (void (thrust::|cub::)|_ZN\d+raft_cutlass)
2727
conda-cpp-tests:
2828
secrets: inherit
29-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.12
29+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.02
3030
with:
3131
build_type: nightly
3232
branch: ${{ inputs.branch }}
3333
date: ${{ inputs.date }}
3434
sha: ${{ inputs.sha }}
3535
conda-python-tests:
3636
secrets: inherit
37-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-23.12
37+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.02
3838
with:
3939
build_type: nightly
4040
branch: ${{ inputs.branch }}
4141
date: ${{ inputs.date }}
4242
sha: ${{ inputs.sha }}
4343
wheel-tests-pylibraft:
4444
secrets: inherit
45-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-23.12
45+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.02
4646
with:
4747
build_type: nightly
4848
branch: ${{ inputs.branch }}
@@ -51,7 +51,7 @@ jobs:
5151
script: ci/test_wheel_pylibraft.sh
5252
wheel-tests-raft-dask:
5353
secrets: inherit
54-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-23.12
54+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.02
5555
with:
5656
build_type: nightly
5757
branch: ${{ inputs.branch }}

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ You can also install the conda packages individually using the `mamba` command a
287287
mamba install -c rapidsai -c conda-forge -c nvidia libraft libraft-headers cuda-version=12.0
288288
```
289289

290-
If installing the C++ APIs please see [using libraft](https://docs.rapids.ai/api/raft/nightly/using_libraft/) for more information on using the pre-compiled shared library. You can also refer to the [example C++ template project](https://github.com/rapidsai/raft/tree/branch-23.12/cpp/template) for a ready-to-go CMake configuration that you can drop into your project and build against installed RAFT development artifacts above.
290+
If installing the C++ APIs please see [using libraft](https://docs.rapids.ai/api/raft/nightly/using_libraft/) for more information on using the pre-compiled shared library. You can also refer to the [example C++ template project](https://github.com/rapidsai/raft/tree/branch-24.02/cpp/template) for a ready-to-go CMake configuration that you can drop into your project and build against installed RAFT development artifacts above.
291291

292292
### Installing Python through Pip
293293

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
23.12.00
1+
24.02.00

‎ci/build_docs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ rapids-mamba-retry install \
2828
pylibraft \
2929
raft-dask
3030

31-
export RAPIDS_VERSION_NUMBER="23.12"
31+
export RAPIDS_VERSION_NUMBER="24.02"
3232
export RAPIDS_DOCS_DIR="$(mktemp -d)"
3333

3434
rapids-logger "Build CPP docs"

0 commit comments

Comments
 (0)