From 1bdb5bc4d720dad20c27724285b7bc3f084afd24 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 5 Jan 2026 07:07:42 -0600 Subject: [PATCH] remove dask dependencies and configuration, reduce duplication in dependencies.yaml --- ci/release/update-version.sh | 4 +--- .../all_cuda-129_arch-aarch64.yaml | 1 - .../all_cuda-129_arch-x86_64.yaml | 1 - .../all_cuda-130_arch-aarch64.yaml | 1 - .../all_cuda-130_arch-x86_64.yaml | 1 - conda/recipes/cuopt/recipe.yaml | 4 +--- dependencies.yaml | 24 +++++++++---------- pyproject.toml | 3 +-- python/cuopt/pyproject.toml | 6 ----- python/cuopt_self_hosted/pyproject.toml | 5 ---- python/cuopt_server/pyproject.toml | 5 ---- 11 files changed, 14 insertions(+), 41 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 24124ad569..000aac6827 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved. # SPDX-License-Identifier: Apache-2.0 ## Usage @@ -108,8 +108,6 @@ DEPENDENCIES=( libraft-headers librmm pylibraft - raft-dask - rapids-dask-dependency rmm ) diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index 8bd435a1be..0594f81068 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -56,7 +56,6 @@ dependencies: - pytest<9.0 - python>=3.10,<3.14 - rapids-build-backend>=0.4.0,<0.5.0 -- rapids-dask-dependency==26.2.*,>=0.0.0a0 - rapids-logger==0.2.*,>=0.0.0a0 - requests - rmm==26.2.*,>=0.0.0a0 diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml index abc7dac7fa..55b3d3dfbc 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -56,7 +56,6 @@ dependencies: - pytest<9.0 - python>=3.10,<3.14 - rapids-build-backend>=0.4.0,<0.5.0 -- rapids-dask-dependency==26.2.*,>=0.0.0a0 - rapids-logger==0.2.*,>=0.0.0a0 - requests - rmm==26.2.*,>=0.0.0a0 diff --git a/conda/environments/all_cuda-130_arch-aarch64.yaml b/conda/environments/all_cuda-130_arch-aarch64.yaml index 3d098646fe..938c0cce83 100644 --- a/conda/environments/all_cuda-130_arch-aarch64.yaml +++ b/conda/environments/all_cuda-130_arch-aarch64.yaml @@ -56,7 +56,6 @@ dependencies: - pytest<9.0 - python>=3.10,<3.14 - rapids-build-backend>=0.4.0,<0.5.0 -- rapids-dask-dependency==26.2.*,>=0.0.0a0 - rapids-logger==0.2.*,>=0.0.0a0 - requests - rmm==26.2.*,>=0.0.0a0 diff --git a/conda/environments/all_cuda-130_arch-x86_64.yaml b/conda/environments/all_cuda-130_arch-x86_64.yaml index b67364714a..03030108d8 100644 --- a/conda/environments/all_cuda-130_arch-x86_64.yaml +++ b/conda/environments/all_cuda-130_arch-x86_64.yaml @@ -56,7 +56,6 @@ dependencies: - pytest<9.0 - python>=3.10,<3.14 - rapids-build-backend>=0.4.0,<0.5.0 -- rapids-dask-dependency==26.2.*,>=0.0.0a0 - rapids-logger==0.2.*,>=0.0.0a0 - requests - rmm==26.2.*,>=0.0.0a0 diff --git a/conda/recipes/cuopt/recipe.yaml b/conda/recipes/cuopt/recipe.yaml index ada955425b..efc587f2de 100644 --- a/conda/recipes/cuopt/recipe.yaml +++ b/conda/recipes/cuopt/recipe.yaml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION. +# SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION. # SPDX-License-Identifier: Apache-2.0 schema_version: 1 @@ -82,8 +82,6 @@ requirements: - pandas >=2.0 - pylibraft =${{ minor_version }} - python - - raft-dask =${{ minor_version }} - - rapids-dask-dependency =${{ minor_version }} - rmm =${{ minor_version }} # Needed by Numba for CUDA support - cuda-nvcc-impl diff --git a/dependencies.yaml b/dependencies.yaml index fcd1bec384..db059451aa 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -29,11 +29,13 @@ files: - test_python_common - test_python_cuopt - test_python_cuopt_server - - depends_on_rmm - - depends_on_cupy - depends_on_cudf + - depends_on_cupy + - depends_on_libraft_headers + - depends_on_librmm - depends_on_pylibraft - depends_on_rapids_logger + - depends_on_rmm - rapids_build_backend test_cpp: output: none @@ -297,8 +299,6 @@ dependencies: packages: - libboost-devel - cpp-argparse - - librmm==26.2.*,>=0.0.0a0 - - libraft-headers==26.2.*,>=0.0.0a0 - tbb-devel - zlib - bzip2 @@ -348,7 +348,6 @@ dependencies: packages: - numba-cuda>=0.22.1,<0.23.0 - numba>=0.60.0 - - rapids-dask-dependency==26.2.*,>=0.0.0a0 - &pandas pandas>=2.0 - output_types: requirements packages: @@ -374,7 +373,7 @@ dependencies: - &jsonref jsonref==1.1.0 - &msgpack_numpy msgpack-numpy==0.4.8 - pexpect - - requests + - &requests requests - output_types: [requirements, pyproject] packages: - &msgpack msgpack==1.1.0 @@ -390,23 +389,22 @@ dependencies: - *jsonref - *msgpack_numpy - *pandas + - psutil>=6.0.0 - uvicorn==0.34.* - output_types: conda packages: - *msgpack_python - pip - - psutil>=6.0.0 - output_types: [requirements, pyproject] packages: - *msgpack - - psutil>=6.0.0 run_cuopt_sh_client: common: - output_types: [conda, requirements, pyproject] packages: - *msgpack_numpy - - requests + - *requests - output_types: conda packages: - *msgpack_python @@ -732,7 +730,7 @@ dependencies: - output_types: [conda] packages: - *doxygen - - ipython + - &ipython ipython - *jsonref - make - *msgpack_python @@ -757,7 +755,7 @@ dependencies: common: - output_types: [conda, requirements] packages: - - ipython + - *ipython - notebook - output_types: [conda] packages: @@ -766,11 +764,11 @@ dependencies: - *msgpack_python - *numpy - pip: - - veroviz + - &veroviz veroviz - output_types: [requirements] packages: - *numpy - - veroviz + - *veroviz py_version: specific: - output_types: conda diff --git a/pyproject.toml b/pyproject.toml index 96ea5a413a..f8124b89c9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION. All rights reserved. +# SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION. All rights reserved. # SPDX-License-Identifier: Apache-2.0 [tool.black] @@ -42,7 +42,6 @@ section-order = [ "future", "standard-library", "third-party", - "dask", "rapids", "first-party", "local-folder", diff --git a/python/cuopt/pyproject.toml b/python/cuopt/pyproject.toml index 03d4de387b..36560e46af 100644 --- a/python/cuopt/pyproject.toml +++ b/python/cuopt/pyproject.toml @@ -29,7 +29,6 @@ dependencies = [ "numpy>=1.23.5,<3.0", "pandas>=2.0", "pylibraft==26.2.*,>=0.0.0a0", - "rapids-dask-dependency==26.2.*,>=0.0.0a0", "rapids-logger==0.2.*,>=0.0.0a0", "rmm==26.2.*,>=0.0.0a0", ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. @@ -63,11 +62,6 @@ known-first-party = [ ] [tool.ruff.lint.isort.sections] -dask = [ - "dask", - "distributed", - "dask_cuda", -] rapids = [ "cudf", "pylibraft", diff --git a/python/cuopt_self_hosted/pyproject.toml b/python/cuopt_self_hosted/pyproject.toml index 81e01d8b73..8d544aa219 100644 --- a/python/cuopt_self_hosted/pyproject.toml +++ b/python/cuopt_self_hosted/pyproject.toml @@ -67,11 +67,6 @@ known-first-party = [ ] [tool.ruff.lint.isort.sections] -dask = [ - "dask", - "distributed", - "dask_cuda", -] rapids = [ "cudf", "pylibraft", diff --git a/python/cuopt_server/pyproject.toml b/python/cuopt_server/pyproject.toml index 47e2faad50..6cddb0de0e 100644 --- a/python/cuopt_server/pyproject.toml +++ b/python/cuopt_server/pyproject.toml @@ -76,11 +76,6 @@ known-first-party = [ ] [tool.ruff.lint.isort.sections] -dask = [ - "dask", - "distributed", - "dask_cuda", -] rapids = [ "cudf", "pylibraft",