fix wheel metadata

rapidsai · Oct 21, 2024 · 84fccbc · 84fccbc
1 parent fb5e9e0
commit 84fccbc
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 37 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -17,7 +17,7 @@ jobs:
       - conda-cpp-build
       # - conda-cpp-tests
       - conda-python-build
-      # - conda-python-tests
+      - conda-python-tests
       - wheel-build-pylibwholegraph
       # - wheel-tests-pylibwholegraph
       - wheel-build-cugraph-dgl
@@ -84,13 +84,13 @@ jobs:
     uses: rapidsai/shared-workflows/.github/workflows/[email protected]
     with:
       build_type: pull-request
-  # conda-python-tests:
-  #   needs: [conda-python-build, changed-files]
-  #   secrets: inherit
-  #   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-  #   if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
-  #   with:
-  #     build_type: pull-request
+  conda-python-tests:
+    needs: [conda-python-build, changed-files]
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
+    with:
+      build_type: pull-request
   wheel-build-pylibwholegraph:
     needs: checks
     secrets: inherit

diff --git a/ci/test_wheel_cugraph-dgl.sh b/ci/test_wheel_cugraph-dgl.sh
@@ -26,11 +26,15 @@ DGL_URL="https://data.dgl.ai/wheels/torch-2.3/cu${PYTORCH_CUDA_VER}/repo.html"
 # echo to expand wildcard before adding `[extra]` requires for pip
 python -m pip install \
     -v \
-    --extra-index-url "${PYTORCH_URL}" \
     --find-links "${DGL_URL}" \
     "$(echo ./local-deps/pylibwholegraph_${RAPIDS_PY_CUDA_SUFFIX}*.whl)" \
     "$(echo ./dist/cugraph_dgl_${RAPIDS_PY_CUDA_SUFFIX}*.whl)[test]" \
-    'dgl==2.4.0' \
-    'torch>=2.3.0,<2.4'
+    'dgl==2.4.0'
+
+# install torch separately, to be sure we get a CUDA build
+python -m pip install \
+  --index-url "${PYTORCH_URL}" \
+  -v \
+  'torch>=2.0,<2.4.0a0'
 
 python -m pytest python/cugraph-dgl/cugraph_dgl/tests
diff --git a/ci/test_wheel_cugraph-pyg.sh b/ci/test_wheel_cugraph-pyg.sh
@@ -24,17 +24,21 @@ fi
 # echo to expand wildcard before adding `[extra]` requires for pip
 python -m pip install \
     -v \
-    --extra-index-url "${PYTORCH_URL}" \
     --find-links "${PYG_URL}" \
     "$(echo ./local-deps/pylibwholegraph_${RAPIDS_PY_CUDA_SUFFIX}*.whl)" \
     "$(echo ./dist/cugraph_pyg_${RAPIDS_PY_CUDA_SUFFIX}*.whl)[test]" \
     'ogb' \
     'pyg_lib' \
-    'torch>=2.3.0,<2.4' \
     'torch-geometric>=2.5,<2.6' \
     'torch_scatter' \
     'torch_sparse'
 
+# install torch separately, to be sure we get a CUDA build
+python -m pip install \
+  --index-url "${PYTORCH_URL}" \
+  -v \
+  'torch>=2.0,<2.4.0a0'
+
 # RAPIDS_DATASET_ROOT_DIR is used by test scripts
 export RAPIDS_DATASET_ROOT_DIR="$(realpath datasets)"
 

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -44,14 +44,17 @@ dependencies:
 - pytorch-cuda=11.8
 - pytorch::pytorch>=2.0,<2.4.0a0
 - raft-dask==24.12.*,>=0.0.0a0
+- rapids-build-backend>=0.3.0,<0.4.0.dev0
 - recommonmark
 - rmm==24.12.*,>=0.0.0a0
 - scikit-build-core>=0.10.0
 - scipy
+- setuptools>=61.0.0
 - sphinx-copybutton
 - sphinx-markdown-tables
 - sphinx<6
 - sphinxcontrib-websupport
 - torchdata
 - wget
+- wheel
 name: all_cuda-118_arch-x86_64
diff --git a/conda/environments/all_cuda-121_arch-x86_64.yaml b/conda/environments/all_cuda-121_arch-x86_64.yaml
@@ -49,14 +49,17 @@ dependencies:
 - pytorch-cuda=12.1
 - pytorch::pytorch>=2.0,<2.4.0a0
 - raft-dask==24.12.*,>=0.0.0a0
+- rapids-build-backend>=0.3.0,<0.4.0.dev0
 - recommonmark
 - rmm==24.12.*,>=0.0.0a0
 - scikit-build-core>=0.10.0
 - scipy
+- setuptools>=61.0.0
 - sphinx-copybutton
 - sphinx-markdown-tables
 - sphinx<6
 - sphinxcontrib-websupport
 - torchdata
 - wget
+- wheel
 name: all_cuda-121_arch-x86_64
diff --git a/conda/environments/all_cuda-124_arch-x86_64.yaml b/conda/environments/all_cuda-124_arch-x86_64.yaml
@@ -49,14 +49,17 @@ dependencies:
 - pytorch-cuda=12.1
 - pytorch::pytorch>=2.0,<2.4.0a0
 - raft-dask==24.12.*,>=0.0.0a0
+- rapids-build-backend>=0.3.0,<0.4.0.dev0
 - recommonmark
 - rmm==24.12.*,>=0.0.0a0
 - scikit-build-core>=0.10.0
 - scipy
+- setuptools>=61.0.0
 - sphinx-copybutton
 - sphinx-markdown-tables
 - sphinx<6
 - sphinxcontrib-websupport
 - torchdata
 - wget
+- wheel
 name: all_cuda-124_arch-x86_64
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -13,7 +13,6 @@ files:
       - cuda
       - cuda_version
       - docs
-      - python_build_wheel
       - python_build_cythonize
       - depends_on_rmm
       - depends_on_cugraph
@@ -28,6 +27,8 @@ files:
       - depends_on_pyg
       - python_run_cugraph_dgl
       - python_run_cugraph_pyg
+      - rapids_build_setuptools
+      - rapids_build_skbuild
       - test_cpp
       - test_notebook
       - test_python_common
@@ -83,7 +84,8 @@ files:
       table: tool.rapids-build-backend
       key: requires
     includes:
-      - python_build_wheel
+      - common_build
+      - python_build_cythonize
   py_run_pylibwholegraph:
     output: pyproject
     pyproject_dir: python/pylibwholegraph
@@ -107,7 +109,7 @@ files:
     extras:
       table: build-system
     includes:
-      - python_build_wheel
+      - rapids_build_setuptools
   py_run_cugraph_dgl:
     output: pyproject
     pyproject_dir: python/cugraph-dgl
@@ -133,7 +135,7 @@ files:
     extras:
       table: build-system
     includes:
-      - python_build_wheel
+      - rapids_build_setuptools
   py_run_cugraph_pyg:
     output: pyproject
     pyproject_dir: python/cugraph-pyg
@@ -296,24 +298,11 @@ dependencies:
           - matrix:
             packages:
               - python>=3.10,<3.13
-  python_build_wheel:
-    common:
-      - output_types: [conda, pyproject, requirements]
-        packages:
-          - cmake>=3.26.4,!=3.30.0
-          - cython>=3.0.0
-          - ninja
   python_build_cythonize:
     common:
       - output_types: [conda, pyproject, requirements]
         packages:
           - cython>=3.0.0
-      - output_types: conda
-        packages:
-          - scikit-build-core>=0.10.0
-      - output_types: [pyproject, requirements]
-        packages:
-          - scikit-build-core[pyproject]>=0.10.0
   python_run_pylibwholegraph:
     common:
       - output_types: [conda, pyproject, requirements]
@@ -335,13 +324,20 @@ dependencies:
     common:
       - output_types: [conda, requirements, pyproject]
         packages:
-          - rapids-build-backend>=0.3.0,<0.4.0.dev0
+          - &rapids_build_backend rapids-build-backend>=0.3.0,<0.4.0.dev0
       - output_types: conda
         packages:
           - scikit-build-core>=0.10.0
       - output_types: [requirements, pyproject]
         packages:
           - scikit-build-core[pyproject]>=0.10.0
+  rapids_build_setuptools:
+    common:
+      - output_types: [conda, requirements, pyproject]
+        packages:
+          - *rapids_build_backend
+          - setuptools>=61.0.0
+          - wheel
   test_cpp:
     common:
       - output_types: conda

diff --git a/python/cugraph-dgl/pyproject.toml b/python/cugraph-dgl/pyproject.toml
@@ -3,9 +3,9 @@
 [build-system]
 
 requires = [
-    "cmake>=3.26.4,!=3.30.0",
-    "cython>=3.0.0",
-    "ninja",
+    "rapids-build-backend>=0.3.0,<0.4.0.dev0",
+    "setuptools>=61.0.0",
+    "wheel",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 build-backend = "rapids_build_backend.build"
 

diff --git a/python/cugraph-pyg/pyproject.toml b/python/cugraph-pyg/pyproject.toml
@@ -3,9 +3,9 @@
 [build-system]
 
 requires = [
-    "cmake>=3.26.4,!=3.30.0",
-    "cython>=3.0.0",
-    "ninja",
+    "rapids-build-backend>=0.3.0,<0.4.0.dev0",
+    "setuptools>=61.0.0",
+    "wheel",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 build-backend = "rapids_build_backend.build"