Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@ jobs:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.9.0
with:
# This selects "ARCH=amd64 + the latest supported Python + CUDA".
matrix_filter: map(select(.ARCH == "amd64")) | group_by(.CUDA_VER|split(".")|map(tonumber)|.[0]) | map(max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]))
# This selects "ARCH=amd64 + Python 3.12 + CUDA".
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would drop Python 3.10 and 3.11, which I don’t think we want? Just say “not 3.13” here.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same in pr.yaml.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was already dropping Python 3.10 and 3.11 with the max_by(.PY_VER) -- I'm just telling it to use 3.12 instead of the new max of 3.13

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahhhh I missed that this is a pure wheel. (See pure-wheel: true below). That's fine, then.

# Note that we don't support DGL on Python 3.13 so we don't build DGL on Python 3.13
matrix_filter: map(select(.ARCH == "amd64", .PY_VER == "3.12")) | group_by(.CUDA_VER|split(".")|map(tonumber)|.[0]) | map(max_by([.CUDA_VER]|map(split(".")|map(tonumber))))
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
sha: ${{ inputs.sha }}
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ jobs:
conda-python-tests:
needs: [conda-python-build, changed-files]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@python-3.13
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
with:
build_type: pull-request
matrix_filter: map(select(.ARCH == "amd64" and .CUDA_VER != "11.4.3"))
matrix_filter: map(select(.ARCH == "amd64" and .CUDA_VER != "11.4.3" and .PY_VER != "3.13" ))
docs-build:
needs: conda-cpp-build
secrets: inherit
Expand Down Expand Up @@ -171,8 +171,9 @@ jobs:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.9.0
with:
# This selects "ARCH=amd64 + the latest supported Python + CUDA".
matrix_filter: map(select(.ARCH == "amd64")) | group_by(.CUDA_VER|split(".")|map(tonumber)|.[0]) | map(max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]))
# This selects "ARCH=amd64 + Python 3.12 + CUDA".
# Note that we don't support DGL on Python 3.13 so we don't build DGL on Python 3.13
matrix_filter: map(select(.ARCH == "amd64", .PY_VER == "3.12")) | group_by(.CUDA_VER|split(".")|map(tonumber)|.[0]) | map(max_by([.CUDA_VER]|map(split(".")|map(tonumber))))
build_type: pull-request
script: ci/build_wheel_cugraph-dgl.sh
package-name: cugraph-dgl
Expand All @@ -186,7 +187,7 @@ jobs:
with:
build_type: pull-request
script: ci/test_wheel_cugraph-dgl.sh
matrix_filter: map(select(.ARCH == "amd64" and .CUDA_VER != "11.4.3"))
matrix_filter: map(select(.ARCH == "amd64" and .CUDA_VER != "11.4.3" and .PY_VER != "3.13" ))
wheel-build-cugraph-pyg:
needs: checks
secrets: inherit
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ jobs:
run_script: "ci/test_notebooks.sh"
conda-python-tests:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@python-3.13
with:
build_type: ${{ inputs.build_type }}
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
matrix_filter: map(select((.ARCH == "amd64") and (.CUDA_VER | startswith("11.4") | not)))
matrix_filter: map(select((.ARCH == "amd64") and (.CUDA_VER | startswith("11.4") | not) and (.PY_VER != "3.13") ))
wheel-tests-pylibwholegraph:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-12.9.0
Expand All @@ -65,7 +65,7 @@ jobs:
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
script: ci/test_wheel_cugraph-dgl.sh
matrix_filter: map(select((.ARCH == "amd64") and (.CUDA_VER | startswith("11.4") | not) and (.LINUX_VER != "rockylinux8")))
matrix_filter: map(select((.ARCH == "amd64") and (.CUDA_VER | startswith("11.4") | not) and (.LINUX_VER != "rockylinux8") and (.PY_VER != "3.13")))
wheel-tests-cugraph-pyg:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-12.9.0
Expand Down
1 change: 1 addition & 0 deletions ci/build_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ EXCLUDE_ARGS=(
--exclude libcuda.so.1
--exclude libnvidia-ml.so.1
--exclude librapids_logger.so
--exclude librmm.so
)

if [[ "${package_name}" != "libwholegraph" ]]; then
Expand Down
4 changes: 2 additions & 2 deletions ci/test_wheel_cugraph-dgl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ CUGRAPH_DGL_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_
PKG_CUDA_VER="$(echo ${CUDA_VERSION} | cut -d '.' -f1,2 | tr -d '.')"
PKG_CUDA_VER_MAJOR=${PKG_CUDA_VER:0:2}
if [[ "${PKG_CUDA_VER_MAJOR}" == "12" ]]; then
PYTORCH_CUDA_VER="121"
PYTORCH_CUDA_VER="121"
else
PYTORCH_CUDA_VER=$PKG_CUDA_VER
PYTORCH_CUDA_VER=$PKG_CUDA_VER
fi
Comment on lines 19 to 23
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this dedent change snuck in

PYTORCH_URL="https://download.pytorch.org/whl/cu${PYTORCH_CUDA_VER}"
DGL_URL="https://data.dgl.ai/wheels/torch-2.3/cu${PYTORCH_CUDA_VER}/repo.html"
Expand Down
1 change: 1 addition & 0 deletions conda/recipes/libwholegraph/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ outputs:
- ${{ stdlib("c") }}
host:
- cuda-version =${{ cuda_version }}
- librmm =${{ minor_version }}
- nccl ${{ nccl_version }}
- if: cuda_major == "11"
then:
Expand Down
3 changes: 0 additions & 3 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ files:
- cuda_version
- depends_on_cugraph
- depends_on_cudf
- depends_on_dgl
- depends_on_pytorch
- py_version
- test_python_common
Expand All @@ -87,7 +86,6 @@ files:
- cuda_version
- depends_on_cugraph
- depends_on_cudf
- depends_on_dgl
- depends_on_pytorch
- py_version
- test_python_common
Expand All @@ -100,7 +98,6 @@ files:
- cuda_version
- depends_on_cugraph
- depends_on_cudf
- depends_on_dgl
- depends_on_pytorch
- py_version
- test_python_common
Expand Down