use libraft from PR

rapidsai · Dec 17, 2024 · a38e5ae · a38e5ae
1 parent dc7dac9
commit a38e5ae
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 0 deletions.
diff --git a/ci/build_wheel_cugraph.sh b/ci/build_wheel_cugraph.sh
@@ -17,9 +17,16 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 LIBCUGRAPH_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="libcugraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp /tmp/libcugraph_dist)
 PYLIBCUGRAPH_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="pylibcugraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 python /tmp/pylibcugraph_dist)
 
+# TODO(jameslamb): remove this stuff from https://github.com/rapidsai/raft/pull/2531
+RAFT_COMMIT="f492d59978af3390e418796228aedb2601d03efc"
+LIBRAFT_CHANNEL=$(
+  RAPIDS_PY_WHEEL_NAME="libraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-get-pr-wheel-artifact raft 2531 cpp "${RAFT_COMMIT:0:7}"
+)
+
 cat > ./constraints.txt <<EOF
 libcugraph-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBCUGRAPH_WHEELHOUSE}/libcugraph_*.whl)
 pylibcugraph-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${PYLIBCUGRAPH_WHEELHOUSE}/pylibcugraph_*.whl)
+libraft-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBRAFT_CHANNEL}/libraft_*.whl)
 EOF
 
 export PIP_CONSTRAINT="${PWD}/constraints.txt"

diff --git a/ci/build_wheel_libcugraph.sh b/ci/build_wheel_libcugraph.sh
@@ -16,6 +16,13 @@ rapids-dependency-file-generator \
   --matrix "${matrix_selectors}" \
 | tee /tmp/requirements-build.txt
 
+# TODO(jameslamb): remove this stuff from https://github.com/rapidsai/raft/pull/2531
+RAFT_COMMIT="f492d59978af3390e418796228aedb2601d03efc"
+LIBRAFT_CHANNEL=$(
+  RAPIDS_PY_WHEEL_NAME="libraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-get-pr-wheel-artifact raft 2531 cpp "${RAFT_COMMIT:0:7}"
+)
+echo "libraft-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBRAFT_CHANNEL}/libraft_*.whl)" >> /tmp/requirements-build.txt
+
 rapids-logger "Installing build requirements"
 python -m pip install \
     -v \

diff --git a/ci/build_wheel_pylibcugraph.sh b/ci/build_wheel_pylibcugraph.sh
@@ -16,8 +16,15 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 # are used when creating the isolated build environment
 LIBCUGRAPH_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="libcugraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp /tmp/libcugraph_dist)
 
+# TODO(jameslamb): remove this stuff from https://github.com/rapidsai/raft/pull/2531
+RAFT_COMMIT="f492d59978af3390e418796228aedb2601d03efc"
+LIBRAFT_CHANNEL=$(
+  RAPIDS_PY_WHEEL_NAME="libraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-get-pr-wheel-artifact raft 2531 cpp "${RAFT_COMMIT:0:7}"
+)
+
 cat > ./constraints.txt <<EOF
 libcugraph-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBCUGRAPH_WHEELHOUSE}/libcugraph_*.whl)
+libraft-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBRAFT_CHANNEL}/libraft_*.whl)
 EOF
 
 export PIP_CONSTRAINT="${PWD}/constraints.txt"

diff --git a/ci/test_wheel_cugraph.sh b/ci/test_wheel_cugraph.sh
@@ -10,6 +10,18 @@ RAPIDS_PY_WHEEL_NAME="cugraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-f
 RAPIDS_PY_WHEEL_NAME="pylibcugraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 python ./local-pylibcugraph-dep
 RAPIDS_PY_WHEEL_NAME="libcugraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp ./local-libcugraph-dep
 
+# TODO(jameslamb): remove this stuff from https://github.com/rapidsai/raft/pull/2531
+RAFT_COMMIT="f492d59978af3390e418796228aedb2601d03efc"
+LIBRAFT_CHANNEL=$(
+  RAPIDS_PY_WHEEL_NAME="libraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-get-pr-wheel-artifact raft 2531 cpp "${RAFT_COMMIT:0:7}"
+)
+
+cat > ./constraints.txt <<EOF
+libraft-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBRAFT_CHANNEL}/libraft_*.whl)
+EOF
+
+export PIP_CONSTRAINT="${PWD}/constraints.txt"
+
 python -m pip install \
     "$(echo ./dist/cugraph*.whl)[test]" \
     ./local-pylibcugraph-dep/pylibcugraph*.whl \

diff --git a/ci/test_wheel_pylibcugraph.sh b/ci/test_wheel_pylibcugraph.sh
@@ -9,6 +9,18 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 RAPIDS_PY_WHEEL_NAME="pylibcugraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 python ./dist
 RAPIDS_PY_WHEEL_NAME="libcugraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 cpp ./local-libcugraph-dep
 
+# TODO(jameslamb): remove this stuff from https://github.com/rapidsai/raft/pull/2531
+RAFT_COMMIT="f492d59978af3390e418796228aedb2601d03efc"
+LIBRAFT_CHANNEL=$(
+  RAPIDS_PY_WHEEL_NAME="libraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-get-pr-wheel-artifact raft 2531 cpp "${RAFT_COMMIT:0:7}"
+)
+
+cat > ./constraints.txt <<EOF
+libraft-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBRAFT_CHANNEL}/libraft_*.whl)
+EOF
+
+export PIP_CONSTRAINT="${PWD}/constraints.txt"
+
 python -m pip install \
     "$(echo ./dist/pylibcugraph*.whl)[test]" \
     ./local-libcugraph-dep/libcugraph*.whl