Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion conda/environments/all_cuda-129_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion conda/environments/all_cuda-129_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion conda/environments/all_cuda-130_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion conda/environments/all_cuda-130_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 0 additions & 28 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
16 changes: 3 additions & 13 deletions python/cuopt/cuopt/routing/vehicle_routing.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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
Expand All @@ -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):
Expand Down
13 changes: 4 additions & 9 deletions python/cuopt/cuopt/routing/vehicle_routing_wrapper.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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_ = <handle_t*><size_t>NULL
if session_id is None:
self.handle_ptr.reset(new handle_t())
handle_ = self.handle_ptr.get()
else:
handle_ = <handle_t*><size_t>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_,
Expand Down
2 changes: 0 additions & 2 deletions python/cuopt/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -91,7 +90,6 @@ known_rapids = [
"cudf",
"pylibraft",
"rmm",
"raft_dask",
]
known_first_party = [
"cuopt",
Expand Down
1 change: 0 additions & 1 deletion python/cuopt_self_hosted/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ known_rapids = [
"cudf",
"pylibraft",
"rmm",
"raft_dask",
"cuopt",
]
known_first_party = [
Expand Down
1 change: 0 additions & 1 deletion python/cuopt_server/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ known_rapids = [
"cudf",
"pylibraft",
"rmm",
"raft_dask",
"cuopt",
]
known_first_party = [
Expand Down