Skip to content

Commit e682d01

Browse files
narangvivek10narangvivek10
authored
Merge branch 'branch-25.06' into merge-api-java-support
2 parents 447e8fc + 079e030 commit e682d01

28 files changed

Lines changed: 1986 additions & 56 deletions

‎.github/workflows/build.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
build_type: ${{ inputs.build_type || 'branch' }}
3434
branch: ${{ inputs.branch }}
3535
date: ${{ inputs.date }}
36+
script: ci/build_cpp.sh
3637
sha: ${{ inputs.sha }}
3738
rust-build:
3839
needs: cpp-build
@@ -45,7 +46,7 @@ jobs:
4546
date: ${{ inputs.date }}
4647
container_image: "rapidsai/ci-conda:latest"
4748
node_type: "gpu-l4-latest-1"
48-
run_script: "ci/build_rust.sh"
49+
script: "ci/build_rust.sh"
4950
sha: ${{ inputs.sha }}
5051
rust-publish:
5152
needs: rust-build
@@ -62,7 +63,7 @@ jobs:
6263
date: ${{ inputs.date }}
6364
container_image: "rapidsai/ci-conda:latest"
6465
node_type: "gpu-l4-latest-1"
65-
run_script: "ci/build_go.sh"
66+
script: "ci/build_go.sh"
6667
sha: ${{ inputs.sha }}
6768
java-build:
6869
needs: cpp-build
@@ -74,7 +75,7 @@ jobs:
7475
arch: "amd64"
7576
date: ${{ inputs.date }}
7677
container_image: "rapidsai/ci-conda:latest"
77-
run_script: "ci/build_java.sh"
78+
script: "ci/build_java.sh"
7879
file_to_upload: "java/cuvs-java/target/"
7980
sha: ${{ inputs.sha }}
8081
python-build:
@@ -85,6 +86,7 @@ jobs:
8586
build_type: ${{ inputs.build_type || 'branch' }}
8687
branch: ${{ inputs.branch }}
8788
date: ${{ inputs.date }}
89+
script: ci/build_python.sh
8890
sha: ${{ inputs.sha }}
8991
upload-conda:
9092
needs: [cpp-build, python-build]
@@ -108,7 +110,7 @@ jobs:
108110
container_image: "rapidsai/ci-conda:latest"
109111
date: ${{ inputs.date }}
110112
node_type: "gpu-l4-latest-1"
111-
run_script: "ci/build_docs.sh"
113+
script: "ci/build_docs.sh"
112114
sha: ${{ inputs.sha }}
113115
wheel-build-libcuvs:
114116
secrets: inherit

‎.github/workflows/pr.yaml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,15 @@ jobs:
122122
with:
123123
build_type: pull-request
124124
node_type: cpu16
125+
script: ci/build_cpp.sh
125126
conda-cpp-tests:
126127
needs: [conda-cpp-build, changed-files]
127128
secrets: inherit
128129
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.06
129130
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
130131
with:
131132
build_type: pull-request
133+
script: ci/test_cpp.sh
132134
conda-cpp-checks:
133135
needs: conda-cpp-build
134136
secrets: inherit
@@ -143,13 +145,15 @@ jobs:
143145
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06
144146
with:
145147
build_type: pull-request
148+
script: ci/build_python.sh
146149
conda-python-tests:
147150
needs: [conda-python-build, changed-files]
148151
secrets: inherit
149152
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.06
150153
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
151154
with:
152155
build_type: pull-request
156+
script: ci/test_python.sh
153157
conda-java-tests:
154158
needs: [conda-cpp-build, changed-files]
155159
secrets: inherit
@@ -160,7 +164,7 @@ jobs:
160164
node_type: "gpu-l4-latest-1"
161165
arch: "amd64"
162166
container_image: "rapidsai/ci-conda:latest"
163-
run_script: "ci/test_java.sh"
167+
script: "ci/test_java.sh"
164168
file_to_upload: "java/cuvs-java/target/"
165169
docs-build:
166170
needs: conda-python-build
@@ -171,7 +175,7 @@ jobs:
171175
node_type: "gpu-l4-latest-1"
172176
arch: "amd64"
173177
container_image: "rapidsai/ci-conda:latest"
174-
run_script: "ci/build_docs.sh"
178+
script: "ci/build_docs.sh"
175179
rust-build:
176180
needs: conda-cpp-build
177181
secrets: inherit
@@ -181,7 +185,7 @@ jobs:
181185
node_type: "gpu-l4-latest-1"
182186
arch: "amd64"
183187
container_image: "rapidsai/ci-conda:latest"
184-
run_script: "ci/build_rust.sh"
188+
script: "ci/build_rust.sh"
185189
go-build:
186190
needs: conda-cpp-build
187191
secrets: inherit
@@ -191,7 +195,7 @@ jobs:
191195
node_type: "gpu-l4-latest-1"
192196
arch: "amd64"
193197
container_image: "rapidsai/ci-conda:latest"
194-
run_script: "ci/build_go.sh"
198+
script: "ci/build_go.sh"
195199
wheel-build-libcuvs:
196200
needs: checks
197201
secrets: inherit

‎.github/workflows/test.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
build_type: ${{ inputs.build_type }}
3535
branch: ${{ inputs.branch }}
3636
date: ${{ inputs.date }}
37+
script: ci/test_cpp.sh
3738
sha: ${{ inputs.sha }}
3839
conda-python-tests:
3940
secrets: inherit
@@ -42,6 +43,7 @@ jobs:
4243
build_type: ${{ inputs.build_type }}
4344
branch: ${{ inputs.branch }}
4445
date: ${{ inputs.date }}
46+
script: ci/test_python.sh
4547
sha: ${{ inputs.sha }}
4648
conda-java-tests:
4749
secrets: inherit
@@ -54,7 +56,7 @@ jobs:
5456
node_type: "gpu-l4-latest-1"
5557
arch: "amd64"
5658
container_image: "rapidsai/ci-conda:latest"
57-
run_script: "ci/test_java.sh"
59+
script: "ci/test_java.sh"
5860
wheel-tests-cuvs:
5961
secrets: inherit
6062
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.06

‎ci/build_cpp.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
set -euo pipefail
55

6-
rapids-configure-conda-channels
7-
86
source rapids-configure-sccache
97

108
source rapids-date-string

‎ci/build_python.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
set -euo pipefail
55

6-
rapids-configure-conda-channels
7-
86
source rapids-configure-sccache
97

108
source rapids-date-string

‎ci/build_wheel.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ underscore_package_name=$(echo "${package_name}" | tr "-" "_")
1010

1111
source rapids-configure-sccache
1212
source rapids-date-string
13+
source rapids-init-pip
1314

1415
RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")"
1516

‎ci/build_wheel_cuvs.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
set -euo pipefail
55

6+
source rapids-init-pip
7+
68
package_dir="python/cuvs"
79

810
RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")"
@@ -11,10 +13,9 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")"
1113
# then ensures 'cuvs' wheel builds always use the 'libcuvs' just built in the same CI run.
1214
#
1315
# Using env variable PIP_CONSTRAINT is necessary to ensure the constraints
14-
# are used when creating the isolated build environment.
16+
# Using env variable PIP_CONSTRAINT (initialized by 'rapids-init-pip') is necessary to ensure the constraints
1517
LIBCUVS_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="libcuvs_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp)
16-
echo "libcuvs-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo "${LIBCUVS_WHEELHOUSE}"/libcuvs_*.whl)" > /tmp/constraints.txt
17-
export PIP_CONSTRAINT="/tmp/constraints.txt"
18+
echo "libcuvs-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo "${LIBCUVS_WHEELHOUSE}"/libcuvs_*.whl)" >> "${PIP_CONSTRAINT}"
1819

1920
ci/build_wheel.sh cuvs ${package_dir} python
2021
ci/validate_wheel.sh ${package_dir} "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"

‎ci/build_wheel_libcuvs.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
set -euo pipefail
55

6+
source rapids-init-pip
7+
68
package_name="libcuvs"
79
package_dir="python/libcuvs"
810

‎ci/test_wheel_cuvs.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33

44
set -euo pipefail
55

6+
source rapids-init-pip
7+
68
# Delete system libnccl.so to ensure the wheel is used
79
RAPIDS_CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}"
810
if [[ ${RAPIDS_CUDA_MAJOR} != "11" ]]; then
911
rm -rf /usr/lib64/libnccl*
1012
fi
1113

12-
mkdir -p ./dist
1314
RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")"
1415
LIBCUVS_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="libcuvs_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp)
1516
CUVS_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="cuvs_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github python)

‎cpp/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ if(BUILD_SHARED_LIBS)
382382
src/distance/pairwise_distance.cu
383383
src/distance/sparse_distance.cu
384384
src/embed/spectral.cu
385+
src/neighbors/all_neighbors/all_neighbors.cu
385386
src/neighbors/ball_cover.cu
386387
src/neighbors/ball_cover/detail/ball_cover/registers_eps_pass_euclidean.cu
387388
src/neighbors/ball_cover/detail/ball_cover/registers_pass_one.cu

0 commit comments

Comments
 (0)