ENH: Meson highs 1.7.0

.github/workflows/build-python-package.yml

@@ -14,18 +14,19 @@ jobs:
 
       - name: Build sdist
         run: |
-          python3 -m pip install build 
+          python3 -m pip install build --user
           python3 -m build --sdist
 
       - name: Install sdist
         run: |
           ls dist
+          python3 -m pip install meson-python meson pybind11 ninja --user
           python3 -m pip install dist/*.tar.gz
 
       - name: Test highspy
         run: |
-          python3 -m pip install pytest
-          python3 -m pytest $GITHUB_WORKSPACE
+          python3 -m pip install pytest --user
+          python3 -m pytest $GITHUB_WORKSPACE/tests
 
   build_sdist_mac:
     runs-on: macos-latest
@@ -34,18 +35,19 @@ jobs:
 
       - name: Build sdist
         run: |
-          python3 -m pip install build --break-system-packages
+          python3 -m pip install build --user --break-system-packages
           python3 -m build --sdist
 
       - name: Install sdist
         run: |
           ls dist
-          python3 -m pip install dist/*.tar.gz --break-system-packages
+          python3 -m pip install meson-python meson pybind11 ninja --user --break-system-packages
+          python3 -m pip install dist/*.tar.gz --user --break-system-packages
 
       - name: Test highspy
         run: |
-          python3 -m pip install pytest --break-system-packages
-          python3 -m pytest $GITHUB_WORKSPACE
+          python3 -m pip install pytest --user --break-system-packages
+          python3 -m pytest $GITHUB_WORKSPACE/tests
 
   build_sdist_win:
     runs-on: windows-2019
@@ -59,19 +61,20 @@ jobs:
 
       - name: Build sdist
         run: |
-          python -m pip install build
+          python -m pip install build --user
           python -m build --sdist
 
       - name: Install sdist
         run: |
+          python3 -m pip install meson-python meson pybind11 ninja --user
           $item = Get-ChildItem dist
-          python -m pip install "$item"
+          python -m pip install "$item" --user
           python -c "import highspy; print(dir(highspy))"
 
       - name: Test highspy
         run: |
-          python -m pip install pytest
-          python -m pytest 
+          python -m pip install pytest --user
+          python -m pytest tests
 
   build_wheel_linux:
     # ubuntu 22 has a latest version of cmake, but setup-python 
@@ -103,7 +106,7 @@ jobs:
       - name: Test highspy
         run: |
           python3 -m pip install pytest
-          python3 -m pytest $GITHUB_WORKSPACE
+          python3 -m pytest $GITHUB_WORKSPACE/tests
 
 
   # macos 12 is Intel
@@ -122,20 +125,20 @@ jobs:
 
       - name: Build wheel
         run: |
-          python3 -m pip install cibuildwheel
+          python3 -m pip install cibuildwheel --break-system-packages
           python3 -m cibuildwheel --only cp311-macosx_x86_64 $GITHUB_WORKSPACE
 
       - name: Install wheel
         run: |
           ls wheelhouse
           python3 --version
-          python3 -m pip install wheelhouse/*.whl
+          python3 -m pip install wheelhouse/*.whl --break-system-packages
           python3 -c "import highspy; print(dir(highspy))"
 
       - name: Test highspy
         run: |
-          python3 -m pip install pytest 
-          python3 -m pytest $GITHUB_WORKSPACE
+          python3 -m pip install pytest --break-system-packages
+          python3 -m pytest $GITHUB_WORKSPACE/tests
 
   # macos 13 is Intel
   build_wheel_macos_13:
@@ -153,20 +156,20 @@ jobs:
 
       - name: Build wheel
         run: |
-          python3 -m pip install cibuildwheel
+          python3 -m pip install cibuildwheel --break-system-packages
           python3 -m cibuildwheel --only cp311-macosx_x86_64 $GITHUB_WORKSPACE
 
       - name: Install wheel
         run: |
           ls wheelhouse
           python3 --version
-          python3 -m pip install wheelhouse/*.whl
+          python3 -m pip install wheelhouse/*.whl --break-system-packages
           python3 -c "import highspy; print(dir(highspy))"
 
       - name: Test highspy
         run: |
-          python3 -m pip install pytest
-          python3 -m pytest $GITHUB_WORKSPACE
+          python3 -m pip install pytest --break-system-packages
+          python3 -m pytest $GITHUB_WORKSPACE/tests
 
   # macos 14 is M1 (beta)
   build_wheel_macos_14:
@@ -184,20 +187,20 @@ jobs:
 
       - name: Build wheel
         run: |
-          python3 -m pip install cibuildwheel
+          python3 -m pip install cibuildwheel --break-system-packages
           python3 -m cibuildwheel --only cp311-macosx_arm64 $GITHUB_WORKSPACE
 
       - name: Install wheel
         run: |
           ls wheelhouse
           python3 --version
-          python3 -m pip install wheelhouse/*.whl
+          python3 -m pip install wheelhouse/*.whl --break-system-packages
           python3 -c "import highspy; print(dir(highspy))"
 
       - name: Test highspy
         run: |
-          python3 -m pip install pytest
-          python3 -m pytest $GITHUB_WORKSPACE
+          python3 -m pip install pytest --break-system-packages
+          python3 -m pytest $GITHUB_WORKSPACE/tests
 
   build_wheel_windows:
     runs-on: windows-2019
@@ -224,5 +227,4 @@ jobs:
       - name: Test highspy
         run: |
           python -m pip install pytest
-          python -m pytest 
-
+          python -m pytest tests

.github/workflows/test-python-win.yml

@@ -18,12 +18,34 @@ jobs:
           python-version: ${{ matrix.python }}
 
       - name: Install build dependencies
-        run: python -m pip install numpy setuptools wheel pytest 
-
-      - name: Test python install
+        run: python -m pip install numpy setuptools wheel pytest meson ninja delvewheel build
+      
+      - name: Build project
         run: |
-          python -m pip install .
-          pytest 
+          meson setup bbdir --prefix=${{ github.workspace }}/local_install
+          meson compile -C bbdir
+
+      - name: Install project to custom directory
+        run: meson install -C bbdir
+
+      - name: Build Python package
+        run: python -m build
+
+      - name: Repair the wheel
+        shell: pwsh
+        run: |
+          $installedPath = "${{ github.workspace }}/local_install"
+          $wheels = Get-ChildItem -Path dist -Filter *.whl
+          foreach ($wheel in $wheels) {
+            delvewheel repair $wheel.FullName --add-path "$installedPath/bin;$installedPath/lib" -w repaired_wheels
+          }
+
+      - name: Install the repaired wheel
+        run: |
+          $wheels = Get-ChildItem -Path repaired_wheels -Filter *.whl
+          foreach ($wheel in $wheels){
+            pip install $wheel.FullName
+          }
 
       - name: Test Python Examples
         run: |

FEATURES.md

@@ -1,22 +1,13 @@
 ## Build changes
 
-The python wrapper highspy is now available for aarch64 on manylinux
-This allows highs to be run through Python on AWS arm64 
-
-Bug fix for fortran on macOS
-
 ## Code changes
 
-The accessor function Highs_getCallbackDataOutItem in the C API means
-that `pdlp_iteration_count` can be moved back to where it was inserted
-into the `HighsCallbackDataOut` struct in v1.7.0, which broke the C
-API. This fixes #1812
+Added `int64_t mip_total_lp_iterations` to `HighsCallbackDataOut` and modified accessor function
+
+`Highs::writeSolution` and `Highs::writeBasis` now being done via `HighsIO` logging, so can be redirected to logging callback.
 
-Some duplicate code has been eliminated from the MIP solver, and
-modifications made to eliminate compiler warnings
+Introduced `const double kHighsUndefined` as value of undefined values in a user solution. It's equal to `kHighsInf`
 
-Declaration of the (deprecated) method `char* highsCompilationDate()`
-has been corrected
+Added `Highs::setSolution(const HighsInt num_entries, const HighsInt* index, const double* value);` to allow a sparse primal solution to be defined.
 
-Fixed bug when describing integrality status during the human-readable solution write
 

check/TestCallbacks.cpp

@@ -121,9 +121,10 @@ HighsCallbackFunctionType userInterruptCallback =
           REQUIRE(local_callback_data == kUserCallbackNoData);
         }
         if (callback_type == kCallbackLogging) {
-          if (dev_run)
-            printf("userInterruptCallback(type %2d; data %2d): %s",
-                   callback_type, local_callback_data, message.c_str());
+          if (dev_run) printf("Callback: %s", message.c_str());
+          //            printf("userInterruptCallback(type %2d; data %2d): %s",
+          //                   callback_type, local_callback_data,
+          //                   message.c_str());
         } else if (callback_type == kCallbackSimplexInterrupt) {
           if (dev_run)
             printf(
@@ -190,12 +191,13 @@ std::function<void(int, const std::string&, const HighsCallbackDataOut*,
       if (dev_run)
         printf(
             "userDataCallback: Node count = %" PRId64
+            "; LP total iterations = %" PRId64
             "; Time = %6.2f; "
             "Bounds (%11.4g, %11.4g); Gap = %11.4g; Objective = %11.4g: %s\n",
-            data_out->mip_node_count, data_out->running_time,
-            data_out->mip_dual_bound, data_out->mip_primal_bound,
-            data_out->mip_gap, data_out->objective_function_value,
-            message.c_str());
+            data_out->mip_node_count, data_out->mip_total_lp_iterations,
+            data_out->running_time, data_out->mip_dual_bound,
+            data_out->mip_primal_bound, data_out->mip_gap,
+            data_out->objective_function_value, message.c_str());
     };
 
 TEST_CASE("my-callback-logging", "[highs-callback]") {
@@ -264,6 +266,21 @@ TEST_CASE("highs-callback-logging", "[highs-callback]") {
   highs.run();
 }
 
+TEST_CASE("highs-callback-solution-basis-logging", "[highs-callback]") {
+  std::string filename = std::string(HIGHS_DIR) + "/check/instances/avgas.mps";
+  int user_callback_data = kUserCallbackData;
+  void* p_user_callback_data =
+      reinterpret_cast<void*>(static_cast<intptr_t>(user_callback_data));
+  Highs highs;
+  highs.setOptionValue("output_flag", dev_run);
+  highs.readModel(filename);
+  highs.run();
+  highs.setCallback(userInterruptCallback, p_user_callback_data);
+  highs.startCallback(kCallbackLogging);
+  if (dev_run) highs.writeSolution("", kSolutionStylePretty);
+  if (dev_run) highs.writeBasis("");
+}
+
 TEST_CASE("highs-callback-simplex-interrupt", "[highs-callback]") {
   std::string filename =
       std::string(HIGHS_DIR) + "/check/instances/adlittle.mps";

check/TestCheckSolution.cpp

@@ -229,6 +229,57 @@ TEST_CASE("check-set-mip-solution", "[highs_check_solution]") {
     highs.clear();
   }
 
+  const bool test6 = other_tests;
+  if (test6) {
+    if (dev_run)
+      printf(
+          "\n***************************\nSolving from sparse integer "
+          "solution\n");
+    HighsInt num_integer_variable = 0;
+    for (HighsInt iCol = 0; iCol < lp.num_col_; iCol++)
+      if (lp.integrality_[iCol] == HighsVarType::kInteger)
+        num_integer_variable++;
+
+    highs.setOptionValue("output_flag", dev_run);
+    highs.readModel(model_file);
+    std::vector<HighsInt> index;
+    std::vector<double> value;
+    // Check that duplicate values are spotted
+    index.push_back(0);
+    value.push_back(0);
+    index.push_back(1);
+    value.push_back(1);
+    index.push_back(0);
+    value.push_back(2);
+    HighsInt num_entries = index.size();
+    return_status = highs.setSolution(num_entries, index.data(), value.data());
+    REQUIRE(return_status == HighsStatus::kWarning);
+
+    index.clear();
+    value.clear();
+    std::vector<bool> is_set;
+    is_set.assign(lp.num_col_, false);
+    HighsInt num_to_set = 2;
+    assert(num_to_set > 0);
+    HighsRandom random;
+    for (HighsInt iSet = 0; iSet < num_to_set;) {
+      HighsInt iCol = random.integer(lp.num_col_);
+      if (lp.integrality_[iCol] != HighsVarType::kInteger) continue;
+      if (is_set[iCol]) continue;
+      is_set[iCol] = true;
+      index.push_back(iCol);
+      value.push_back(optimal_solution.col_value[iCol]);
+      iSet++;
+    }
+    num_entries = index.size();
+    assert(num_entries == num_to_set);
+    return_status = highs.setSolution(num_entries, index.data(), value.data());
+    REQUIRE(return_status == HighsStatus::kOk);
+    highs.run();
+    REQUIRE(info.mip_node_count < scratch_num_nodes);
+    highs.clear();
+  }
+  assert(other_tests);
   std::remove(solution_file.c_str());
 }
 

check/meson.build

@@ -71,10 +71,10 @@ foreach test : test_array
       )
 endforeach
 
-if get_option('with_c')
-  test('test_capi',
-      executable('capi_unit_tests', 'TestCAPI.c',
-    include_directories: _incdirs,
-    link_with : highslib,
-  ))
-endif
+test('test_capi',
+     executable('capi_unit_tests',
+                sources: ['TestCAPI.c', highs_conf_file],
+                include_directories: _incdirs,
+                link_with : highslib,
+               )
+    )