Skip to content

Commit e876dbe

Browse files
ajit283ajit283
authored
Merge branch 'branch-24.10' into c-add-memory-pool
2 parents ed2994f + bfc611a commit e876dbe

6 files changed

Lines changed: 26 additions & 26 deletions

File tree

‎.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@python-3.12
31+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.10
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@python-3.12
40+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10
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@python-3.12
53+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10
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@python-3.12
62+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.10
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@python-3.12
73+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10
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@python-3.12
85+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10
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@python-3.12
95+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.10
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@python-3.12
27+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.10
2828
checks:
2929
secrets: inherit
30-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@python-3.12
30+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10
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@python-3.12
36+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.10
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@python-3.12
43+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10
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@python-3.12
49+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.10
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@python-3.12
57+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10
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@python-3.12
63+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10
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@python-3.12
69+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10
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@python-3.12
79+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10
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@python-3.12
89+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10
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@python-3.12
96+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10
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@python-3.12
102+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.10
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@python-3.12
19+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.10
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@python-3.12
29+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10
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@python-3.12
37+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10
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@python-3.12
45+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10
4646
with:
4747
build_type: nightly
4848
branch: ${{ inputs.branch }}

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ repos:
1818
# Explicitly specify the pyproject.toml at the repo root, not per-project.
1919
args: ["--config", "pyproject.toml"]
2020
- repo: https://github.com/PyCQA/flake8
21-
rev: 5.0.4
21+
rev: 7.1.1
2222
hooks:
2323
- id: flake8
2424
args: ["--config=.flake8"]

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ cagra::index_params index_params;
8585
auto index = cagra::build(res, index_params, dataset);
8686
```
8787
88-
For more example of the C++ APIs, refer to [cpp/examples](https://github.com/rapidsai/cuvs/tree/HEAD/cpp/examples) directory in the codebase.
88+
For more examples of the C++ APIs, refer to the [examples](https://github.com/rapidsai/cuvs/tree/HEAD/examples) directory in the codebase.
8989
9090
### C API
9191

‎cpp/src/neighbors/ivf_flat/ivf_flat_interleaved_scan.cuh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,7 @@ void launch_with_fixed_consts(cuvs::distance::DistanceType metric, Args&&... arg
12051205
IvfSampleFilterT,
12061206
inner_prod_dist<Veclen, T, AccT>>(
12071207
{},
1208-
raft::compose_op(raft::mul_const_op<float>{-1.0f}, raft::add_const_op<float>{1.0f}),
1208+
raft::compose_op(raft::add_const_op<float>{1.0f}, raft::mul_const_op<float>{-1.0f}),
12091209
std::forward<Args>(args)...);
12101210
// NB: update the description of `knn::ivf_flat::build` when adding here a new metric.
12111211
default: RAFT_FAIL("The chosen distance metric is not supported (%d)", int(metric));

0 commit comments

Comments
 (0)