Merge branch 'latest' into hipo-pne

Author: filikat

.github/julia/build_tarballs.jl

@@ -12,9 +12,6 @@ version = VersionNumber(ENV["HIGHS_RELEASE"])
 sources = [GitSource(ENV["HIGHS_URL"], ENV["HIGHS_COMMIT"])]
 
 script = raw"""
-export BUILD_SHARED="ON"
-export BUILD_STATIC="OFF"
-
 cd $WORKSPACE/srcdir/HiGHS
 
 # Remove system CMake to use the jll version
@@ -23,19 +20,20 @@ apk del cmake
 rm -rf build
 mkdir build
 
-# Do fully static build only on Windows
-if [[ "${BUILD_SHARED}" == "OFF" ]] && [[ "${target}" == *-mingw* ]]; then
-    export CXXFLAGS="-static"
+if [[ "${target}" == *-mingw* ]]; then
+    LBT=blastrampoline-5
+else
+    LBT=blastrampoline
 fi
 
 cmake -S . -B build \
     -DCMAKE_INSTALL_PREFIX=${prefix} \
     -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} \
     -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_SHARED_LIBS=${BUILD_SHARED} \
-    -DZLIB_USE_STATIC_LIBS=${BUILD_STATIC} \
-    -DHIPO=ON -DBUILD_SHARED_EXTRAS_LIB=OFF \
-    -DBLAS_LIBRARIES="${libdir}/libopenblas.${dlext}"
+    -DBUILD_SHARED_LIBS=ON \
+    -DHIPO=ON \
+    -DBUILD_SHARED_EXTRAS_LIB=OFF \
+    -DBLA_VENDOR=libblastrampoline
 
 if [[ "${target}" == *-linux-* ]]; then
     make -C build -j ${nproc}
@@ -62,7 +60,7 @@ platforms = expand_cxxstring_abis(platforms)
 dependencies = [
     Dependency("CompilerSupportLibraries_jll"),
     Dependency("Zlib_jll"),
-    Dependency("OpenBLAS32_jll"),
+    Dependency("libblastrampoline_jll"),
     HostBuildDependency(PackageSpec(; name="CMake_jll")),
 ]
 
@@ -76,5 +74,5 @@ build_tarballs(
     products,
     dependencies;
     preferred_gcc_version = v"11",
-    julia_compat = "1.6",
+    julia_compat = "1.10",
 )

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

@@ -48,7 +48,13 @@ jobs:
           - [macos-14, macosx_arm64]
           - [windows-2022, win_amd64]
           - [windows-2022, win32]
-        python: ["cp39", "cp310", "cp311", "cp312", "cp313", "cp314"]
+        python: ["cp39", "cp310", "cp311", "cp312", "cp313", "cp314", "cp314t"]
+        exclude:
+          # numpy (pulled in by the test suite) has no 32-bit linux free-threaded wheels
+          - buildplat: [ubuntu-24.04, manylinux_i686]
+            python: "cp314t"
+          - buildplat: [ubuntu-24.04, musllinux_i686]
+            python: "cp314t"
     steps:
       - uses: actions/checkout@v6
       - name: Build wheels
@@ -79,7 +85,13 @@ jobs:
           - [macos-14, macosx_arm64]
           - [windows-2022, win_amd64]
           - [windows-2022, win32]
-        python: ["cp39", "cp310", "cp311", "cp312", "cp313", "cp314"]
+        python: ["cp39", "cp310", "cp311", "cp312", "cp313", "cp314", "cp314t"]
+        exclude:
+          # numpy (pulled in by the test suite) has no 32-bit linux free-threaded wheels
+          - buildplat: [ubuntu-24.04, manylinux_i686]
+            python: "cp314t"
+          - buildplat: [ubuntu-24.04, musllinux_i686]
+            python: "cp314t"
     steps:
       - uses: actions/checkout@v6
 

.github/workflows/julia-tests.yml

@@ -1,12 +1,9 @@
 name: JuliaCompileAndTest
-
 on: [push, pull_request]
-# needed to allow julia-actions/cache to delete old caches that it has created
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
-
+# needed to allow julia-actions/cache to delete old caches that it has created
 permissions:
   actions: write
   contents: read
@@ -18,7 +15,7 @@ jobs:
       matrix:
         triplet: ['x86_64-linux-gnu-cxx11', 'aarch64-apple-darwin', 'x86_64-w64-mingw32-cxx11']
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - uses: julia-actions/setup-julia@v3
         with:
           version: "1.7"
@@ -64,7 +61,7 @@ jobs:
             os: 'windows-latest'
             arch: x64
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - uses: julia-actions/setup-julia@v3
         with:
           version: "1.10"
@@ -106,18 +103,7 @@ jobs:
             "$(m[1]) = \"$(dir)\"\n",
           )
           Pkg.develop(; path = joinpath(ENV["GITHUB_WORKSPACE"], "HiGHS_jll"))
-      - shell: julia --color=yes {0}
-        run: |
-          import HiGHS_jll
-          file = joinpath(ENV["GITHUB_WORKSPACE"], "check", "instances", "flugpl.mps")
-          run(`$(HiGHS_jll.highs()) --solver=hipo $file`)
-          run(`$(HiGHS_jll.highs()) $file`)
       - shell: julia --color=yes {0}
         run: |
           using Pkg
-          # HiGHS uses (N+1)/2 threads. HiGHS.jl parallelises the tests and, in
-          # the default setting, it may use up to 4 parallel jobs. This means
-          # HiGHS may attempt to start up to 2(N+1) threads and we get unhandled
-          # exceptions on macOS and a SIGTERM on linux. To avoid these errors,
-          # opt out of running the tests in parallel.
-          Pkg.test("HiGHS"; test_args=["--parallel=false"])
+          Pkg.test("HiGHS")

.github/workflows/sanitizers-cmake.yml

@@ -7,12 +7,13 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  gcc_relwithdebinfo:
+  gcc:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
+        config: [Debug, RelWithDebInfo]
         sanitizer: [Address, Thread, Leak]
     steps:
       - uses: actions/checkout@v6
@@ -24,21 +25,22 @@ jobs:
         shell: bash
         working-directory: ${{github.workspace}}/build
         run: |
-          cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDEBUG_MEMORY=${{ matrix.sanitizer }} -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++
+          cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DDEBUG_MEMORY=${{ matrix.sanitizer }} -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++
           cmake --build . -j2
 
       - name: Run
         working-directory: ${{github.workspace}}/build
         shell: bash
         run: ./bin/highs $GITHUB_WORKSPACE/check/instances/afiro.mps
 
-  gcc_debug:
+  clang:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         # os: [ubuntu-latest, macos-latest]
         os: [ubuntu-latest]
+        config: [Debug, RelWithDebInfo]
         sanitizer: [Address, Thread, Leak]
     steps:
       - uses: actions/checkout@v6
@@ -50,22 +52,22 @@ jobs:
         shell: bash
         working-directory: ${{github.workspace}}/build
         run: |
-          cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DDEBUG_MEMORY=${{ matrix.sanitizer }} -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++
+          cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DDEBUG_MEMORY=${{ matrix.sanitizer }} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
           cmake --build . -j2
 
       - name: Run
         working-directory: ${{github.workspace}}/build
         shell: bash
         run: ./bin/highs $GITHUB_WORKSPACE/check/instances/afiro.mps
 
-  clang_relwithdebinfo:
+  no_hipo_macos:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        # os: [ubuntu-latest, macos-latest]
-        os: [ubuntu-latest]
-        sanitizer: [Address, Thread, Leak]
+        os: [macos-latest]
+        config: [Debug, RelWithDebInfo]
+        sanitizer: [Address, Thread]
     steps:
       - uses: actions/checkout@v6
 
@@ -76,50 +78,66 @@ jobs:
         shell: bash
         working-directory: ${{github.workspace}}/build
         run: |
-          cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDEBUG_MEMORY=${{ matrix.sanitizer }} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
-          cmake --build . -j2
+          cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DDEBUG_MEMORY=${{ matrix.sanitizer }}
+          cmake --build . -j3
 
       - name: Run
         working-directory: ${{github.workspace}}/build
         shell: bash
         run: ./bin/highs $GITHUB_WORKSPACE/check/instances/afiro.mps
 
-  clang_debug:
+  hipo:
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: false
       matrix:
-        # os: [ubuntu-latest, macos-latest]
         os: [ubuntu-latest]
+        config: [Debug, RelWithDebInfo]
+        all_tests: [ON]
         sanitizer: [Address, Thread, Leak]
+
     steps:
       - uses: actions/checkout@v6
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build
 
-      - name: Configure CMake and Build
-        shell: bash
+      - name: Configure CMake
+        working-directory: ${{github.workspace}}/build
+        run: |
+          cmake $GITHUB_WORKSPACE -DHIPO=ON -DBUILD_OPENBLAS=ON \
+            -DALL_TESTS=${{ matrix.all_tests }} \
+            -DCMAKE_BUILD_TYPE=${{ matrix.config }} \
+            -DDEBUG_MEMORY=${{ matrix.sanitizer }} \
+            -DNO_AVX512=ON \
+            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF \
+            -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++
+
+
+      - name: Build
         working-directory: ${{github.workspace}}/build
         run: |
-          cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DDEBUG_MEMORY=${{ matrix.sanitizer }} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
           cmake --build . -j2
 
-      - name: Run
+      - name: Test executable
         working-directory: ${{github.workspace}}/build
-        shell: bash
-        run: ./bin/highs $GITHUB_WORKSPACE/check/instances/afiro.mps
+        run: ./bin/highs --solver=hipo $GITHUB_WORKSPACE/check/instances/afiro.mps
 
-  hipo:
+      - name: Test hipo
+        working-directory: ${{github.workspace}}/build
+        run: |
+          ./bin/unit_tests [highs_hipo]
+
+  hipo_macos:
     runs-on: ${{ matrix.os }}
 
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
-        config: [Debug]
-        all_tests: [ON]
-        sanitizer: [Address, Thread, Leak]
+        os: [macos-latest]
+        config: [Debug, RelWithDebInfo]
+        sanitizer: [Address, Thread]
 
     steps:
       - uses: actions/checkout@v6
@@ -130,18 +148,15 @@ jobs:
       - name: Configure CMake
         working-directory: ${{github.workspace}}/build
         run: |
-          cmake $GITHUB_WORKSPACE -DHIPO=ON -DBUILD_OPENBLAS=ON \
-            -DALL_TESTS=${{ matrix.all_tests }} \
+          cmake $GITHUB_WORKSPACE -DHIPO=ON \
             -DCMAKE_BUILD_TYPE=${{ matrix.config }} \
             -DDEBUG_MEMORY=${{ matrix.sanitizer }} \
-            -DNO_AVX512=ON \
-            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
-
+            -DALL_TESTS=ON
 
       - name: Build
         working-directory: ${{github.workspace}}/build
         run: |
-          cmake --build . -j2
+          cmake --build . -j3
 
       - name: Test executable
         working-directory: ${{github.workspace}}/build

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

@@ -135,8 +135,8 @@ jobs:
       - name: Configure openblas
         working-directory: ${{github.workspace}}/pathtoopenblas
         run: |
-          make -j2 PREFIX=${{github.workspace}}/install-openblas
-          make install PREFIX=${{github.workspace}}/install-openblas
+          make -j2 DYNAMIC_ARCH=1 NO_AVX512=1 PREFIX=${{github.workspace}}/install-openblas
+          make install DYNAMIC_ARCH=1 NO_AVX512=1 PREFIX=${{github.workspace}}/install-openblas
           ls ${{github.workspace}}/install-openblas
           echo ""
           ls ${{github.workspace}}/install-openblas/lib

BUILD.bazel

@@ -118,6 +118,10 @@ cc_library(
     ],
     linkopts = select({
         "@rules_cc//cc/compiler:msvc-cl": ["-DEFAULTLIB:shell32.lib"],
+        "@platforms//os:linux": [
+          "-Wl,--no-as-needed -ldl",
+          "-pthread",
+        ],
         "//conditions:default": ["-lpthread"],
     }),
     visibility = ["//visibility:public"],
@@ -226,6 +230,7 @@ TEST_NAMES = [
     "TestMipSolver",
     "TestPresolve",
     "TestPresolveRules",
+    "TestQpOracle",
     "TestQpSolver",
     "TestRanging",
     "TestRunData",