From 303fe40b331cd2d9d282ad2bbbde29bf307c4f11 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 5 Dec 2024 08:38:44 -0800 Subject: [PATCH 1/7] 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", From 14bcff3f2569d78443c6e4590247e41f46febe5c Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 18 Dec 2024 10:07:50 -0600 Subject: [PATCH 2/7] revert out librmm changes --- dependencies.yaml | 6 ++---- python/cugraph/pyproject.toml | 1 - python/pylibcugraph/pyproject.toml | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index f27e43f110..b8fed25e31 100755 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -49,6 +49,7 @@ files: output: none includes: - cuda_version + - depends_on_pylibwholegraph - py_version - test_notebook - test_python_common @@ -80,7 +81,6 @@ files: key: requires includes: - common_build - - depends_on_librmm - depends_on_pylibcugraph - depends_on_pylibraft - depends_on_rmm @@ -123,7 +123,6 @@ files: key: requires includes: - common_build - - depends_on_librmm - depends_on_pylibraft - depends_on_rmm py_run_pylibcugraph: @@ -499,7 +498,6 @@ dependencies: - scikit-learn>=0.23.1 - output_types: [conda] packages: - - &pylibwholegraph_unsuffixed pylibwholegraph==25.2.*,>=0.0.0a0 - *thrift test_python_pylibcugraph: common: @@ -543,7 +541,7 @@ dependencies: common: - output_types: conda packages: - - *pylibwholegraph_unsuffixed + - &pylibwholegraph_unsuffixed pylibwholegraph==25.2.*,>=0.0.0a0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file diff --git a/python/cugraph/pyproject.toml b/python/cugraph/pyproject.toml index ad58fa346b..8fa3a0938e 100644 --- a/python/cugraph/pyproject.toml +++ b/python/cugraph/pyproject.toml @@ -83,7 +83,6 @@ 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 8b45988483..72a5e19c70 100644 --- a/python/pylibcugraph/pyproject.toml +++ b/python/pylibcugraph/pyproject.toml @@ -73,7 +73,6 @@ 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", From 64d0fad48f3d07e6100eea13d008d4de985a7280 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 20 Dec 2024 10:28:04 -0500 Subject: [PATCH 3/7] break more things out into depends_on blocks --- .../all_cuda-118_arch-x86_64.yaml | 5 +- .../all_cuda-125_arch-x86_64.yaml | 5 +- dependencies.yaml | 177 ++++++++++++------ 3 files changed, 121 insertions(+), 66 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 44d7dfd16e..2e834a7212 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -27,9 +27,8 @@ dependencies: - gcc_linux-64=11.* - graphviz - ipython -- libcudf==25.2.*,>=0.0.0a0 -- libraft-headers==25.2.*,>=0.0.0a0 -- libraft==25.2.*,>=0.0.0a0 +- libcudf=25.2.*,>=0.0.0a0 +- libraft=25.2.*,>=0.0.0a0 - librmm==25.2.*,>=0.0.0a0 - nbsphinx - nccl>=2.19 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index b3415f8c08..2a70e5e926 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -30,12 +30,11 @@ dependencies: - graphviz - ipython - libcublas-dev -- libcudf==25.2.*,>=0.0.0a0 +- libcudf=25.2.*,>=0.0.0a0 - libcurand-dev - libcusolver-dev - libcusparse-dev -- libraft-headers==25.2.*,>=0.0.0a0 -- libraft==25.2.*,>=0.0.0a0 +- libraft=25.2.*,>=0.0.0a0 - librmm==25.2.*,>=0.0.0a0 - nbsphinx - nccl>=2.19 diff --git a/dependencies.yaml b/dependencies.yaml index b8fed25e31..a4cbbff8a5 100755 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -13,13 +13,17 @@ files: - cuda_version - depends_on_cudf - depends_on_cupy + - depends_on_dask_cuda - depends_on_dask_cudf + - depends_on_libcudf + - depends_on_libraft - depends_on_librmm - depends_on_pylibraft - depends_on_pylibwholegraph - depends_on_pytorch - depends_on_raft_dask - depends_on_rmm + - depends_on_ucx_py - docs - python_build_cythonize - python_build_rapids @@ -92,10 +96,12 @@ files: includes: - depends_on_cudf - depends_on_cupy + - depends_on_dask_cuda - depends_on_dask_cudf - depends_on_pylibcugraph - depends_on_raft_dask - depends_on_rmm + - depends_on_ucx_py - python_run_cugraph py_test_cugraph: output: pyproject @@ -174,9 +180,13 @@ files: table: project includes: - depends_on_cudf + - depends_on_cugraph + - depends_on_cugraph_service_client - depends_on_cupy + - depends_on_dask_cuda - depends_on_dask_cudf - depends_on_rmm + - depends_on_ucx_py - python_run_cugraph_service_server py_test_cugraph_service_server: output: pyproject @@ -292,9 +302,6 @@ dependencies: packages: - c-compiler - cxx-compiler - - libcudf==25.2.*,>=0.0.0a0 - - libraft-headers==25.2.*,>=0.0.0a0 - - libraft==25.2.*,>=0.0.0a0 - openmpi # Required for building cpp-mgtests (multi-GPU tests) specific: - output_types: [conda] @@ -385,7 +392,6 @@ dependencies: - output_types: [conda, pyproject] packages: - &dask rapids-dask-dependency==25.2.*,>=0.0.0a0 - - &dask_cuda dask-cuda==25.2.*,>=0.0.0a0 - &numba numba>=0.57 - &numpy numpy>=1.23,<3.0a0 - output_types: conda @@ -395,7 +401,6 @@ dependencies: - requests - nccl>=2.19 - ucx-proc=*=gpu - - &ucx_py_unsuffixed ucx-py==0.42.*,>=0.0.0a0 - output_types: pyproject packages: # cudf uses fsspec but is protocol independent. cugraph @@ -411,21 +416,6 @@ dependencies: - matrix: # All CUDA 11 versions packages: - cuda-python>=11.8.5,<12.0a0 - - output_types: pyproject - matrices: - - matrix: - cuda: "11.*" - cuda_suffixed: "true" - packages: - - &ucx_py_cu11 ucx-py-cu11==0.42.*,>=0.0.0a0 - - matrix: - cuda: "12.*" - cuda_suffixed: "true" - packages: - - &ucx_py_cu12 ucx-py-cu12==0.42.*,>=0.0.0a0 - - matrix: - packages: - - *ucx_py_unsuffixed python_run_cugraph_service_client: common: - output_types: [conda, pyproject] @@ -436,35 +426,9 @@ dependencies: - output_types: [conda, pyproject] packages: - *dask - - *dask_cuda - *numba - *numpy - *thrift - - output_types: conda - packages: - - *ucx_py_unsuffixed - specific: - - output_types: pyproject - matrices: - - matrix: - cuda: "11.*" - cuda_suffixed: "true" - packages: - - 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==25.2.*,>=0.0.0a0 - - cugraph-service-client-cu12==25.2.*,>=0.0.0a0 - - *ucx_py_cu12 - - matrix: - packages: - - cugraph==25.2.*,>=0.0.0a0 - - cugraph-service-client==25.2.*,>=0.0.0a0 - - *ucx_py_unsuffixed test_cpp: common: - output_types: conda @@ -505,6 +469,56 @@ dependencies: packages: - *numpy + depends_on_cugraph: + common: + - output_types: conda + packages: + - &cugraph_unsuffixed cugraph==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: + - cugraph-cu12==25.2.*,>=0.0.0a0 + - matrix: + cuda: "11.*" + cuda_suffixed: "true" + packages: + - cugraph-cu11==25.2.*,>=0.0.0a0 + - {matrix: null, packages: [*cugraph_unsuffixed]} + + depends_on_cugraph_service_client: + common: + - output_types: conda + packages: + - &cugraph_service_client_unsuffixed cugraph-service-client==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: + - cugraph-service-client-cu12==25.2.*,>=0.0.0a0 + - matrix: + cuda: "11.*" + cuda_suffixed: "true" + packages: + - cugraph-service-client-cu11==25.2.*,>=0.0.0a0 + - {matrix: null, packages: [*cugraph_service_client_unsuffixed]} + depends_on_pytorch: common: - output_types: [conda] @@ -562,11 +576,29 @@ dependencies: - pylibwholegraph-cu11==25.2.*,>=0.0.0a0 - {matrix: null, packages: [*pylibwholegraph_unsuffixed]} + depends_on_libcudf: + common: + - output_types: conda + packages: + - libcudf=25.2.*,>=0.0.0a0 + + depends_on_libraft: + common: + - output_types: conda + packages: + - libraft=25.2.*,>=0.0.0a0 + depends_on_librmm: common: - output_types: conda packages: - - &librmm_unsuffixed librmm==25.2.*,>=0.0.0a0 + - librmm==25.2.*,>=0.0.0a0 + + depends_on_rmm: + common: + - output_types: conda + packages: + - &rmm_unsuffixed rmm==25.2.*,>=0.0.0a0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -579,19 +611,19 @@ dependencies: cuda: "12.*" cuda_suffixed: "true" packages: - - librmm-cu12==25.2.*,>=0.0.0a0 + - rmm-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]} + - rmm-cu11==25.2.*,>=0.0.0a0 + - {matrix: null, packages: [*rmm_unsuffixed]} - depends_on_rmm: + depends_on_cudf: common: - output_types: conda packages: - - &rmm_unsuffixed rmm==25.2.*,>=0.0.0a0 + - &cudf_unsuffixed cudf==25.2.*,>=0.0.0a0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -604,19 +636,19 @@ dependencies: cuda: "12.*" cuda_suffixed: "true" packages: - - rmm-cu12==25.2.*,>=0.0.0a0 + - cudf-cu12==25.2.*,>=0.0.0a0 - matrix: cuda: "11.*" cuda_suffixed: "true" packages: - - rmm-cu11==25.2.*,>=0.0.0a0 - - {matrix: null, packages: [*rmm_unsuffixed]} + - cudf-cu11==25.2.*,>=0.0.0a0 + - {matrix: null, packages: [*cudf_unsuffixed]} - depends_on_cudf: + depends_on_dask_cuda: common: - output_types: conda packages: - - &cudf_unsuffixed cudf==25.2.*,>=0.0.0a0 + - &dask_cuda_unsuffixed dask-cuda==25.2.*,>=0.0.0a0 - output_types: requirements packages: # pip recognizes the index as a global option for the requirements.txt file @@ -629,13 +661,13 @@ dependencies: cuda: "12.*" cuda_suffixed: "true" packages: - - cudf-cu12==25.2.*,>=0.0.0a0 + - dask-cuda-cu12==25.2.*,>=0.0.0a0 - matrix: cuda: "11.*" cuda_suffixed: "true" packages: - - cudf-cu11==25.2.*,>=0.0.0a0 - - {matrix: null, packages: [*cudf_unsuffixed]} + - dask-cuda-cu11==25.2.*,>=0.0.0a0 + - {matrix: null, packages: [*dask_cuda_unsuffixed]} depends_on_dask_cudf: common: @@ -755,3 +787,28 @@ dependencies: packages: &cupy_packages_cu11 - cupy-cuda11x>=12.0.0 - {matrix: null, packages: *cupy_packages_cu11} + + depends_on_ucx_py: + common: + - output_types: conda + packages: + - &ucx_py_unsuffixed ucx-py==0.42.*,>=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: + - ucx-py-cu12==0.42.*,>=0.0.0a0 + - matrix: + cuda: "11.*" + cuda_suffixed: "true" + packages: + - ucx-py-cu11==0.42.*,>=0.0.0a0 + - {matrix: null, packages: [*ucx_py_unsuffixed]} From 3b9bd14e1cf4d27731404d022f4897fd0ff5a136 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 20 Dec 2024 10:42:03 -0500 Subject: [PATCH 4/7] dask-cuda is unsuffixed --- dependencies.yaml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index a4cbbff8a5..eb73b2e31e 100755 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -646,28 +646,14 @@ dependencies: depends_on_dask_cuda: common: - - output_types: conda + - output_types: [conda, pyproject, requirements] packages: - - &dask_cuda_unsuffixed dask-cuda==25.2.*,>=0.0.0a0 + - dask-cuda==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: - - dask-cuda-cu12==25.2.*,>=0.0.0a0 - - matrix: - cuda: "11.*" - cuda_suffixed: "true" - packages: - - dask-cuda-cu11==25.2.*,>=0.0.0a0 - - {matrix: null, packages: [*dask_cuda_unsuffixed]} depends_on_dask_cudf: common: From 3aaf837bc234b8a1ca9002f9075f7260810d89b6 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 20 Dec 2024 10:47:37 -0500 Subject: [PATCH 5/7] put back == to cut a few lines out of the diff --- conda/environments/all_cuda-118_arch-x86_64.yaml | 4 ++-- conda/environments/all_cuda-125_arch-x86_64.yaml | 4 ++-- dependencies.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 2e834a7212..5d0dc9569a 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -27,8 +27,8 @@ dependencies: - gcc_linux-64=11.* - graphviz - ipython -- libcudf=25.2.*,>=0.0.0a0 -- libraft=25.2.*,>=0.0.0a0 +- libcudf==25.2.*,>=0.0.0a0 +- libraft==25.2.*,>=0.0.0a0 - librmm==25.2.*,>=0.0.0a0 - nbsphinx - nccl>=2.19 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 2a70e5e926..78a7df40d2 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -30,11 +30,11 @@ dependencies: - graphviz - ipython - libcublas-dev -- libcudf=25.2.*,>=0.0.0a0 +- libcudf==25.2.*,>=0.0.0a0 - libcurand-dev - libcusolver-dev - libcusparse-dev -- libraft=25.2.*,>=0.0.0a0 +- libraft==25.2.*,>=0.0.0a0 - librmm==25.2.*,>=0.0.0a0 - nbsphinx - nccl>=2.19 diff --git a/dependencies.yaml b/dependencies.yaml index eb73b2e31e..8555eed9e6 100755 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -580,13 +580,13 @@ dependencies: common: - output_types: conda packages: - - libcudf=25.2.*,>=0.0.0a0 + - libcudf==25.2.*,>=0.0.0a0 depends_on_libraft: common: - output_types: conda packages: - - libraft=25.2.*,>=0.0.0a0 + - libraft==25.2.*,>=0.0.0a0 depends_on_librmm: common: From 7fc94736184cf1fcee3349f650ef8ceecdf0ffc7 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 20 Dec 2024 12:54:35 -0500 Subject: [PATCH 6/7] remove cugraph-service-client suffixes --- dependencies.yaml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 8555eed9e6..e0c1b2f93b 100755 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -496,28 +496,14 @@ dependencies: depends_on_cugraph_service_client: common: - - output_types: conda + - output_types: [conda, requirements, pyproject] packages: - - &cugraph_service_client_unsuffixed cugraph-service-client==25.2.*,>=0.0.0a0 + - cugraph-service-client==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: - - cugraph-service-client-cu12==25.2.*,>=0.0.0a0 - - matrix: - cuda: "11.*" - cuda_suffixed: "true" - packages: - - cugraph-service-client-cu11==25.2.*,>=0.0.0a0 - - {matrix: null, packages: [*cugraph_service_client_unsuffixed]} depends_on_pytorch: common: From 34697a69b91ff5b65b1556a3b8a557dba58674f9 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 20 Dec 2024 13:50:24 -0500 Subject: [PATCH 7/7] align thriftpy2 floors, remove libraft-headers --- ci/release/update-version.sh | 1 - conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/recipes/libcugraph/meta.yaml | 2 -- dependencies.yaml | 2 +- python/cugraph-service/client/pyproject.toml | 2 +- python/cugraph-service/server/pyproject.toml | 2 +- 7 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index a73745f2c0..2890011bc7 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -58,7 +58,6 @@ DEPENDENCIES=( dask-cudf libcudf libraft - libraft-headers librmm pylibcugraph pylibwholegraph diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 5d0dc9569a..7b2fddb742 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -67,7 +67,7 @@ dependencies: - sphinx-markdown-tables - sphinx<6 - sphinxcontrib-websupport -- thriftpy2!=0.5.0,!=0.5.1 +- thriftpy2>=0.4.15,!=0.5.0,!=0.5.1 - torchdata - torchmetrics - ucx-proc=*=gpu diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 78a7df40d2..87a2417bbc 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -72,7 +72,7 @@ dependencies: - sphinx-markdown-tables - sphinx<6 - sphinxcontrib-websupport -- thriftpy2!=0.5.0,!=0.5.1 +- thriftpy2>=0.4.15,!=0.5.0,!=0.5.1 - torchdata - torchmetrics - ucx-proc=*=gpu diff --git a/conda/recipes/libcugraph/meta.yaml b/conda/recipes/libcugraph/meta.yaml index 922d5e577b..eb948e08d1 100644 --- a/conda/recipes/libcugraph/meta.yaml +++ b/conda/recipes/libcugraph/meta.yaml @@ -70,7 +70,6 @@ requirements: - doxygen {{ doxygen_version }} - libcudf ={{ minor_version }} - libraft ={{ minor_version }} - - libraft-headers ={{ minor_version }} - librmm ={{ minor_version }} - nccl {{ nccl_version }} - ucx-proc=*=gpu @@ -114,7 +113,6 @@ outputs: - libcusparse {% endif %} - libraft ={{ minor_version }} - - libraft-headers ={{ minor_version }} - librmm ={{ minor_version }} - nccl {{ nccl_version }} - ucx-proc=*=gpu diff --git a/dependencies.yaml b/dependencies.yaml index e0c1b2f93b..eb4bb68dc9 100755 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -420,7 +420,7 @@ dependencies: common: - output_types: [conda, pyproject] packages: - - &thrift thriftpy2!=0.5.0,!=0.5.1 + - &thrift thriftpy2>=0.4.15,!=0.5.0,!=0.5.1 python_run_cugraph_service_server: common: - output_types: [conda, pyproject] diff --git a/python/cugraph-service/client/pyproject.toml b/python/cugraph-service/client/pyproject.toml index ac5e6bad0d..093a578db2 100644 --- a/python/cugraph-service/client/pyproject.toml +++ b/python/cugraph-service/client/pyproject.toml @@ -20,7 +20,7 @@ authors = [ license = { text = "Apache 2.0" } requires-python = ">=3.10" dependencies = [ - "thriftpy2!=0.5.0,!=0.5.1", + "thriftpy2>=0.4.15,!=0.5.0,!=0.5.1", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [ "Intended Audience :: Developers", diff --git a/python/cugraph-service/server/pyproject.toml b/python/cugraph-service/server/pyproject.toml index adb18f5721..29ee41854f 100644 --- a/python/cugraph-service/server/pyproject.toml +++ b/python/cugraph-service/server/pyproject.toml @@ -30,7 +30,7 @@ dependencies = [ "numpy>=1.23,<3.0a0", "rapids-dask-dependency==25.2.*,>=0.0.0a0", "rmm==25.2.*,>=0.0.0a0", - "thriftpy2!=0.5.0,!=0.5.1", + "thriftpy2>=0.4.15,!=0.5.0,!=0.5.1", "ucx-py==0.42.*,>=0.0.0a0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`. classifiers = [