Skip to content

Commit ed2994f

Browse files
benfredbenfred
authored
Merge branch 'branch-24.10' into c-add-memory-pool
2 parents 2690b35 + a6b71d7 commit ed2994f

36 files changed

Lines changed: 1332 additions & 148 deletions

‎.github/workflows/build.yaml‎

Lines changed: 7 additions & 7 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-24.10
31+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@python-3.12
3232
with:
3333
build_type: ${{ inputs.build_type || 'branch' }}
3434
branch: ${{ inputs.branch }}
@@ -37,7 +37,7 @@ jobs:
3737
rust-build:
3838
needs: cpp-build
3939
secrets: inherit
40-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10
40+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@python-3.12
4141
with:
4242
build_type: ${{ inputs.build_type || 'branch' }}
4343
branch: ${{ inputs.branch }}
@@ -50,7 +50,7 @@ jobs:
5050
python-build:
5151
needs: [cpp-build]
5252
secrets: inherit
53-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10
53+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@python-3.12
5454
with:
5555
build_type: ${{ inputs.build_type || 'branch' }}
5656
branch: ${{ inputs.branch }}
@@ -59,7 +59,7 @@ jobs:
5959
upload-conda:
6060
needs: [cpp-build, python-build]
6161
secrets: inherit
62-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.10
62+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@python-3.12
6363
with:
6464
build_type: ${{ inputs.build_type || 'branch' }}
6565
branch: ${{ inputs.branch }}
@@ -70,7 +70,7 @@ jobs:
7070
if: github.ref_type == 'branch'
7171
needs: python-build
7272
secrets: inherit
73-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10
73+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@python-3.12
7474
with:
7575
arch: "amd64"
7676
branch: ${{ inputs.branch }}
@@ -82,7 +82,7 @@ jobs:
8282
sha: ${{ inputs.sha }}
8383
wheel-build-cuvs:
8484
secrets: inherit
85-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10
85+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.12
8686
with:
8787
build_type: ${{ inputs.build_type || 'branch' }}
8888
branch: ${{ inputs.branch }}
@@ -92,7 +92,7 @@ jobs:
9292
wheel-publish-cuvs:
9393
needs: wheel-build-cuvs
9494
secrets: inherit
95-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.10
95+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@python-3.12
9696
with:
9797
build_type: ${{ inputs.build_type || 'branch' }}
9898
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,49 +24,49 @@ jobs:
2424
- wheel-tests-cuvs
2525
- devcontainer
2626
secrets: inherit
27-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.10
27+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@python-3.12
2828
checks:
2929
secrets: inherit
30-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10
30+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@python-3.12
3131
with:
3232
enable_check_generated_files: false
3333
conda-cpp-build:
3434
needs: checks
3535
secrets: inherit
36-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.10
36+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@python-3.12
3737
with:
3838
build_type: pull-request
3939
node_type: cpu16
4040
conda-cpp-tests:
4141
needs: conda-cpp-build
4242
secrets: inherit
43-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10
43+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@python-3.12
4444
with:
4545
build_type: pull-request
4646
conda-cpp-checks:
4747
needs: conda-cpp-build
4848
secrets: inherit
49-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.10
49+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@python-3.12
5050
with:
5151
build_type: pull-request
5252
enable_check_symbols: true
5353
symbol_exclusions: (void (thrust::|cub::)|raft_cutlass)
5454
conda-python-build:
5555
needs: conda-cpp-build
5656
secrets: inherit
57-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10
57+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@python-3.12
5858
with:
5959
build_type: pull-request
6060
conda-python-tests:
6161
needs: conda-python-build
6262
secrets: inherit
63-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10
63+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@python-3.12
6464
with:
6565
build_type: pull-request
6666
docs-build:
6767
needs: conda-python-build
6868
secrets: inherit
69-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10
69+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@python-3.12
7070
with:
7171
build_type: pull-request
7272
node_type: "gpu-v100-latest-1"
@@ -76,7 +76,7 @@ jobs:
7676
rust-build:
7777
needs: conda-cpp-build
7878
secrets: inherit
79-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10
79+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@python-3.12
8080
with:
8181
build_type: pull-request
8282
node_type: "gpu-v100-latest-1"
@@ -86,20 +86,20 @@ jobs:
8686
wheel-build-cuvs:
8787
needs: checks
8888
secrets: inherit
89-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10
89+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.12
9090
with:
9191
build_type: pull-request
9292
script: ci/build_wheel_cuvs.sh
9393
wheel-tests-cuvs:
9494
needs: wheel-build-cuvs
9595
secrets: inherit
96-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10
96+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@python-3.12
9797
with:
9898
build_type: pull-request
9999
script: ci/test_wheel_cuvs.sh
100100
devcontainer:
101101
secrets: inherit
102-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.10
102+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@python-3.12
103103
with:
104104
arch: '["amd64"]'
105105
cuda: '["12.5"]'

‎.github/workflows/test.yaml‎

Lines changed: 4 additions & 4 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-24.10
19+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@python-3.12
2020
with:
2121
build_type: nightly
2222
branch: ${{ inputs.branch }}
@@ -26,23 +26,23 @@ jobs:
2626
symbol_exclusions: (void (thrust::|cub::)|raft_cutlass)
2727
conda-cpp-tests:
2828
secrets: inherit
29-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10
29+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@python-3.12
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-24.10
37+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@python-3.12
3838
with:
3939
build_type: nightly
4040
branch: ${{ inputs.branch }}
4141
date: ${{ inputs.date }}
4242
sha: ${{ inputs.sha }}
4343
wheel-tests-cuvs:
4444
secrets: inherit
45-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10
45+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@python-3.12
4646
with:
4747
build_type: nightly
4848
branch: ${{ inputs.branch }}

‎ci/release/update-version.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ DEPENDENCIES=(
4545
dask-cuda
4646
cuvs
4747
pylibraft
48+
librmm
4849
rmm
4950
rapids-dask-dependency
5051
)

‎conda/environments/all_cuda-118_arch-aarch64.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ dependencies:
3535
- libcusolver=11.4.1.48
3636
- libcusparse-dev=11.7.5.86
3737
- libcusparse=11.7.5.86
38+
- librmm==24.10.*,>=0.0.0a0
3839
- make
3940
- nccl>=2.9.9
4041
- ninja
@@ -49,7 +50,6 @@ dependencies:
4950
- pytest==7.*
5051
- rapids-build-backend>=0.3.0,<0.4.0.dev0
5152
- recommonmark
52-
- rmm==24.10.*,>=0.0.0a0
5353
- rust
5454
- scikit-build-core>=0.10.0
5555
- scikit-learn

‎conda/environments/all_cuda-118_arch-x86_64.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ dependencies:
3535
- libcusolver=11.4.1.48
3636
- libcusparse-dev=11.7.5.86
3737
- libcusparse=11.7.5.86
38+
- librmm==24.10.*,>=0.0.0a0
3839
- make
3940
- nccl>=2.9.9
4041
- ninja
@@ -49,7 +50,6 @@ dependencies:
4950
- pytest==7.*
5051
- rapids-build-backend>=0.3.0,<0.4.0.dev0
5152
- recommonmark
52-
- rmm==24.10.*,>=0.0.0a0
5353
- rust
5454
- scikit-build-core>=0.10.0
5555
- scikit-learn

‎conda/environments/all_cuda-125_arch-aarch64.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ dependencies:
3232
- libcurand-dev
3333
- libcusolver-dev
3434
- libcusparse-dev
35+
- librmm==24.10.*,>=0.0.0a0
3536
- make
3637
- nccl>=2.9.9
3738
- ninja
@@ -45,7 +46,6 @@ dependencies:
4546
- pytest==7.*
4647
- rapids-build-backend>=0.3.0,<0.4.0.dev0
4748
- recommonmark
48-
- rmm==24.10.*,>=0.0.0a0
4949
- rust
5050
- scikit-build-core>=0.10.0
5151
- scikit-learn

‎conda/environments/all_cuda-125_arch-x86_64.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ dependencies:
3232
- libcurand-dev
3333
- libcusolver-dev
3434
- libcusparse-dev
35+
- librmm==24.10.*,>=0.0.0a0
3536
- make
3637
- nccl>=2.9.9
3738
- ninja
@@ -45,7 +46,6 @@ dependencies:
4546
- pytest==7.*
4647
- rapids-build-backend>=0.3.0,<0.4.0.dev0
4748
- recommonmark
48-
- rmm==24.10.*,>=0.0.0a0
4949
- rust
5050
- scikit-build-core>=0.10.0
5151
- scikit-learn

‎conda/environments/bench_ann_cuda-118_arch-aarch64.yaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# This file is generated by `rapids-dependency-file-generator`.
2+
# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
3+
channels:
4+
- rapidsai
5+
- rapidsai-nightly
6+
- dask/label/dev
7+
- conda-forge
8+
- nvidia
9+
dependencies:
10+
- benchmark>=1.8.2
11+
- c-compiler
12+
- clang-tools=16.0.6
13+
- clang==16.0.6
14+
- click
15+
- cmake>=3.26.4,!=3.30.0
16+
- cuda-nvtx=11.8
17+
- cuda-profiler-api=11.8.86
18+
- cuda-python>=11.7.1,<12.0a0
19+
- cuda-version=11.8
20+
- cudatoolkit
21+
- cxx-compiler
22+
- cython>=3.0.0
23+
- dlpack>=0.8,<1.0
24+
- gcc_linux-aarch64=11.*
25+
- glog>=0.6.0
26+
- h5py>=3.8.0
27+
- hnswlib=0.6.2
28+
- libcublas-dev=11.11.3.6
29+
- libcublas=11.11.3.6
30+
- libcurand-dev=10.3.0.86
31+
- libcurand=10.3.0.86
32+
- libcusolver-dev=11.4.1.48
33+
- libcusolver=11.4.1.48
34+
- libcusparse-dev=11.7.5.86
35+
- libcusparse=11.7.5.86
36+
- librmm==24.10.*,>=0.0.0a0
37+
- matplotlib
38+
- nccl>=2.9.9
39+
- ninja
40+
- nlohmann_json>=3.11.2
41+
- nvcc_linux-aarch64=11.8
42+
- openblas
43+
- pandas
44+
- pylibraft==24.10.*,>=0.0.0a0
45+
- pyyaml
46+
- sysroot_linux-aarch64==2.17
47+
name: bench_ann_cuda-118_arch-aarch64

‎conda/environments/bench_ann_cuda-118_arch-x86_64.yaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# This file is generated by `rapids-dependency-file-generator`.
2+
# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
3+
channels:
4+
- rapidsai
5+
- rapidsai-nightly
6+
- dask/label/dev
7+
- conda-forge
8+
- nvidia
9+
dependencies:
10+
- benchmark>=1.8.2
11+
- c-compiler
12+
- clang-tools=16.0.6
13+
- clang==16.0.6
14+
- click
15+
- cmake>=3.26.4,!=3.30.0
16+
- cuda-nvtx=11.8
17+
- cuda-profiler-api=11.8.86
18+
- cuda-python>=11.7.1,<12.0a0
19+
- cuda-version=11.8
20+
- cudatoolkit
21+
- cxx-compiler
22+
- cython>=3.0.0
23+
- dlpack>=0.8,<1.0
24+
- gcc_linux-64=11.*
25+
- glog>=0.6.0
26+
- h5py>=3.8.0
27+
- hnswlib=0.6.2
28+
- libcublas-dev=11.11.3.6
29+
- libcublas=11.11.3.6
30+
- libcurand-dev=10.3.0.86
31+
- libcurand=10.3.0.86
32+
- libcusolver-dev=11.4.1.48
33+
- libcusolver=11.4.1.48
34+
- libcusparse-dev=11.7.5.86
35+
- libcusparse=11.7.5.86
36+
- librmm==24.10.*,>=0.0.0a0
37+
- matplotlib
38+
- nccl>=2.9.9
39+
- ninja
40+
- nlohmann_json>=3.11.2
41+
- nvcc_linux-64=11.8
42+
- openblas
43+
- pandas
44+
- pylibraft==24.10.*,>=0.0.0a0
45+
- pyyaml
46+
- sysroot_linux-64==2.17
47+
name: bench_ann_cuda-118_arch-x86_64

0 commit comments

Comments
 (0)