Merge branch 'latest' into cs-callbacks

Author: galabovaa

.github/workflows/build-fast.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Configure CMake
         shell: bash
         working-directory: ${{runner.workspace}}/build
-        run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=RELEASE
+        run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_UNITY_BUILD=ON
 
       - name: Build
         working-directory: ${{runner.workspace}}/build
@@ -45,7 +45,7 @@ jobs:
       - name: Configure CMake
         shell: bash
         working-directory: ${{runner.workspace}}/build
-        run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=DEBUG
+        run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_UNITY_BUILD=ON
 
       - name: Build
         working-directory: ${{runner.workspace}}/build

.github/workflows/build-wheels-push.yml

@@ -59,7 +59,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21
+        uses: pypa/cibuildwheel@v3.0
         env:
           CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
 

.github/workflows/build-wheels.yml

@@ -1,7 +1,7 @@
 name: build-wheels
 
-on: [push]
-# on: [pull_request]
+# on: [push]
+on: [pull_request]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -47,6 +47,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21
+        uses: pypa/cibuildwheel@v3.0
         env:
           CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}

.github/workflows/valgrind.yml

@@ -92,6 +92,82 @@ jobs:
           --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
+
+  examples:
+    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 
+
+      - name: Build All
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: |
+          cmake --build . --parallel 
+
+      - name: Test cpp example
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: |
+          valgrind \
+          --leak-check=full \
+          --show-leak-kinds=all \
+          --track-origins=yes \
+          -s \
+          ./bin/call_highs_from_cpp \
+          --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
+      
+      - name: Test C example
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: |
+          valgrind \
+          --leak-check=full \
+          --show-leak-kinds=all \
+          --track-origins=yes \
+          -s \
+          ./bin/call_highs_from_c_minimal \
+          --timeout 1000 \
+          --output-on-failure \
+          2>&1 | tee logfile2
+
       - name: Check log for Errors
         working-directory: ${{runner.workspace}}/build
         shell: bash

BUILD.bazel

@@ -1,5 +1,5 @@
 load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
-load("@rules_cc//cc:defs.bzl", "cc_library", "cc_binary", "cc_test")
+load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
 
 copy_file(
     name = "highs-config",
@@ -16,9 +16,8 @@ cc_library(
 
 cc_library(
     name = "highs",
-    srcs = glob([
+    srcs = ["highs/interfaces/highs_c_api.cpp"] + glob([
         "extern/filereaderlp/*.cpp",
-        "highs/interfaces/highs_c_api.cpp",
         "highs/io/*.cpp",
         "highs/ipm/*.cpp",
         "highs/ipm/ipx/*.cc",
@@ -35,18 +34,21 @@ cc_library(
         "highs/test_kkt/*.cpp",
         "highs/util/*.cpp",
     ]),
-    hdrs = glob([
-        "**/*.h",
+    hdrs = [
         "highs/mip/feasibilityjump.hh",
+    ] + glob([
+        "**/*.h",
         "highs/qpsolver/*.hpp",
-        "highs/Highs.h",
         "extern/filereaderlp/*.hpp",
         "extern/zstr/*.hpp",
     ]),
-    copts = [
-        "-Wno-unused-variable",
-        "-Wno-unused-but-set-variable",
-    ],
+    copts = select({
+        "@rules_cc//cc/compiler:msvc-cl": [],
+        "//conditions:default": [
+            "-Wno-unused-variable",
+            "-Wno-unused-but-set-variable",
+        ],
+    }),
     includes = [
         "extern",
         # "extern/filereaderlp",
@@ -66,7 +68,10 @@ cc_library(
         # "highs/util",
         "bazel-bin",
     ],
-    linkopts = ["-lpthread"],
+    linkopts = select({
+        "@rules_cc//cc/compiler:msvc-cl": ["-DEFAULTLIB:shell32.lib"],
+        "//conditions:default": ["-lpthread"],
+    }),
     visibility = ["//visibility:public"],
     deps = [
         "//:config",
@@ -76,8 +81,10 @@ cc_library(
 
 cc_library(
     name = "highs-runtime-opts",
-    hdrs = ["app/HighsRuntimeOptions.h",
-            "app/CLI11.hpp"],
+    hdrs = [
+        "app/CLI11.hpp",
+        "app/HighsRuntimeOptions.h",
+    ],
     visibility = ["//visibility:public"],
     deps = [
         "//:highs",
@@ -180,11 +187,13 @@ TEST_NAMES = [
 [cc_test(
     name = name,
     srcs = ["check/%s.cpp" % name],
-    copts = [
-        "-Iextern",
-        "-Wno-unused-variable",
-        "-Wno-unused-but-set-variable",
-    ],
+    copts = ["-Iextern"] + select({
+        "@rules_cc//cc/compiler:msvc-cl": [],
+        "//conditions:default": [
+            "-Wno-unused-variable",
+            "-Wno-unused-but-set-variable",
+        ],
+    }),
     deps = [
         ":highs",
         ":test_lib",

CMakeLists.txt

@@ -73,7 +73,7 @@ option(BUILD_CXX "Build C++ library" ON)
 message(STATUS "Build C++ library: ${BUILD_CXX}")
 
 option(BUILD_CXX_EXE "Build C++ executable" ON)
-message(STATUS "Build C++ library: ${BUILD_CXX_EXE}")
+message(STATUS "Build C++ executable: ${BUILD_CXX_EXE}")
 
 option(BUILD_TESTING "Build Tests" ON)
 
@@ -500,7 +500,10 @@ if(ZLIB AND NOT TARGET ZLIB::ZLIB)
   find_package(ZLIB 1.2.3)
 endif()
 
-include(CPack)
+if(CPack_CMake_INCLUDED EQUAL 0)
+  include(CPack)
+endif()
+
 set(CPACK_PACKAGE_VERSION_MAJOR "${HIGHS_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${HIGHS_VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH "${HIGHS_VERSION_PATCH}")

FEATURES.md

@@ -6,4 +6,9 @@ Forcing column reduction now checks the bound on the column dual rather than whe
 
 Now handling correctly the case where an infeasible MIP has a feasible relaxation, so no ray is computed fixing [#2415](https://github.com/ERGO-Code/HiGHS/issues/2415)
 
+Fixed minor bug exposed by [#2441](https://github.com/ERGO-Code/HiGHS/issues/2441) in `Highs::setSolution()` for a sparse user solution when the moidel is empty, and only clearing the dual data before solving with modified objective in `Highs::multiobjectiveSolve()` so that user-supplied solution is not cleared.
+
+The irreducible infeasibility system (IIS) facility now detects infeasibility due to bounds on constraint activity values (implied by variable bounds) being incompatible with constraint bounds. A `kIisStrategyLight mode` for the `iis_strategy` option has been introduced so that only infeasibility due to incompatible variable/constraint bounds and constraint activity values is checked for. The LP corresponding to any known IIS is now formed and held as a data member of the `HighsIis` class. It can be obtained as a const reference using `Highs::getIisLp()`, and written to a file using `Highs::writeIisModel(const std::string& filename = "")`
+
+Prompted by [#2463](https://github.com/ERGO-Code/HiGHS/issues/2463), the HiGHS solution and basis files now match data to any column and row names in the model, only assuming that the data are aligned with column and row indices if there are no names in the model. This requires a new version (v2) of the HiGHS basis file. Basis files from v1 are still read, but deprecated. Now, when writing out a model, basis or solution, column and row names are added to the model - previously they were created temporarily and inconsistentyly on the fly. If the model has existing names, then distinctive names are created to replace any blank names, but names with spaces or duplicate names yield an error status return.
 

MODULE.bazel

@@ -7,15 +7,15 @@ module(
 
 bazel_dep(
     name = "bazel_skylib",
-    version = "1.7.1",
+    version = "1.8.1",
 )
 
 bazel_dep(
     name = "rules_cc",
-    version = "0.0.16",
+    version = "0.1.2",
 )
 
 bazel_dep(
     name = "zlib",
-    version = "1.3.1.bcr.3",
+    version = "1.3.1.bcr.5",
 )

app/CMakeLists.txt

@@ -25,6 +25,7 @@ if(FAST_BUILD)
     endif()
 
     set_target_properties(highs-bin PROPERTIES OUTPUT_NAME highs)
+    set_target_properties(highs-bin PROPERTIES UNITY_BUILD OFF)
 
     target_compile_features(highs-bin PRIVATE cxx_std_11)
     target_link_libraries(highs-bin PRIVATE ${PROJECT_NAMESPACE}::highs)
@@ -78,6 +79,8 @@ else()
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/app>
   )
 
+  set_target_properties(highs PROPERTIES UNITY_BUILD OFF)
+
   # install the binary
   install(TARGETS highs EXPORT highs-targets
     RUNTIME)
@@ -87,4 +90,4 @@ endif()
 if(EMSCRIPTEN AND EMSCRIPTEN_HTML)
   set(CMAKE_EXECUTABLE_SUFFIX ".html")
   set_target_properties(highs PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/highs_webdemo_shell.html)
-endif()
+endif()

check/CMakeLists.txt

@@ -106,6 +106,8 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
 
   add_executable(unit_tests ${TEST_SOURCES})
 
+  set_target_properties(unit_tests PROPERTIES UNITY_BUILD OFF)
+
   if (UNIX)
       target_compile_options(unit_tests PRIVATE "-Wno-unused-variable")
       target_compile_options(unit_tests PRIVATE "-Wno-unused-const-variable")
@@ -258,7 +260,7 @@ if ((NOT FAST_BUILD OR ALL_TESTS) AND NOT (BUILD_EXTRA_UNIT_ONLY))
       "lseu\;1120|1119.9999999\;"
       "egout\;(568.1007|568.1006999)\;"
       "gt2\;21166\;"
-      "rgn\;82.1999992\;"
+      "rgn\;82.19999\;"
       "bell5\;(8966406.49152|8966406.491519|8966406.49151)\;"
       "sp150x300d\;(69|68.9999999)\;"
       "p0548\;(8691|8690.9999999)\;"