Skip to content

Commit

Permalink
consolidate 'cugraph' dependency, avoid unsuffixed use for pyproject/…
Browse files Browse the repository at this point in the history
…requirements
  • Loading branch information
jameslamb committed Oct 15, 2024
1 parent 15f913b commit 4d66d77
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
2 changes: 1 addition & 1 deletion ci/test_wheel_cugraph-dgl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_
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="124"
PYTORCH_CUDA_VER="121"
else
PYTORCH_CUDA_VER=$PKG_CUDA_VER
fi
Expand Down
2 changes: 1 addition & 1 deletion ci/test_wheel_pylibwholegraph.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RAPIDS_PY_WHEEL_NAME="pylibwholegraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-
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
INDEX_URL="https://download.pytorch.org/whl/cu124"
INDEX_URL="https://download.pytorch.org/whl/cu121"
else
INDEX_URL="https://download.pytorch.org/whl/cu${PKG_CUDA_VER}"
fi
Expand Down
13 changes: 3 additions & 10 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ files:
table: project
includes:
- python_run_cugraph_dgl
- depends_on_cugraph
- depends_on_pylibcugraphops
py_test_cugraph_dgl:
output: pyproject
Expand All @@ -101,6 +102,7 @@ files:
table: project
includes:
- python_run_cugraph_pyg
- depends_on_cugraph
- depends_on_pylibcugraphops
py_test_cugraph_pyg:
output: pyproject
Expand Down Expand Up @@ -216,7 +218,6 @@ dependencies:
- output_types: [requirements, pyproject]
packages:
- ninja

- output_types: [conda]
packages:
- &cmake_ver cmake>=3.26.4,!=3.30.0
Expand Down Expand Up @@ -292,18 +293,12 @@ dependencies:
packages:
- &numba numba>=0.57
- &numpy numpy>=1.23,<3.0a0
- output_types: [pyproject, requirements]
packages:
- &cugraph cugraph==24.12.*,>=0.0.0a0
python_run_cugraph_pyg:
common:
- output_types: [conda, pyproject]
packages:
- *numba
- *numpy
- output_types: [pyproject]
packages:
- *cugraph
test_notebook:
common:
- output_types: [conda, requirements]
Expand Down Expand Up @@ -334,15 +329,13 @@ dependencies:
common:
- output_types: [conda]
packages:
- &cugraph_unsuffixed cugraph==24.12.*,>=0.0.0a0
- &pytorch_conda pytorch>=2.3,<2.4.0a0
- dgl>=2.4.0.cu*
- &tensordict tensordict>=0.1.2
cugraph_pyg_dev:
common:
- output_types: [conda]
packages:
- *cugraph_unsuffixed
- *pytorch_conda
- *tensordict
- pytorch_geometric>=2.5,<2.6
Expand Down Expand Up @@ -405,7 +398,7 @@ dependencies:
common:
- output_types: conda
packages:
- *cugraph_unsuffixed
- &cugraph_unsuffixed cugraph==24.12.*,>=0.0.0a0
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
Expand Down

0 comments on commit 4d66d77

Please sign in to comment.