Merge branch 'main' of github.com:NVIDIA/cuopt into batch-tsp

Author: hlinsen

conda/environments/all_cuda-129_arch-aarch64.yaml

@@ -44,7 +44,7 @@ dependencies:
 - myst-parser
 - ninja
 - notebook
-- numba-cuda>=0.19.1,<0.20.0a0
+- numba-cuda>=0.22.1,<0.23.0
 - numba>=0.60.0
 - numpy>=1.23.5,<3.0a0
 - numpydoc

conda/environments/all_cuda-129_arch-x86_64.yaml

@@ -44,7 +44,7 @@ dependencies:
 - myst-parser
 - ninja
 - notebook
-- numba-cuda>=0.19.1,<0.20.0a0
+- numba-cuda>=0.22.1,<0.23.0
 - numba>=0.60.0
 - numpy>=1.23.5,<3.0a0
 - numpydoc

conda/environments/all_cuda-130_arch-aarch64.yaml

@@ -44,7 +44,7 @@ dependencies:
 - myst-parser
 - ninja
 - notebook
-- numba-cuda>=0.19.1,<0.20.0a0
+- numba-cuda>=0.22.1,<0.23.0
 - numba>=0.60.0
 - numpy>=1.23.5,<3.0a0
 - numpydoc

conda/environments/all_cuda-130_arch-x86_64.yaml

@@ -44,7 +44,7 @@ dependencies:
 - myst-parser
 - ninja
 - notebook
-- numba-cuda>=0.19.1,<0.20.0a0
+- numba-cuda>=0.22.1,<0.23.0
 - numba>=0.60.0
 - numpy>=1.23.5,<3.0a0
 - numpydoc

conda/recipes/cuopt/recipe.yaml

@@ -77,7 +77,7 @@ requirements:
     - h5py
     - libcuopt =${{ version }}
     - numba >=0.60.0
-    - numba-cuda>=0.19.1,<0.20.0a0
+    - numba-cuda>=0.22.1,<0.23.0
     - numpy >=1.23,<3.0a0
     - pandas >=2.0
     - pylibraft =${{ minor_version }}

dependencies.yaml

@@ -348,7 +348,7 @@ dependencies:
     common:
       - output_types: [conda, requirements, pyproject]
         packages:
-          - numba-cuda>=0.19.1,<0.20.0a0
+          - numba-cuda>=0.22.1,<0.23.0
           - numba>=0.60.0
           - rapids-dask-dependency==26.2.*,>=0.0.0a0
           - &pandas pandas>=2.0

python/cuopt/cuopt/linear_programming/problem.py

@@ -935,7 +935,7 @@ def __mul__(self, other):
                 return other * self
 
     def __rmul__(self, other):
-        return other * self
+        return self * other
 
     def __itruediv__(self, other):
         # Compute expr /= constant

python/cuopt/pyproject.toml

@@ -24,7 +24,7 @@ dependencies = [
     "cuopt-mps-parser==26.2.*,>=0.0.0a0",
     "cupy-cuda13x>=13.6.0",
     "libcuopt==26.2.*,>=0.0.0a0",
-    "numba-cuda>=0.19.1,<0.20.0a0",
+    "numba-cuda>=0.22.1,<0.23.0",
     "numba>=0.60.0",
     "numpy>=1.23.5,<3.0a0",
     "pandas>=2.0",