From 303fe40b331cd2d9d282ad2bbbde29bf307c4f11 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 5 Dec 2024 08:38:44 -0800 Subject: [PATCH] depend on librmm for wheel builds, clean up dependencies.yaml --- .../all_cuda-118_arch-x86_64.yaml | 1 - .../all_cuda-125_arch-x86_64.yaml | 1 - dependencies.yaml | 78 ++++++++++++------- python/cugraph/pyproject.toml | 1 + python/pylibcugraph/pyproject.toml | 1 + 5 files changed, 53 insertions(+), 29 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index e9f6842e8b..d874979d56 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -71,6 +71,5 @@ dependencies: - torchmetrics - ucx-proc=*=gpu - ucx-py==0.42.*,>=0.0.0a0 -- wget - wheel name: all_cuda-118_arch-x86_64 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 13e102862a..9151b51c67 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -76,6 +76,5 @@ dependencies: - torchmetrics - ucx-proc=*=gpu - ucx-py==0.42.*,>=0.0.0a0 -- wget - wheel name: all_cuda-125_arch-x86_64 diff --git a/dependencies.yaml b/dependencies.yaml index 93983a1a29..d914fa1e7f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -11,18 +11,19 @@ files: - cpp_build - cuda - cuda_version - - docs - - python_build_rapids - - python_build_wheel - - python_build_cythonize - - depends_on_rmm - depends_on_cudf + - depends_on_cupy - depends_on_dask_cudf + - depends_on_librmm - depends_on_pylibraft - - depends_on_raft_dask - depends_on_pylibwholegraph - - depends_on_cupy - depends_on_pytorch + - depends_on_raft_dask + - depends_on_rmm + - docs + - python_build_cythonize + - python_build_rapids + - python_build_wheel - python_run_cugraph - test_notebook - test_python_common @@ -69,8 +70,8 @@ files: extras: table: build-system includes: - - python_build_rapids - python_build_cythonize + - python_build_rapids py_rapids_build_cugraph: output: pyproject pyproject_dir: python/cugraph @@ -79,21 +80,22 @@ files: key: requires includes: - common_build - - depends_on_rmm - - depends_on_pylibraft + - depends_on_librmm - depends_on_pylibcugraph + - depends_on_pylibraft + - depends_on_rmm py_run_cugraph: output: pyproject pyproject_dir: python/cugraph extras: table: project includes: - - depends_on_rmm - depends_on_cudf + - depends_on_cupy - depends_on_dask_cudf - - depends_on_raft_dask - depends_on_pylibcugraph - - depends_on_cupy + - depends_on_raft_dask + - depends_on_rmm - python_run_cugraph py_test_cugraph: output: pyproject @@ -102,17 +104,17 @@ files: table: project.optional-dependencies key: test includes: + - depends_on_pylibwholegraph - test_python_common - test_python_cugraph - - depends_on_pylibwholegraph py_build_pylibcugraph: output: pyproject pyproject_dir: python/pylibcugraph extras: table: build-system includes: - - python_build_rapids - python_build_cythonize + - python_build_rapids py_rapids_build_pylibcugraph: output: pyproject pyproject_dir: python/pylibcugraph @@ -121,8 +123,9 @@ files: key: requires includes: - common_build - - depends_on_rmm + - depends_on_librmm - depends_on_pylibraft + - depends_on_rmm py_run_pylibcugraph: output: pyproject pyproject_dir: python/pylibcugraph @@ -130,8 +133,8 @@ files: table: project includes: - cuda_wheels - - depends_on_rmm - depends_on_pylibraft + - depends_on_rmm py_test_pylibcugraph: output: pyproject pyproject_dir: python/pylibcugraph @@ -171,10 +174,10 @@ files: extras: table: project includes: - - depends_on_rmm - depends_on_cudf - - depends_on_dask_cudf - depends_on_cupy + - depends_on_dask_cudf + - depends_on_rmm - python_run_cugraph_service_server py_test_cugraph_service_server: output: pyproject @@ -293,7 +296,6 @@ dependencies: - libcudf==25.2.*,>=0.0.0a0 - libraft-headers==25.2.*,>=0.0.0a0 - libraft==25.2.*,>=0.0.0a0 - - librmm==25.2.*,>=0.0.0a0 - openmpi # Required for building cpp-mgtests (multi-GPU tests) specific: - output_types: [conda] @@ -440,19 +442,19 @@ dependencies: cuda: "11.*" cuda_suffixed: "true" packages: - - &cugraph_cu11 cugraph-cu11==25.2.*,>=0.0.0a0 + - cugraph-cu11==25.2.*,>=0.0.0a0 - cugraph-service-client-cu11==25.2.*,>=0.0.0a0 - *ucx_py_cu11 - matrix: cuda: "12.*" cuda_suffixed: "true" packages: - - &cugraph_cu12 cugraph-cu12==25.2.*,>=0.0.0a0 + - cugraph-cu12==25.2.*,>=0.0.0a0 - cugraph-service-client-cu12==25.2.*,>=0.0.0a0 - *ucx_py_cu12 - matrix: packages: - - &cugraph_unsuffixed cugraph==25.2.*,>=0.0.0a0 + - cugraph==25.2.*,>=0.0.0a0 - cugraph-service-client==25.2.*,>=0.0.0a0 - *ucx_py_unsuffixed test_cpp: @@ -466,9 +468,6 @@ dependencies: packages: - ipython - notebook>=0.5.0 - - output_types: [conda] - packages: - - wget test_python_common: common: - output_types: [conda, pyproject] @@ -501,7 +500,7 @@ dependencies: common: - output_types: [conda] packages: - - &pytorch_conda pytorch>=2.3 + - pytorch>=2.3 - torchdata - pydantic - ogb @@ -554,6 +553,31 @@ dependencies: - pylibwholegraph-cu11==25.2.*,>=0.0.0a0 - {matrix: null, packages: [*pylibwholegraph_unsuffixed]} + depends_on_librmm: + common: + - output_types: conda + packages: + - &librmm_unsuffixed librmm==25.2.*,>=0.0.0a0 + - output_types: requirements + packages: + # pip recognizes the index as a global option for the requirements.txt file + - --extra-index-url=https://pypi.nvidia.com + - --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple + specific: + - output_types: [requirements, pyproject] + matrices: + - matrix: + cuda: "12.*" + cuda_suffixed: "true" + packages: + - librmm-cu12==25.2.*,>=0.0.0a0 + - matrix: + cuda: "11.*" + cuda_suffixed: "true" + packages: + - librmm-cu11==25.2.*,>=0.0.0a0 + - {matrix: null, packages: [*librmm_unsuffixed]} + depends_on_rmm: common: - output_types: conda diff --git a/python/cugraph/pyproject.toml b/python/cugraph/pyproject.toml index 9a465d789e..8c2c0314ae 100644 --- a/python/cugraph/pyproject.toml +++ b/python/cugraph/pyproject.toml @@ -81,6 +81,7 @@ regex = "(?P.*)" build-backend = "scikit_build_core.build" requires = [ "cmake>=3.26.4,!=3.30.0", + "librmm==25.2.*,>=0.0.0a0", "ninja", "pylibcugraph==25.2.*,>=0.0.0a0", "pylibraft==25.2.*,>=0.0.0a0", diff --git a/python/pylibcugraph/pyproject.toml b/python/pylibcugraph/pyproject.toml index 72a5e19c70..8b45988483 100644 --- a/python/pylibcugraph/pyproject.toml +++ b/python/pylibcugraph/pyproject.toml @@ -73,6 +73,7 @@ build-backend = "scikit_build_core.build" dependencies-file = "../../dependencies.yaml" requires = [ "cmake>=3.26.4,!=3.30.0", + "librmm==25.2.*,>=0.0.0a0", "ninja", "pylibraft==25.2.*,>=0.0.0a0", "rmm==25.2.*,>=0.0.0a0",