Merge latest into fix-1423

BenChampion · BenChampion · commit ebb406a11bd4 · 2025-04-22T14:35:57.000+01:00
diff --git a/.github/workflows/build-intel.yml b/.github/workflows/build-intel.yml
@@ -0,0 +1,55 @@
+name: build-intel
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Add oneAPI to apt
+        shell: bash
+        run: |
+          cd /tmp
+          wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
+          sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
+          rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
+          sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
+      
+      - name: Install oneAPI basekit
+        shell: bash
+        run: |
+          sudo apt update
+          sudo apt install intel-basekit
+         
+      - name: Check compiler
+        run: |
+          source /opt/intel/oneapi/setvars.sh
+          icpx --version
+          icx --version
+
+      - name: Configure
+        shell: bash
+        run: |
+          source /opt/intel/oneapi/setvars.sh
+          cmake -S . -B build \
+          -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+          -DCMAKE_INSTALL_PREFIX=install \
+          -DCMAKE_CXX_COMPILER=icpx \
+          -DCMAKE_C_COMPILER=icx \
+          -DALL_TESTS=ON \
+          -DIntelDPCPP_DIR="/opt/intel/oneapi/compiler/latest/linux/cmake/SYCL" \
+
+      - name: Build
+        shell: bash
+        run: |
+          source /opt/intel/oneapi/setvars.sh
+          cmake --build build --parallel
+
+      - name: Test
+        shell: bash
+        run: |
+          source /opt/intel/oneapi/setvars.sh
+          export SYCL_DEVICE_FILTER=opencl.cpu
+          ctest --test-dir build --output-on-failure --timeout 300 
diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml
@@ -0,0 +1,104 @@
+name: valgrind
+
+on: [push, pull_request]
+
+jobs:
+  unit_tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+      
+      - name: Install Valgrind
+        run: sudo apt-get update && sudo apt-get install valgrind
+
+      - name: Create Build Environment
+        run: cmake -E make_directory ${{runner.workspace}}/build
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{runner.workspace}}/build
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DALL_TESTS=ON
+
+      - name: Build
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: |
+          cmake --build . --parallel 
+
+      - name: Test
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: |
+          valgrind \
+          --leak-check=full \
+          --show-leak-kinds=all \
+          --track-origins=yes \
+          -s \
+          ./bin/unit_tests \
+          2>&1 | tee logfile
+
+      - name: Check log for Errors
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: |
+          cat logfile
+          OUTPUT='ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)'
+          if grep -q "$OUTPUT" logfile; then
+            exit 0
+          fi
+          exit 1
+
+  instance_tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Valgrind
+        run: sudo apt-get update && sudo apt-get install valgrind
+      
+      - name: Create Build Environment
+        run: cmake -E make_directory ${{runner.workspace}}/build
+
+      - name: Configure CMake All
+        shell: bash
+        working-directory: ${{runner.workspace}}/build
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DALL_TESTS=ON
+
+      - name: Build All
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: |
+          cmake --build . --parallel 
+
+      - name: Test
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: |
+          valgrind \
+          --leak-check=full \
+          --show-leak-kinds=all \
+          --track-origins=yes \
+          -s \
+          ctest -E unit.* \
+          --timeout 1000 \
+          --output-on-failure \
+          2>&1 | tee logfile2
+
+      - name: Check log for Errors
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: |
+          cat logfile2
+          OUTPUT='ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)'
+          if grep -q "$OUTPUT" logfile2; then
+            exit 0
+          fi
+          exit 1
diff --git a/FEATURES.md b/FEATURES.md
@@ -16,3 +16,5 @@ As part of [#2286](https://github.com/ERGO-Code/HiGHS/pull/2286)), the root of t
 
 ZI rounding and shifting MIP primal heuristics have been added (see [#2287](https://github.com/ERGO-Code/HiGHS/pull/2287)). They are off by default, but can be activated by setting the options `mip_heuristic_run_zi_round` and `mip_heuristic_run_shifting` to be true. Options `mip_heuristic_run_rins`, `mip_heuristic_run_rens` and `mip_heuristic_run_root_reduced_cost` to run the RINS, RENS and rootReducedCost heuristics have been added. These are true by default, but setting them to be false can accelerate the MIP solver on easy problems.
 
+Added `Highs_changeRowsBoundsByRange` to C API, fixing [#2296](https://github.com/ERGO-Code/HiGHS/issues/2296))
+
diff --git a/check/TestCallbacks.cpp b/check/TestCallbacks.cpp
@@ -295,7 +295,7 @@ TEST_CASE("highs-callback-logging", "[highs_callback]") {
   highs.startCallback(kCallbackLogging);
   highs.readModel(filename);
   highs.run();
-  
+
   highs.resetGlobalScheduler(true);
 }
 
@@ -312,7 +312,7 @@ TEST_CASE("highs-callback-solution-basis-logging", "[highs_callback]") {
   highs.startCallback(kCallbackLogging);
   if (dev_run) highs.writeSolution("", kSolutionStylePretty);
   if (dev_run) highs.writeBasis("");
-  
+
   highs.resetGlobalScheduler(true);
 }
 
@@ -329,7 +329,7 @@ TEST_CASE("highs-callback-simplex-interrupt", "[highs_callback]") {
   REQUIRE(highs.getModelStatus() == HighsModelStatus::kInterrupt);
   REQUIRE(highs.getInfo().simplex_iteration_count >
           adlittle_simplex_iteration_limit);
-  
+
   highs.resetGlobalScheduler(true);
 }
 
@@ -346,7 +346,7 @@ TEST_CASE("highs-callback-ipm-interrupt", "[highs_callback]") {
   REQUIRE(status == HighsStatus::kWarning);
   REQUIRE(highs.getModelStatus() == HighsModelStatus::kInterrupt);
   REQUIRE(highs.getInfo().ipm_iteration_count > adlittle_ipm_iteration_limit);
-  
+
   highs.resetGlobalScheduler(true);
 }
 
@@ -362,7 +362,7 @@ TEST_CASE("highs-callback-mip-interrupt", "[highs_callback]") {
   REQUIRE(status == HighsStatus::kWarning);
   REQUIRE(highs.getModelStatus() == HighsModelStatus::kInterrupt);
   REQUIRE(highs.getInfo().objective_function_value > egout_optimal_objective);
-  
+
   highs.resetGlobalScheduler(true);
 }
 
@@ -377,7 +377,7 @@ TEST_CASE("highs-callback-mip-improving", "[highs_callback]") {
   highs.startCallback(kCallbackMipImprovingSolution);
   highs.readModel(filename);
   highs.run();
-  
+
   highs.resetGlobalScheduler(true);
 }
 
@@ -391,7 +391,7 @@ TEST_CASE("highs-callback-mip-data", "[highs_callback]") {
   highs.startCallback(kCallbackMipLogging);
   highs.readModel(filename);
   highs.run();
-  
+
   highs.resetGlobalScheduler(true);
 }
 
@@ -413,7 +413,7 @@ TEST_CASE("highs-callback-mip-solution", "[highs_callback]") {
   highs.setCallback(userMipSolutionCallback, p_user_callback_data);
   highs.startCallback(kCallbackMipSolution);
   highs.run();
-  
+
   highs.resetGlobalScheduler(true);
 }
 
@@ -425,7 +425,7 @@ TEST_CASE("highs-callback-mip-cut-pool", "[highs_callback]") {
   highs.setCallback(userMipCutPoolCallback);
   highs.startCallback(kCallbackMipGetCutPool);
   highs.run();
-  
+
   highs.resetGlobalScheduler(true);
 }
 
@@ -469,6 +469,6 @@ TEST_CASE("highs-callback-mip-user-solution", "[highs_callback]") {
         std::max(1.0, std::fabs(objective_function_value0));
     REQUIRE(objective_diff < 1e-12);
   }
-  
+
   highs.resetGlobalScheduler(true);
 }
diff --git a/check/TestIpm.cpp b/check/TestIpm.cpp
@@ -162,5 +162,4 @@ TEST_CASE("test-2087", "[highs_ipm]") {
   REQUIRE(first_ipm_iteration_count == h.getInfo().ipm_iteration_count);
 
   h.resetGlobalScheduler(true);
-
 }
diff --git a/check/TestIpx.cpp b/check/TestIpx.cpp
@@ -8,6 +8,8 @@
 #include "lp_data/HighsStatus.h"
 #include "parallel/HighsParallel.h"
 
+#include "Highs.h"
+
 // Example for using IPX from its C++ interface. The program solves the Netlib
 // problem afiro.
 
@@ -45,6 +47,7 @@ TEST_CASE("test-ipx", "[highs_ipx]") {
   ipx::Parameters parameters;
   if (!dev_run) parameters.display = 0;
   parameters.highs_logging = false;
+  parameters.timeless_log = false;
   lps.SetParameters(parameters);
 
   // Solve the LP.
@@ -87,4 +90,8 @@ TEST_CASE("test-ipx", "[highs_ipx]") {
   REQUIRE(fabs(ipx_col_value[11] - 339.9) < 1);
 
   (void)(info);  // surpress unused variable.
+
+  // hack to reset global scheduler
+  Highs h;
+  h.resetGlobalScheduler(true);
 }
diff --git a/check/TestPresolve.cpp b/check/TestPresolve.cpp
@@ -258,9 +258,10 @@ HighsStatus zeroCostColSing() {
   assert(status == HighsStatus::kOk);
 
   status = highs.run();
-  return status;
 
   highs.resetGlobalScheduler(true);
+
+  return status;
 }
 
 // handled by doubleton equality
@@ -317,9 +318,9 @@ HighsStatus colSingDoubletonEquality() {
   assert(status == HighsStatus::kOk);
 
   status = highs.run();
-  return status;
 
   highs.resetGlobalScheduler(true);
+  return status;
 }
 
 HighsStatus colSingDoubletonInequality() {
@@ -375,9 +376,9 @@ HighsStatus colSingDoubletonInequality() {
   assert(status == HighsStatus::kOk);
 
   status = highs.run();
-  return status;
 
   highs.resetGlobalScheduler(true);
+  return status;
 }
 
 // handled by doubleton equality
@@ -414,9 +415,9 @@ HighsStatus twoColSingDoubletonEquality() {
   assert(status == HighsStatus::kOk);
 
   status = highs.run();
-  return status;
 
   highs.resetGlobalScheduler(true);
+  return status;
 }
 
 // handled by special case.
@@ -454,9 +455,9 @@ HighsStatus twoColSingDoubletonInequality() {
 
   highs.run();
   status = highs.run();
-  return status;
 
   highs.resetGlobalScheduler(true);
+  return status;
 }
 
 // No commas in test case name.
@@ -543,9 +544,9 @@ HighsStatus issue425() {
   assert(status == HighsStatus::kOk);
 
   status = highs.run();
-  return status;
 
   highs.resetGlobalScheduler(true);
+  return status;
 }
 
 TEST_CASE("presolve-issue-425", "[highs_test_presolve]") {
diff --git a/highs/interfaces/highs_c_api.cpp b/highs/interfaces/highs_c_api.cpp
@@ -928,6 +928,14 @@ HighsInt Highs_changeRowBounds(void* highs, const HighsInt row,
   return (HighsInt)((Highs*)highs)->changeRowBounds(row, lower, upper);
 }
 
+HighsInt Highs_changeRowsBoundsByRange(void* highs, const HighsInt from_row,
+                                       const HighsInt to_row,
+                                       const double* lower,
+                                       const double* upper) {
+  return (HighsInt)((Highs*)highs)
+      ->changeRowsBounds(from_row, to_row, lower, upper);
+}
+
 HighsInt Highs_changeRowsBoundsBySet(void* highs,
                                      const HighsInt num_set_entries,
                                      const HighsInt* set, const double* lower,
diff --git a/highs/interfaces/highs_c_api.h b/highs/interfaces/highs_c_api.h
@@ -1671,6 +1671,24 @@ HighsInt Highs_changeColsBoundsByMask(void* highs, const HighsInt* mask,
 HighsInt Highs_changeRowBounds(void* highs, const HighsInt row,
                                const double lower, const double upper);
 
+/**
+ * Change the variable bounds of multiple adjacent rows.
+ *
+ * @param highs     A pointer to the Highs instance.
+ * @param from_row  The index of the first row whose bound changes.
+ * @param to_row    The index of the last row whose bound changes.
+ * @param lower     An array of length [to_row - from_row + 1] with the new
+ *                  lower bounds.
+ * @param upper     An array of length [to_row - from_row + 1] with the new
+ *                  upper bounds.
+ *
+ * @returns A `kHighsStatus` constant indicating whether the call succeeded.
+ */
+HighsInt Highs_changeRowsBoundsByRange(void* highs, const HighsInt from_row,
+                                       const HighsInt to_row,
+                                       const double* lower,
+                                       const double* upper);
+
 /**
  * Change the bounds of multiple rows given by an array of indices.
  *
diff --git a/highs/interfaces/highs_csharp_api.cs b/highs/interfaces/highs_csharp_api.cs
diff --git a/highs/interfaces/highs_fortran_api.f90 b/highs/interfaces/highs_fortran_api.f90

Original file line number	Diff line number	Diff line change
`@@ -16,3 +16,5 @@ As part of [#2286](https://github.com/ERGO-Code/HiGHS/pull/2286)), the root of t`
`16`	`16`
`17`	`17`	ZI rounding and shifting MIP primal heuristics have been added (see [#2287](https://github.com/ERGO-Code/HiGHS/pull/2287)). They are off by default, but can be activated by setting the options `mip_heuristic_run_zi_round` and `mip_heuristic_run_shifting` to be true. Options `mip_heuristic_run_rins`, `mip_heuristic_run_rens` and `mip_heuristic_run_root_reduced_cost` to run the RINS, RENS and rootReducedCost heuristics have been added. These are true by default, but setting them to be false can accelerate the MIP solver on easy problems.
`18`	`18`
	`19`	+Added `Highs_changeRowsBoundsByRange` to C API, fixing [#2296](https://github.com/ERGO-Code/HiGHS/issues/2296))
	`20`	`+`
Original file line number	Diff line number	Diff line change
`@@ -162,5 +162,4 @@ TEST_CASE("test-2087", "[highs_ipm]") {`
`162`	`162`	`REQUIRE(first_ipm_iteration_count == h.getInfo().ipm_iteration_count);`
`163`	`163`
`164`	`164`	`h.resetGlobalScheduler(true);`
`165`		`-`
`166`	`165`	`}`