Skip to content

Commit c9426ec

Browse files
Modify CI pipeline to use latest cuvs-java instead of the one released on Maven Central (#49)
Fixes #43 Please note: I had to bump up the `cuda_version` to `13.0.2` because for `26.02` the [image with the expected tag is not available](https://hub.docker.com/r/rapidsai/ci-conda/tags?name=26.02-cuda13.0.0-ubuntu24.04-py3.13) but for `13.0.2` [it does](https://hub.docker.com/r/rapidsai/ci-conda/tags?name=26.02-cuda13.0.2-ubuntu24.04-py3.13). Also, this PR includes updating the `FilterCuVSProvider.java` to adapt to the latest `cuvs-java` changes. Authors: - Vivek Narang (https://github.com/narangvivek10) Approvers: - Bradley Dice (https://github.com/bdice) - Corey J. Nolet (https://github.com/cjnolet) URL: #49
1 parent 988508c commit c9426ec

File tree

15 files changed

+69
-5
lines changed

15 files changed

+69
-5
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
matrix:
4343
cuda_version:
4444
- '12.9.1'
45-
- '13.0.0'
45+
- '13.0.2'
4646
with:
4747
build_type: ${{ inputs.build_type || 'branch' }}
4848
branch: ${{ inputs.branch }}

.github/workflows/pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
matrix:
6969
cuda_version:
7070
- '12.9.1'
71-
- '13.0.0'
71+
- '13.0.2'
7272
with:
7373
build_type: pull-request
7474
node_type: "gpu-l4-latest-1"

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
matrix:
3232
cuda_version:
3333
- '12.9.1'
34-
- '13.0.0'
34+
- '13.0.2'
3535
with:
3636
build_type: ${{ inputs.build_type }}
3737
branch: ${{ inputs.branch }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
*.jar
55
target
66
**/.DS_Store
7+
cuvs-workdir

RAPIDS_BRANCH

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
main

build.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,24 @@ function hasArg {
1515
(( NUMARGS != 0 )) && (echo " ${ARGS} " | grep -q " $1 ")
1616
}
1717

18+
if hasArg --build-cuvs-java; then
19+
CUVS_WORKDIR="cuvs-workdir"
20+
CUVS_GIT_REPO="https://github.com/rapidsai/cuvs.git"
21+
if [[ -d "$CUVS_WORKDIR" && -n "$(ls -A "$CUVS_WORKDIR")" ]]; then
22+
echo "Directory '$CUVS_WORKDIR' exists and is not empty."
23+
pushd $CUVS_WORKDIR
24+
git pull
25+
else
26+
BRANCH=$(cat "RAPIDS_BRANCH")
27+
echo "Directory '$CUVS_WORKDIR' does not exist or is empty. Cloning the cuvs's '$BRANCH' branch."
28+
# Correct branch selection is crucial to avoid version mismatch issues when testing.
29+
git clone --branch "$BRANCH" $CUVS_GIT_REPO $CUVS_WORKDIR
30+
pushd $CUVS_WORKDIR
31+
fi
32+
./build.sh java
33+
popd
34+
fi
35+
1836
MAVEN_VERIFY_ARGS=()
1937
if ! hasArg --run-java-tests; then
2038
MAVEN_VERIFY_ARGS=("-DskipTests")

ci/build_java.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ if [[ "${1:-}" == "--run-java-tests" ]]; then
1313
EXTRA_BUILD_ARGS+=("--run-java-tests")
1414
fi
1515

16+
# Always build cuvs-java when running the pipeline
17+
EXTRA_BUILD_ARGS+=("--build-cuvs-java")
18+
1619
# shellcheck disable=SC1091
1720
. /opt/conda/etc/profile.d/conda.sh
1821

ci/release/update-version.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,10 @@ PATCH_PEP440=$(python -c "from packaging.version import Version; print(Version('
8686

8787
# Log update context
8888
if [[ "${RUN_CONTEXT}" == "main" ]]; then
89+
RAPIDS_BRANCH_NAME="main"
8990
echo "Preparing development branch update $CURRENT_TAG => $NEXT_FULL_TAG (targeting main branch)"
9091
elif [[ "${RUN_CONTEXT}" == "release" ]]; then
92+
RAPIDS_BRANCH_NAME="release/${NEXT_SHORT_TAG}"
9193
echo "Preparing release branch update $CURRENT_TAG => $NEXT_FULL_TAG (targeting release/${NEXT_SHORT_TAG} branch)"
9294
fi
9395

@@ -98,6 +100,7 @@ function sed_runner() {
98100

99101
# Centralized version file update
100102
echo "${NEXT_FULL_TAG}" > VERSION
103+
echo "${RAPIDS_BRANCH_NAME}" > RAPIDS_BRANCH
101104

102105
# Update Java version
103106
NEXT_FULL_JAVA_TAG="${NEXT_SHORT_TAG}.${PATCH_PEP440}"
@@ -111,5 +114,6 @@ for FILE in dependencies.yaml conda/environments/*.yaml; do
111114
done
112115

113116
for FILE in .github/workflows/*.yaml; do
117+
sed_runner "/shared-workflows/ s|@.*|@${RAPIDS_BRANCH_NAME}|g" "${FILE}"
114118
sed_runner "s/:[0-9]*\\.[0-9]*-/:${NEXT_SHORT_TAG}-/g" "${FILE}"
115119
done

conda/environments/all_cuda-129_arch-aarch64.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ channels:
44
- conda-forge
55
- rapidsai-nightly
66
dependencies:
7+
- cmake>=3.30.4
78
- cuda-cudart-dev
89
- cuda-nvtx-dev
910
- cuda-profiler-api
@@ -14,5 +15,6 @@ dependencies:
1415
- libcusparse-dev
1516
- libcuvs==26.02.*
1617
- maven
18+
- ninja
1719
- openjdk=22.*
1820
name: all_cuda-129_arch-aarch64

conda/environments/all_cuda-129_arch-x86_64.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ channels:
44
- conda-forge
55
- rapidsai-nightly
66
dependencies:
7+
- cmake>=3.30.4
78
- cuda-cudart-dev
89
- cuda-nvtx-dev
910
- cuda-profiler-api
@@ -14,5 +15,6 @@ dependencies:
1415
- libcusparse-dev
1516
- libcuvs==26.02.*
1617
- maven
18+
- ninja
1719
- openjdk=22.*
1820
name: all_cuda-129_arch-x86_64

0 commit comments

Comments
 (0)