Merge branch 'main' into gtest-static

Author: rgsl888prabhu

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

@@ -42,7 +42,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

@@ -42,7 +42,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

@@ -42,7 +42,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

@@ -42,7 +42,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 }}

cpp/src/linear_programming/utilities/problem_checking.cu

@@ -45,9 +45,8 @@ void problem_checking_t<i_t, f_t>::check_csr_representation(
   cuopt_expects(thrust::all_of(op_problem.get_handle_ptr()->get_thrust_policy(),
                                op_problem.get_constraint_matrix_indices().cbegin(),
                                op_problem.get_constraint_matrix_indices().cend(),
-                               [n_variables = op_problem.get_n_variables()] __device__(i_t val) {
-                                 return val >= 0 && val < n_variables;
-                               }),
+                               [n_variables = op_problem.get_n_variables()] __device__(
+                                 i_t val) -> bool { return val >= 0 && val < n_variables; }),
                 error_type_t::ValidationError,
                 "A_indices values must positive lower than the number of variables (c size).");
 }
@@ -72,7 +71,7 @@ void problem_checking_t<i_t, f_t>::check_initial_primal_representation(
                                   [lower_bounds = make_span(op_problem.get_variable_lower_bounds()),
                                    upper_bounds = make_span(op_problem.get_variable_upper_bounds()),
                                    assignment_span = make_span(primal_initial_solution),
-                                   int_tol         = 1e-8] __device__(i_t idx) {
+                                   int_tol         = 1e-8] __device__(i_t idx) -> bool {
                                     return assignment_span[idx] < lower_bounds[idx] - int_tol ||
                                            assignment_span[idx] > upper_bounds[idx] + int_tol;
                                   }),
@@ -171,13 +170,14 @@ void problem_checking_t<i_t, f_t>::check_problem_representation(
 
   // Check row type if set
   if (!op_problem.get_row_types().is_empty()) {
-    cuopt_expects(
-      thrust::all_of(op_problem.get_handle_ptr()->get_thrust_policy(),
-                     op_problem.get_row_types().cbegin(),
-                     op_problem.get_row_types().cend(),
-                     [] __device__(char val) { return val == 'E' || val == 'G' || val == 'L'; }),
-      error_type_t::ValidationError,
-      "row_types values must equal to 'E', 'G' or 'L'.");
+    cuopt_expects(thrust::all_of(op_problem.get_handle_ptr()->get_thrust_policy(),
+                                 op_problem.get_row_types().cbegin(),
+                                 op_problem.get_row_types().cend(),
+                                 [] __device__(char val) -> bool {
+                                   return val == 'E' || val == 'G' || val == 'L';
+                                 }),
+                  error_type_t::ValidationError,
+                  "row_types values must equal to 'E', 'G' or 'L'.");
 
     cuopt_expects(
       op_problem.get_row_types().size() == op_problem.get_constraint_bounds().size(),
@@ -322,19 +322,17 @@ bool problem_checking_t<i_t, f_t>::has_crossing_bounds(
     thrust::make_counting_iterator(0),
     thrust::make_counting_iterator(0) + op_problem.get_variable_upper_bounds().size(),
     [upper_bounds = make_span(op_problem.get_variable_upper_bounds()),
-     lower_bounds = make_span(op_problem.get_variable_lower_bounds())] __device__(size_t i) {
-      return upper_bounds[i] >= lower_bounds[i];
-    });
+     lower_bounds = make_span(op_problem.get_variable_lower_bounds())] __device__(size_t i)
+      -> bool { return upper_bounds[i] >= lower_bounds[i]; });
 
   // Check if all constraint bounds are valid (upper >= lower)
   bool all_constraint_bounds_valid = thrust::all_of(
     op_problem.get_handle_ptr()->get_thrust_policy(),
     thrust::make_counting_iterator(0),
     thrust::make_counting_iterator(0) + op_problem.get_constraint_upper_bounds().size(),
     [upper_bounds = make_span(op_problem.get_constraint_upper_bounds()),
-     lower_bounds = make_span(op_problem.get_constraint_lower_bounds())] __device__(size_t i) {
-      return upper_bounds[i] >= lower_bounds[i];
-    });
+     lower_bounds = make_span(op_problem.get_constraint_lower_bounds())] __device__(size_t i)
+      -> bool { return upper_bounds[i] >= lower_bounds[i]; });
 
   // Return true if any bounds are invalid (crossing)
   return !all_variable_bounds_valid || !all_constraint_bounds_valid;

cpp/src/mip/diversity/recombiners/bound_prop_recombiner.cuh

@@ -9,6 +9,7 @@
 
 #include "recombiner.cuh"
 
+#include <thrust/pair.h>
 #include <mip/local_search/rounding/constraint_prop.cuh>
 #include <mip/relaxed_lp/relaxed_lp.cuh>
 #include <mip/solution/solution.cuh>

cpp/src/mip/feasibility_jump/utils.cuh

@@ -9,6 +9,7 @@
 
 #include "feasibility_jump.cuh"
 
+#include <thrust/pair.h>
 #include <cuda/atomic>
 #include <raft/core/device_span.hpp>
 #include <rmm/device_scalar.hpp>

cpp/src/mip/local_search/rounding/bounds_repair.cu

@@ -268,7 +268,7 @@ void bounds_repair_t<i_t, f_t>::compute_damages(problem_t<i_t, f_t>& problem, i_
                       sort_iterator + n_candidates,
                       thrust::make_zip_iterator(thrust::make_tuple(
                         candidates.bound_shift.data(), candidates.variable_index.data())),
-                      [] __device__(auto tuple1, auto tuple2) {
+                      [] __device__(auto tuple1, auto tuple2) -> bool {
                         if (thrust::get<0>(tuple1) < thrust::get<0>(tuple2)) {
                           return true;
                         } else if (thrust::get<0>(tuple1) == thrust::get<0>(tuple2) &&
@@ -291,7 +291,7 @@ i_t bounds_repair_t<i_t, f_t>::find_cutoff_index(const candidates_t<i_t, f_t>& c
     handle_ptr->get_thrust_policy(),
     iterator,
     iterator + n_candidates,
-    [best_cstr_delta, best_damage] __device__(auto tuple) {
+    [best_cstr_delta, best_damage] __device__(auto tuple) -> bool {
       if (thrust::get<0>(tuple) == best_cstr_delta && thrust::get<1>(tuple) <= best_damage) {
         return true;
       }

cpp/src/mip/local_search/rounding/constraint_prop.cuh

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <thrust/pair.h>
 #include <mip/local_search/rounding/bounds_repair.cuh>
 #include <mip/presolve/bounds_presolve.cuh>
 #include <mip/presolve/conditional_bound_strengthening.cuh>