From 8e4ad30e36c2794d1151d75840f715de044861f3 Mon Sep 17 00:00:00 2001 From: Ramakrishna Prabhu Date: Thu, 9 Oct 2025 11:02:50 -0500 Subject: [PATCH] remove raft dask usage --- .../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 - dependencies.yaml | 28 ------------------- python/cuopt/cuopt/routing/vehicle_routing.py | 16 ++--------- .../cuopt/routing/vehicle_routing_wrapper.pyx | 13 +++------ python/cuopt/pyproject.toml | 2 -- python/cuopt_self_hosted/pyproject.toml | 1 - python/cuopt_server/pyproject.toml | 1 - 10 files changed, 7 insertions(+), 58 deletions(-) diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index be834f5b5e..b8132714d9 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -59,7 +59,6 @@ dependencies: - pytest-cov - pytest<8 - python>=3.10,<3.14 -- raft-dask==25.10.*,>=0.0.0a0 - rapids-build-backend>=0.4.0,<0.5.0.dev0 - rapids-dask-dependency==25.10.*,>=0.0.0a0 - rapids-logger==0.1.*,>=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 d1c3968093..7a5b26bb82 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -59,7 +59,6 @@ dependencies: - pytest-cov - pytest<8 - python>=3.10,<3.14 -- raft-dask==25.10.*,>=0.0.0a0 - rapids-build-backend>=0.4.0,<0.5.0.dev0 - rapids-dask-dependency==25.10.*,>=0.0.0a0 - rapids-logger==0.1.*,>=0.0.0a0 diff --git a/conda/environments/all_cuda-130_arch-aarch64.yaml b/conda/environments/all_cuda-130_arch-aarch64.yaml index a7a532bd3d..7713566ec9 100644 --- a/conda/environments/all_cuda-130_arch-aarch64.yaml +++ b/conda/environments/all_cuda-130_arch-aarch64.yaml @@ -59,7 +59,6 @@ dependencies: - pytest-cov - pytest<8 - python>=3.10,<3.14 -- raft-dask==25.10.*,>=0.0.0a0 - rapids-build-backend>=0.4.0,<0.5.0.dev0 - rapids-dask-dependency==25.10.*,>=0.0.0a0 - rapids-logger==0.1.*,>=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 838ac5ac05..bcf7d3a819 100644 --- a/conda/environments/all_cuda-130_arch-x86_64.yaml +++ b/conda/environments/all_cuda-130_arch-x86_64.yaml @@ -59,7 +59,6 @@ dependencies: - pytest-cov - pytest<8 - python>=3.10,<3.14 -- raft-dask==25.10.*,>=0.0.0a0 - rapids-build-backend>=0.4.0,<0.5.0.dev0 - rapids-dask-dependency==25.10.*,>=0.0.0a0 - rapids-logger==0.1.*,>=0.0.0a0 diff --git a/dependencies.yaml b/dependencies.yaml index c49f5a19a5..de50ea11df 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -46,7 +46,6 @@ files: - depends_on_cudf - depends_on_cuvs - depends_on_pylibraft - - depends_on_raft_dask - depends_on_rapids_logger - rapids_build_backend test_cpp: @@ -195,7 +194,6 @@ files: - depends_on_rmm - depends_on_cudf - depends_on_cuvs - - depends_on_raft_dask - depends_on_pylibraft - depends_on_rapids_logger py_test_cuopt: @@ -660,32 +658,6 @@ dependencies: packages: - *cuvs_unsuffixed - depends_on_raft_dask: - common: - - output_types: conda - packages: - - &raft_dask_unsuffixed raft-dask==25.10.*,>=0.0.0a0 - - output_types: requirements - packages: - - --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: - - raft-dask-cu12==25.10.*,>=0.0.0a0 - - matrix: - cuda: "13.*" - cuda_suffixed: "true" - packages: - - raft-dask-cu13==25.10.*,>=0.0.0a0 - - matrix: - packages: - - *raft_dask_unsuffixed - depends_on_pylibraft: common: - output_types: conda diff --git a/python/cuopt/cuopt/routing/vehicle_routing.py b/python/cuopt/cuopt/routing/vehicle_routing.py index d4a96748c6..623f15477c 100644 --- a/python/cuopt/cuopt/routing/vehicle_routing.py +++ b/python/cuopt/cuopt/routing/vehicle_routing.py @@ -34,7 +34,7 @@ class DataModel(vehicle_routing_wrapper.DataModel): """ - DataModel(n_locations, n_fleet, n_orders: int = -1, session_id=None) + DataModel(n_locations, n_fleet, n_orders: int = -1) Initialize a Data Model. @@ -46,8 +46,6 @@ class DataModel(vehicle_routing_wrapper.DataModel): number of vehicles/technician in the fleet. n_orders : Integer number of orders. - session_id : Integer - This is used with dask for Multi GPU scenario. Note: - A cost matrix must be set before passing @@ -67,16 +65,8 @@ class DataModel(vehicle_routing_wrapper.DataModel): """ @catch_cuopt_exception - def __init__( - self, - n_locations, - n_fleet, - n_orders: int = -1, - session_id=None, - ): - super().__init__( - n_locations, n_fleet, n_orders=n_orders, session_id=session_id - ) + def __init__(self, n_locations, n_fleet, n_orders: int = -1): + super().__init__(n_locations, n_fleet, n_orders=n_orders) @catch_cuopt_exception def add_cost_matrix(self, cost_mat, vehicle_type=0): diff --git a/python/cuopt/cuopt/routing/vehicle_routing_wrapper.pyx b/python/cuopt/cuopt/routing/vehicle_routing_wrapper.pyx index d2f3b091b3..afde213044 100644 --- a/python/cuopt/cuopt/routing/vehicle_routing_wrapper.pyx +++ b/python/cuopt/cuopt/routing/vehicle_routing_wrapper.pyx @@ -34,8 +34,6 @@ from datetime import date, datetime from dateutil.relativedelta import relativedelta -from raft_dask.common import Comms, local_handle - from cuopt.routing.assignment import Assignment from cuopt.utilities import type_cast @@ -161,14 +159,11 @@ cdef class DataModel: cdef unique_ptr[data_model_view_t[int, float]] c_data_model_view cdef unique_ptr[handle_t] handle_ptr - def __init__(self, int num_locations, int fleet_size, int n_orders=-1, - session_id=None): + def __init__(self, int num_locations, int fleet_size, int n_orders=-1): cdef handle_t* handle_ = NULL - if session_id is None: - self.handle_ptr.reset(new handle_t()) - handle_ = self.handle_ptr.get() - else: - handle_ = local_handle(session_id).getHandle() + + self.handle_ptr.reset(new handle_t()) + handle_ = self.handle_ptr.get() self.c_data_model_view.reset(new data_model_view_t[int, float]( handle_, diff --git a/python/cuopt/pyproject.toml b/python/cuopt/pyproject.toml index e447d94e5d..95cd468e26 100644 --- a/python/cuopt/pyproject.toml +++ b/python/cuopt/pyproject.toml @@ -42,7 +42,6 @@ dependencies = [ "numpy>=1.23.5,<3.0a0", "pandas>=2.0", "pylibraft==25.10.*,>=0.0.0a0", - "raft-dask==25.10.*,>=0.0.0a0", "rapids-dask-dependency==25.10.*,>=0.0.0a0", "rapids-logger==0.1.*,>=0.0.0a0", "rmm==25.10.*,>=0.0.0a0", @@ -91,7 +90,6 @@ known_rapids = [ "cudf", "pylibraft", "rmm", - "raft_dask", ] known_first_party = [ "cuopt", diff --git a/python/cuopt_self_hosted/pyproject.toml b/python/cuopt_self_hosted/pyproject.toml index 1a0b9a9db5..d035b105f6 100644 --- a/python/cuopt_self_hosted/pyproject.toml +++ b/python/cuopt_self_hosted/pyproject.toml @@ -86,7 +86,6 @@ known_rapids = [ "cudf", "pylibraft", "rmm", - "raft_dask", "cuopt", ] known_first_party = [ diff --git a/python/cuopt_server/pyproject.toml b/python/cuopt_server/pyproject.toml index 40845f4a6a..52e5e9290d 100644 --- a/python/cuopt_server/pyproject.toml +++ b/python/cuopt_server/pyproject.toml @@ -96,7 +96,6 @@ known_rapids = [ "cudf", "pylibraft", "rmm", - "raft_dask", "cuopt", ] known_first_party = [