diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 39b1093273..5023266c3b 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -24,9 +24,9 @@ jobs: # - docs-build - wheel-build-libcugraph - wheel-build-pylibcugraph - # - wheel-tests-pylibcugraph - # - wheel-build-cugraph - # - wheel-tests-cugraph + - wheel-tests-pylibcugraph + - wheel-build-cugraph + - wheel-tests-cugraph # - telemetry-setup # - devcontainer secrets: inherit @@ -153,31 +153,31 @@ jobs: with: build_type: pull-request script: ci/build_wheel_pylibcugraph.sh - # wheel-tests-pylibcugraph: - # needs: [wheel-build-pylibcugraph, changed-files] - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02 - # if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python - # with: - # build_type: pull-request - # script: ci/test_wheel_pylibcugraph.sh - # wheel-build-cugraph: - # needs: wheel-build-pylibcugraph - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02 - # with: - # build_type: pull-request - # script: ci/build_wheel_cugraph.sh - # wheel-tests-cugraph: - # needs: [wheel-build-cugraph, changed-files] - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02 - # # if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python - # with: - # build_type: pull-request - # script: ci/test_wheel_cugraph.sh - # # This selects "ARCH=amd64 + the latest supported Python + CUDA". - # matrix_filter: map(select(.ARCH == "amd64")) | max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.] + wheel-tests-pylibcugraph: + needs: [wheel-build-pylibcugraph, changed-files] + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02 + if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python + with: + build_type: pull-request + script: ci/test_wheel_pylibcugraph.sh + wheel-build-cugraph: + needs: wheel-build-pylibcugraph + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02 + with: + build_type: pull-request + script: ci/build_wheel_cugraph.sh + wheel-tests-cugraph: + needs: [wheel-build-cugraph, changed-files] + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.02 + # if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python + with: + build_type: pull-request + script: ci/test_wheel_cugraph.sh + # This selects "ARCH=amd64 + the latest supported Python + CUDA". + matrix_filter: map(select(.ARCH == "amd64")) | max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]) | [.] # devcontainer: # secrets: inherit # # needs: telemetry-setup diff --git a/ci/build_wheel_cugraph.sh b/ci/build_wheel_cugraph.sh index c12fc3851a..daae834f65 100755 --- a/ci/build_wheel_cugraph.sh +++ b/ci/build_wheel_cugraph.sh @@ -18,7 +18,7 @@ LIBCUGRAPH_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="libcugraph_${RAPIDS_PY_CUDA_SUFFIX 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" +RAFT_COMMIT="6bf5ebacd362a898d2580e88e17113ddcfeafdae" LIBRAFT_CHANNEL=$( RAPIDS_PY_WHEEL_NAME="libraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-get-pr-wheel-artifact raft 2531 cpp "${RAFT_COMMIT:0:7}" ) diff --git a/ci/build_wheel_libcugraph.sh b/ci/build_wheel_libcugraph.sh index 17966e29ec..47af5db8b7 100755 --- a/ci/build_wheel_libcugraph.sh +++ b/ci/build_wheel_libcugraph.sh @@ -17,7 +17,7 @@ rapids-dependency-file-generator \ | tee /tmp/requirements-build.txt # TODO(jameslamb): remove this stuff from https://github.com/rapidsai/raft/pull/2531 -RAFT_COMMIT="f492d59978af3390e418796228aedb2601d03efc" +RAFT_COMMIT="6bf5ebacd362a898d2580e88e17113ddcfeafdae" LIBRAFT_CHANNEL=$( RAPIDS_PY_WHEEL_NAME="libraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-get-pr-wheel-artifact raft 2531 cpp "${RAFT_COMMIT:0:7}" ) diff --git a/ci/build_wheel_pylibcugraph.sh b/ci/build_wheel_pylibcugraph.sh index db10f54b7b..26ae2e6017 100755 --- a/ci/build_wheel_pylibcugraph.sh +++ b/ci/build_wheel_pylibcugraph.sh @@ -17,7 +17,7 @@ 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) # TODO(jameslamb): remove this stuff from https://github.com/rapidsai/raft/pull/2531 -RAFT_COMMIT="f492d59978af3390e418796228aedb2601d03efc" +RAFT_COMMIT="6bf5ebacd362a898d2580e88e17113ddcfeafdae" LIBRAFT_CHANNEL=$( RAPIDS_PY_WHEEL_NAME="libraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-get-pr-wheel-artifact raft 2531 cpp "${RAFT_COMMIT:0:7}" ) diff --git a/ci/test_wheel_cugraph.sh b/ci/test_wheel_cugraph.sh index f1f6ee738b..6ded45ee86 100755 --- a/ci/test_wheel_cugraph.sh +++ b/ci/test_wheel_cugraph.sh @@ -11,7 +11,7 @@ RAPIDS_PY_WHEEL_NAME="pylibcugraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-whe 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" +RAFT_COMMIT="6bf5ebacd362a898d2580e88e17113ddcfeafdae" LIBRAFT_CHANNEL=$( RAPIDS_PY_WHEEL_NAME="libraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-get-pr-wheel-artifact raft 2531 cpp "${RAFT_COMMIT:0:7}" ) diff --git a/ci/test_wheel_pylibcugraph.sh b/ci/test_wheel_pylibcugraph.sh index 96e0c2dd43..b936a11990 100755 --- a/ci/test_wheel_pylibcugraph.sh +++ b/ci/test_wheel_pylibcugraph.sh @@ -10,7 +10,7 @@ RAPIDS_PY_WHEEL_NAME="pylibcugraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-whe 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" +RAFT_COMMIT="6bf5ebacd362a898d2580e88e17113ddcfeafdae" LIBRAFT_CHANNEL=$( RAPIDS_PY_WHEEL_NAME="libraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-get-pr-wheel-artifact raft 2531 cpp "${RAFT_COMMIT:0:7}" )