Skip to content

Commit 76264ea

Browse files
authored
Merge branch 'branch-25.08' into java/mapping-as-function
2 parents c278c18 + c4c03e4 commit 76264ea

31 files changed

+202
-176
lines changed

.github/CODEOWNERS

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ rust/ @rapidsai/cuvs-rust-codeowners
1111
docs/ @rapidsai/cuvs-docs-codeowners
1212

1313
#cmake code owners
14-
CMakeLists.txt @rapidsai/cuvs-cmake-codeowners
15-
**/cmake/ @rapidsai/cuvs-cmake-codeowners
16-
*.cmake @rapidsai/cuvs-cmake-codeowners
14+
CMakeLists.txt @rapidsai/cuvs-cmake-codeowners
15+
**/cmake/ @rapidsai/cuvs-cmake-codeowners
16+
*.cmake @rapidsai/cuvs-cmake-codeowners
17+
cpp/scripts/run-cmake-format.sh @rapidsai/cuvs-cmake-codeowners
1718

1819
#CI code owners
1920
/.github/ @rapidsai/ci-codeowners
2021
/ci/ @rapidsai/ci-codeowners
22+
/.shellcheckrc @rapidsai/ci-codeowners
2123

2224
#packaging code owners
2325
/.pre-commit-config.yaml @rapidsai/packaging-codeowners

.github/workflows/build.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ jobs:
4848
node_type: "gpu-l4-latest-1"
4949
script: "ci/build_rust.sh"
5050
sha: ${{ inputs.sha }}
51-
rust-publish:
52-
needs: rust-build
53-
secrets: inherit
54-
uses: ./.github/workflows/publish-rust.yaml
5551
go-build:
5652
needs: cpp-build
5753
secrets: inherit
@@ -98,6 +94,10 @@ jobs:
9894
date: ${{ inputs.date }}
9995
sha: ${{ inputs.sha }}
10096
skip_upload_pkgs: libcuvs-template
97+
rust-publish:
98+
needs: [rust-build, upload-conda]
99+
secrets: inherit
100+
uses: ./.github/workflows/publish-rust.yaml
101101
docs-build:
102102
if: github.ref_type == 'branch'
103103
needs: python-build

.pre-commit-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ repos:
128128
rev: v0.10.0.1
129129
hooks:
130130
- id: shellcheck
131-
args: ["--severity=warning"]
132131

133132
default_language_version:
134133
python: python3

.shellcheckrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Disable file checks (otherwise every use of `gha-tools` will get flagged)
2+
disable=SC1091

README.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,12 @@ cuVS comes with pre-built packages that can be installed through [conda](https:/
9090
It is recommended to use [mamba](https://conda.github.io/conda-libmamba-solver/user-guide/) to install the desired packages. The following command will install the Python package. You can substitute `cuvs` for any of the packages in the table above:
9191

9292
```bash
93-
conda install -c conda-forge -c nvidia -c rapidsai cuvs
93+
conda install -c rapidsai -c conda-forge cuvs
9494
```
9595

9696
The cuVS Python package can also be `installed through pip <https://docs.rapids.ai/install#pip>`_.
9797

98-
For CUDA 11 packages:
99-
```bash
100-
pip install cuvs-cu11 --extra-index-url=https://pypi.nvidia.com
101-
````
102-
103-
And CUDA 12 packages:
98+
For CUDA 12 packages:
10499
```bash
105100
pip install cuvs-cu12 --extra-index-url=https://pypi.nvidia.com
106101
```
@@ -109,7 +104,7 @@ pip install cuvs-cu12 --extra-index-url=https://pypi.nvidia.com
109104
If installing a version that has not yet been released, the `rapidsai` channel can be replaced with `rapidsai-nightly`:
110105

111106
```bash
112-
conda install -c conda-forge -c nvidia -c rapidsai-nightly cuvs=25.08
107+
conda install -c rapidsai-nightly -c conda-forge cuvs=25.08
113108
```
114109

115110
cuVS also has `pip` wheel packages that can be installed. Please see the [Build and Install Guide](https://docs.rapids.ai/api/cuvs/nightly/build/) for more information on installing the available cuVS packages and building from source.

0 commit comments

Comments
 (0)