Fix errors introduced in update to latest release/26.02

Author: tmckayus

cpp/src/linear_programming/solve.cu

@@ -1771,7 +1771,14 @@ optimization_problem_solution_t<i_t, f_t> solve_lp(raft::handle_t const* handle_
     bool problem_checking,                                                              \
     bool use_pdlp_solver_mode);                                                         \
                                                                                         \
-  template void set_pdlp_solver_mode(pdlp_solver_settings_t<int, F_TYPE> const& settings);
+  template optimization_problem_solution_t<int, F_TYPE> batch_pdlp_solve(               \
+    raft::handle_t const* handle_ptr,                                                   \
+    const cuopt::mps_parser::mps_data_model_t<int, F_TYPE>& mps_data_model,             \
+    const std::vector<int>& fractional,                                                 \
+    const std::vector<F_TYPE>& root_soln_x,                                             \
+    pdlp_solver_settings_t<int, F_TYPE> const& settings);                               \
+                                                                                        \
+  template void set_pdlp_solver_mode(pdlp_solver_settings_t<int, F_TYPE>& settings);
 
 #if MIP_INSTANTIATE_FLOAT
 INSTANTIATE(float)

cpp/src/linear_programming/solver_solution.cu

@@ -29,7 +29,7 @@ optimization_problem_solution_t<i_t, f_t>::optimization_problem_solution_t(
     dual_solution_(std::make_unique<rmm::device_uvector<f_t>>(0, stream_view)),
     reduced_cost_(std::make_unique<rmm::device_uvector<f_t>>(0, stream_view)),
     is_device_memory_(true),
-    termination_status_(termination_status),
+    termination_status_{{termination_status}},
     error_status_(cuopt::logic_error("", cuopt::error_type_t::Success))
 {
   cuopt_assert(termination_stats_.size() == termination_status_.size(),
@@ -43,7 +43,7 @@ optimization_problem_solution_t<i_t, f_t>::optimization_problem_solution_t(
     dual_solution_(std::make_unique<rmm::device_uvector<f_t>>(0, stream_view)),
     reduced_cost_(std::make_unique<rmm::device_uvector<f_t>>(0, stream_view)),
     is_device_memory_(true),
-    termination_status_(pdlp_termination_status_t::NoTermination),
+    termination_status_{{pdlp_termination_status_t::NoTermination}},
     error_status_(error_status_)
 {
   cuopt_assert(termination_stats_.size() == termination_status_.size(),
@@ -58,7 +58,7 @@ optimization_problem_solution_t<i_t, f_t>::optimization_problem_solution_t(
     dual_solution_host_(std::make_unique<std::vector<f_t>>()),
     reduced_cost_host_(std::make_unique<std::vector<f_t>>()),
     is_device_memory_(false),
-    termination_status_(termination_status),
+    termination_status_{{termination_status}},
     error_status_(cuopt::logic_error("", cuopt::error_type_t::Success))
 {
 }
@@ -71,7 +71,7 @@ optimization_problem_solution_t<i_t, f_t>::optimization_problem_solution_t(
     dual_solution_host_(std::make_unique<std::vector<f_t>>()),
     reduced_cost_host_(std::make_unique<std::vector<f_t>>()),
     is_device_memory_(false),
-    termination_status_(pdlp_termination_status_t::NoTermination),
+    termination_status_{{pdlp_termination_status_t::NoTermination}},
     error_status_(error_status)
 {
 }
@@ -85,8 +85,8 @@ optimization_problem_solution_t<i_t, f_t>::optimization_problem_solution_t(
   const std::string objective_name,
   const std::vector<std::string>& var_names,
   const std::vector<std::string>& row_names,
-  additional_termination_information_t& termination_stats,
-  pdlp_termination_status_t termination_status)
+  std::vector<additional_termination_information_t>&& termination_stats,
+  std::vector<pdlp_termination_status_t>&& termination_status)
   : primal_solution_(std::make_unique<rmm::device_uvector<f_t>>(std::move(final_primal_solution))),
     dual_solution_(std::make_unique<rmm::device_uvector<f_t>>(std::move(final_dual_solution))),
     reduced_cost_(std::make_unique<rmm::device_uvector<f_t>>(std::move(final_reduced_cost))),
@@ -95,8 +95,8 @@ optimization_problem_solution_t<i_t, f_t>::optimization_problem_solution_t(
     objective_name_(objective_name),
     var_names_(std::move(var_names)),
     row_names_(std::move(row_names)),
-    termination_stats_(termination_stats),
-    termination_status_(termination_status),
+    termination_stats_(std::move(termination_stats)),
+    termination_status_(std::move(termination_status)),
     error_status_(cuopt::logic_error("", cuopt::error_type_t::Success))
 {
   cuopt_assert(termination_stats_.size() == termination_status_.size(),
@@ -111,13 +111,13 @@ optimization_problem_solution_t<i_t, f_t>::optimization_problem_solution_t(
   const std::string objective_name,
   const std::vector<std::string>& var_names,
   const std::vector<std::string>& row_names,
-  additional_termination_information_t& termination_stats,
-  pdlp_termination_status_t termination_status)
+  std::vector<additional_termination_information_t>&& termination_stats,
+  std::vector<pdlp_termination_status_t>&& termination_status)
   : primal_solution_(std::make_unique<rmm::device_uvector<f_t>>(std::move(final_primal_solution))),
     dual_solution_(std::make_unique<rmm::device_uvector<f_t>>(std::move(final_dual_solution))),
     reduced_cost_(std::make_unique<rmm::device_uvector<f_t>>(std::move(final_reduced_cost))),
     is_device_memory_(true),
-    termination_status_(termination_status),
+    termination_status_(std::move(termination_status)),
     termination_stats_(std::move(termination_stats)),
     objective_name_(objective_name),
     var_names_(std::move(var_names)),
@@ -147,8 +147,8 @@ optimization_problem_solution_t<i_t, f_t>::optimization_problem_solution_t(
     reduced_cost_(
       std::make_unique<rmm::device_uvector<f_t>>(final_reduced_cost, handler_ptr->get_stream())),
     is_device_memory_(true),
-    termination_status_(termination_status),
-    termination_stats_(termination_stats),
+    termination_status_{{termination_status}},
+    termination_stats_{{termination_stats}},
     objective_name_(objective_name),
     var_names_(var_names),
     row_names_(row_names),
@@ -171,8 +171,8 @@ optimization_problem_solution_t<i_t, f_t>::optimization_problem_solution_t(
     dual_solution_host_(std::make_unique<std::vector<f_t>>(std::move(dual_solution))),
     reduced_cost_host_(std::make_unique<std::vector<f_t>>(std::move(reduced_cost))),
     is_device_memory_(false),
-    termination_status_(termination_status),
-    termination_stats_(std::move(termination_stats)),
+    termination_status_{{termination_status}},
+    termination_stats_{{termination_stats}},
     objective_name_(objective_name),
     var_names_(var_names),
     row_names_(row_names),
@@ -625,7 +625,7 @@ template <typename i_t, typename f_t>
 void optimization_problem_solution_t<i_t, f_t>::set_termination_stats(
   const additional_termination_information_t& stats)
 {
-  termination_stats_ = stats;
+  termination_stats_[0] = stats;
 }
 
 //============================================================================
@@ -635,43 +635,43 @@ void optimization_problem_solution_t<i_t, f_t>::set_termination_stats(
 template <typename i_t, typename f_t>
 f_t optimization_problem_solution_t<i_t, f_t>::get_l2_primal_residual() const
 {
-  return termination_stats_.l2_primal_residual;
+  return termination_stats_[0].l2_primal_residual;
 }
 
 template <typename i_t, typename f_t>
 f_t optimization_problem_solution_t<i_t, f_t>::get_l2_dual_residual() const
 {
-  return termination_stats_.l2_dual_residual;
+  return termination_stats_[0].l2_dual_residual;
 }
 
 template <typename i_t, typename f_t>
 f_t optimization_problem_solution_t<i_t, f_t>::get_primal_objective() const
 {
-  return termination_stats_.primal_objective;
+  return termination_stats_[0].primal_objective;
 }
 
 template <typename i_t, typename f_t>
 f_t optimization_problem_solution_t<i_t, f_t>::get_dual_objective() const
 {
-  return termination_stats_.dual_objective;
+  return termination_stats_[0].dual_objective;
 }
 
 template <typename i_t, typename f_t>
 f_t optimization_problem_solution_t<i_t, f_t>::get_gap() const
 {
-  return termination_stats_.gap;
+  return termination_stats_[0].gap;
 }
 
 template <typename i_t, typename f_t>
 i_t optimization_problem_solution_t<i_t, f_t>::get_nb_iterations() const
 {
-  return termination_stats_.number_of_steps_taken;
+  return termination_stats_[0].number_of_steps_taken;
 }
 
 template <typename i_t, typename f_t>
 bool optimization_problem_solution_t<i_t, f_t>::get_solved_by_pdlp() const
 {
-  return termination_stats_.solved_by_pdlp;
+  return termination_stats_[0].solved_by_pdlp;
 }
 
 //============================================================================
@@ -681,43 +681,43 @@ bool optimization_problem_solution_t<i_t, f_t>::get_solved_by_pdlp() const
 template <typename i_t, typename f_t>
 void optimization_problem_solution_t<i_t, f_t>::set_l2_primal_residual(f_t value)
 {
-  termination_stats_.l2_primal_residual = value;
+  termination_stats_[0].l2_primal_residual = value;
 }
 
 template <typename i_t, typename f_t>
 void optimization_problem_solution_t<i_t, f_t>::set_l2_dual_residual(f_t value)
 {
-  termination_stats_.l2_dual_residual = value;
+  termination_stats_[0].l2_dual_residual = value;
 }
 
 template <typename i_t, typename f_t>
 void optimization_problem_solution_t<i_t, f_t>::set_primal_objective(f_t value)
 {
-  termination_stats_.primal_objective = value;
+  termination_stats_[0].primal_objective = value;
 }
 
 template <typename i_t, typename f_t>
 void optimization_problem_solution_t<i_t, f_t>::set_dual_objective(f_t value)
 {
-  termination_stats_.dual_objective = value;
+  termination_stats_[0].dual_objective = value;
 }
 
 template <typename i_t, typename f_t>
 void optimization_problem_solution_t<i_t, f_t>::set_gap(f_t value)
 {
-  termination_stats_.gap = value;
+  termination_stats_[0].gap = value;
 }
 
 template <typename i_t, typename f_t>
 void optimization_problem_solution_t<i_t, f_t>::set_nb_iterations(i_t value)
 {
-  termination_stats_.number_of_steps_taken = value;
+  termination_stats_[0].number_of_steps_taken = value;
 }
 
 template <typename i_t, typename f_t>
 void optimization_problem_solution_t<i_t, f_t>::set_solved_by_pdlp(bool value)
 {
-  termination_stats_.solved_by_pdlp = value;
+  termination_stats_[0].solved_by_pdlp = value;
 }
 
 template <typename i_t, typename f_t>

cpp/tests/linear_programming/unit_tests/lp_solution_memory_test.cu

@@ -87,7 +87,9 @@ TEST(pdlp_solution_memory, device_only_accessors_need_coderabbit_patch)
                                                         var_names,
                                                         row_names,
                                                         stats,
-                                                        pdlp_termination_status_t::Optimal);
+                                                        pdlp_termination_status_t::Optimal,
+                                                        &handle,
+                                                        true);
 
   EXPECT_TRUE(solution.is_device_memory());
   EXPECT_NO_THROW(solution.get_primal_solution());

python/cuopt/pyproject.toml

@@ -9,7 +9,7 @@ requires = [
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 
 [project]
-name = "cuopt-cu13"
+name = "cuopt"
 dynamic = ["version"]
 description = "cuOpt - GPU Combinatorial Optimization"
 readme = { file = "README.md", content-type = "text/markdown" }
@@ -20,18 +20,18 @@ license = "Apache-2.0"
 requires-python = ">=3.10"
 dependencies = [
     "cuda-python>=13.0.1,<14.0",
-    "cudf-cu13==26.2.*,>=0.0.0a0",
+    "cudf==26.2.*,>=0.0.0a0",
     "cuopt-mps-parser==26.2.*,>=0.0.0a0",
     "cupy-cuda13x>=13.6.0",
-    "libcuopt-cu13==26.2.*,>=0.0.0a0",
+    "libcuopt==26.2.*,>=0.0.0a0",
     "numba-cuda>=0.22.1,<0.23.0",
     "numba>=0.60.0",
     "numpy>=1.23.5,<3.0",
     "pandas>=2.0",
-    "pylibraft-cu13==26.2.*,>=0.0.0a0",
+    "pylibraft==26.2.*,>=0.0.0a0",
     "pyyaml>=6.0.0",
     "rapids-logger==0.2.*,>=0.0.0a0",
-    "rmm-cu13==26.2.*,>=0.0.0a0",
+    "rmm==26.2.*,>=0.0.0a0",
     "scipy>=1.14.1",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 classifiers = [
@@ -97,17 +97,16 @@ regex = "(?P<value>.*)"
 
 [tool.rapids-build-backend]
 build-backend = "scikit_build_core.build"
-commit-files = ["cuopt/GIT_COMMIT"]
 dependencies-file = "../../dependencies.yaml"
 matrix-entry = "cuda_suffixed=true;use_cuda_wheels=true"
 requires = [
     "cmake>=3.30.4",
     "cuopt-mps-parser==26.2.*,>=0.0.0a0",
     "cupy-cuda13x>=13.6.0",
     "cython>=3.0.3",
-    "libcuopt-cu13==26.2.*,>=0.0.0a0",
+    "libcuopt==26.2.*,>=0.0.0a0",
     "ninja",
-    "pylibraft-cu13==26.2.*,>=0.0.0a0",
+    "pylibraft==26.2.*,>=0.0.0a0",
     "rapids-logger==0.2.*,>=0.0.0a0",
-    "rmm-cu13==26.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`.