Merge branch 'add_nightly_container_support' of github.com:rgsl888prabhu/cuopt_public into add_nightly_container_support

Author: rgsl888prabhu

.github/workflows/build.yaml

@@ -167,20 +167,21 @@ jobs:
       date: ${{ inputs.date }}
       package-name: cuopt_server
       package-type: python
-  #docs-build:
-  #  if: inputs.build_type == 'nightly' || github.ref_type == 'branch'
-  #  needs: [python-build]
-  #  secrets: inherit
-  #  uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.08
-  #  with:
-  #    build_type: ${{ inputs.build_type || 'branch' }}
-  #    node_type: "gpu-l4-latest-1"
-  #    sha: ${{ inputs.sha }}
-  #    branch: ${{ inputs.branch }}
-  #    date: ${{ inputs.date }}
-  #    arch: amd64
-  #    container_image: rapidsai/ci-conda:cuda11.8.0-ubuntu22.04-py3.10
-  #    run_script: ci/build_docs.sh
+  docs-build:
+    needs: [python-build]
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.08
+    with:
+      build_type: ${{ inputs.build_type || 'branch' }}
+      node_type: "gpu-l4-latest-1"
+      sha: ${{ inputs.sha }}
+      branch: ${{ inputs.branch }}
+      date: ${{ inputs.date }}
+      arch: "amd64"
+      file_to_upload: "docs/cuopt/build/html/"
+      artifact-name: "cuopt_docs"
+      container_image: "rapidsai/ci-conda:25.08-latest"
+      script: "ci/build_docs.sh"
   wheel-build-cuopt-sh-client:
     needs: wheel-build-cuopt
     secrets: inherit

benchmarks/linear_programming/cuopt/run_mip.cpp

@@ -205,6 +205,8 @@ int run_single_file(std::string file_path,
   settings.heuristics_only = heuristics_only;
   settings.num_cpu_threads = num_cpu_threads;
   settings.log_to_console  = log_to_console;
+  // settings.tolerances.relative_tolerance = 1e-10;
+  // settings.tolerances.absolute_tolerance = 1e-6;
   cuopt::linear_programming::benchmark_info_t benchmark_info;
   settings.benchmark_info_ptr = &benchmark_info;
   auto start_run_solver       = std::chrono::high_resolution_clock::now();

ci/build_docs.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+
 # SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -19,23 +20,28 @@ set -euo pipefail
 rapids-logger "Create test conda environment"
 . /opt/conda/etc/profile.d/conda.sh
 
+ENV_YAML_DIR="$(mktemp -d)"
+
+rapids-logger "Downloading artifacts from previous jobs"
+CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
+PYTHON_CHANNEL=$(rapids-download-conda-from-github python)
+
+rapids-logger "Generating conda environment YAML"
+
 rapids-dependency-file-generator \
   --output conda \
   --file-key docs \
-  --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
+  --prepend-channel "${CPP_CHANNEL}" \
+  --prepend-channel "${PYTHON_CHANNEL}" \
+  --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${ENV_YAML_DIR}/env.yaml"
 
-rapids-mamba-retry env create --yes -f env.yaml -n docs
+rapids-mamba-retry env create --yes -f "${ENV_YAML_DIR}/env.yaml" -n docs
 conda activate docs
 
 rapids-print-env
 
-export RAPIDS_VERSION_NUMBER="24.11"
-RAPIDS_DOCS_DIR="$(mktemp -d)"
-export RAPIDS_DOCS_DIR
+rapids-logger "Build Docs"
+./build.sh docs
+
 
-rapids-logger "Build Python docs"
-#mkdir -p "${RAPIDS_DOCS_DIR}/cuopt/"{html,txt}
-pushd docs/cuopt
 
-bash build_docs.sh
-# rapids-upload-docs

ci/release/update-version-rapids.sh

@@ -53,6 +53,8 @@ done
 # WORKFLOWS
 for FILE in .github/workflows/*.yaml; do
   sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}"
+  # CI image tags of the form {rapids_version}-{something}
+  sed_runner "s/:[0-9]*\\.[0-9]*-/:${NEXT_SHORT_TAG}-/g" "${FILE}"
 done
 
 # CI

conda/recipes/cuopt-server/recipe.yaml

@@ -35,7 +35,7 @@ requirements:
     - fastapi >=0.104.1
     - jsonref =1.1.0
     - httpx
-    - msgpack-python =1.0.8
+    - msgpack-python =1.1.0
     - msgpack-numpy =0.4.8
     - numpy >=1.23,<3.0a0
     - pandas>=2

conda/recipes/cuopt-sh-client/recipe.yaml

@@ -28,7 +28,7 @@ requirements:
     - python =${{ py_version }}
     - setuptools>=61.0.0
   run:
-    - msgpack-python =1.0.8
+    - msgpack-python =1.1.0
     - python
     - requests
 

cpp/include/cuopt/linear_programming/solve.hpp

@@ -51,7 +51,8 @@ optimization_problem_solution_t<i_t, f_t> solve_lp(
   optimization_problem_t<i_t, f_t>& op_problem,
   pdlp_solver_settings_t<i_t, f_t> const& settings = pdlp_solver_settings_t<i_t, f_t>{},
   bool problem_checking                            = true,
-  bool use_pdlp_solver_mode                        = true);
+  bool use_pdlp_solver_mode                        = true,
+  bool is_batch_mode                               = false);
 
 /**
  * @brief Linear programming solve function.

cpp/include/cuopt/linear_programming/utilities/cython_solve.hpp

@@ -104,7 +104,8 @@ struct solver_ret_t {
 
 std::unique_ptr<solver_ret_t> call_solve(cuopt::mps_parser::data_model_view_t<int, double>*,
                                          linear_programming::solver_settings_t<int, double>*,
-                                         unsigned int flags = cudaStreamNonBlocking);
+                                         unsigned int flags = cudaStreamNonBlocking,
+                                         bool is_batch_mode = false);
 
 std::pair<std::vector<std::unique_ptr<solver_ret_t>>, double> call_batch_solve(
   std::vector<cuopt::mps_parser::data_model_view_t<int, double>*>,

cpp/src/dual_simplex/branch_and_bound.cpp

@@ -452,6 +452,12 @@ mip_status_t branch_and_bound_t<i_t, f_t>::solve(mip_solution_t<i_t, f_t>& solut
   const i_t num_fractional =
     fractional_variables(settings, root_relax_soln.x, var_types, fractional);
   const f_t root_objective = compute_objective(original_lp, root_relax_soln.x);
+  if (settings.solution_callback != nullptr) {
+    std::vector<f_t> original_x;
+    uncrush_primal_solution(original_problem, original_lp, root_relax_soln.x, original_x);
+    settings.set_simplex_solution_callback(original_x,
+                                           compute_user_objective(original_lp, root_objective));
+  }
   global_variables::mutex_lower.lock();
   f_t lower_bound = global_variables::lower_bound = root_objective;
   global_variables::mutex_lower.unlock();

cpp/src/dual_simplex/simplex_solver_settings.hpp

@@ -105,6 +105,7 @@ struct simplex_solver_settings_t {
   i_t inside_mip;  // 0 if outside MIP, 1 if inside MIP at root node, 2 if inside MIP at leaf node
   std::function<void(std::vector<f_t>&, f_t)> solution_callback;
   std::function<void()> heuristic_preemption_callback;
+  std::function<void(std::vector<f_t>&, f_t)> set_simplex_solution_callback;
   mutable logger_t log;
   std::atomic<i_t>* concurrent_halt;  // if nullptr ignored, if !nullptr, 0 if solver should
                                       // continue, 1 if solver should halt