Merge v1.12 into branch"

Author: Opt-Mucca

.bazelrc

@@ -1,3 +1,7 @@
+build --enable_platform_specific_config
+
+build:windows --enable_runfiles
+
 build:asan --strip=never
 build:asan --copt -fsanitize=address
 build:asan --copt -O1

.github/julia/build_tarballs.jl

@@ -33,7 +33,10 @@ cmake -DCMAKE_INSTALL_PREFIX=${prefix} \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=${BUILD_SHARED} \
     -DZLIB_USE_STATIC_LIBS=${BUILD_STATIC} \
-    -DFAST_BUILD=ON ..
+    -DHIPO=ON \
+    -DBLAS_LIBRARIES="${libdir}/libopenblas.${dlext}" \
+    -DMETIS_ROOT=${prefix} \
+    ..
 
 if [[ "${target}" == *-linux-* ]]; then
         make -j ${nproc}
@@ -60,6 +63,8 @@ platforms = expand_cxxstring_abis(platforms)
 dependencies = [
     Dependency("CompilerSupportLibraries_jll"),
     Dependency("Zlib_jll"),
+    Dependency("METIS_jll"),
+    Dependency("OpenBLAS32_jll"),
     HostBuildDependency(PackageSpec(; name="CMake_jll")),
 ]
 

.github/workflows/build-fast.yml

@@ -19,7 +19,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
@@ -46,7 +46,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-intel.yml

@@ -48,6 +48,18 @@ jobs:
           source /opt/intel/oneapi/setvars.sh
           cmake --build build --parallel
 
+      # If the unit tests below are failing run to see details.
+      # - name: Unit Test
+      #   shell: bash
+      #   run: |
+      #     source /opt/intel/oneapi/setvars.sh
+      #     export SYCL_DEVICE_FILTER=opencl.cpu
+      #     pwd
+      #     ls
+      #     ls build
+      #     ls build/bin
+      #     ./build/bin/unit_tests 
+
       - name: Test
         shell: bash
         run: |

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

@@ -8,12 +8,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # macos 13 is Intel
-  build_macos_13:
-    runs-on: macos-13
-    # strategy:
-      # matrix:
-      #   python: [3.11]
+  # Build macos intel
+  build_macos_intel:
+    runs-on: macos-15-intel
     steps:
       - uses: actions/checkout@v4
       - name: Build HiGHS
@@ -32,10 +29,10 @@ jobs:
         with:
           name: macos-x64
           path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
-            
-  # macos 14 is M1
-  build_macos_14:
-    runs-on: macos-14 
+
+  # Build macos arm64
+  build_macos_arm:
+    runs-on: macos-14  # macos-14 is arm64
     steps:
       - uses: actions/checkout@v4
       - name: Build HiGHS
@@ -55,14 +52,14 @@ jobs:
           name: macos-arm64
           path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
 
-  # Build windows 32 and linux 
+  # Build windows 32 and linux
   build_windows_32:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
       - name: Build HiGHS
         run: |
-         cmake -E make_directory ${{runner.workspace}}/build32 
+         cmake -E make_directory ${{runner.workspace}}/build32
 
       - name: Configure CMake win32
         shell: bash
@@ -127,7 +124,7 @@ jobs:
 
   build_windows:
     runs-on: windows-latest
-    needs: [build_macos_13, build_macos_14, build_windows_32, build_linux, build_linux_arm64]
+    needs: [build_macos_intel, build_macos_arm, build_windows_32, build_linux, build_linux_arm64]
     steps:
       - uses: actions/checkout@v4
       - name: Build HiGHS Windows native
@@ -143,10 +140,10 @@ jobs:
         working-directory: ${{runner.workspace}}/build
         shell: bash
         run: cmake --build . --config Release --parallel
-      
+
       - name: Display structure of downloaded files
         run: |
-          pwd 
+          pwd
           ls -R ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
 
       - name: Download runtimes macos-x64
@@ -188,7 +185,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.10.0
+        run: dotnet pack -c Release /p:Version=1.12.0
 
       - uses: actions/upload-artifact@v4
         with:
@@ -202,7 +199,7 @@ jobs:
       name: nuget
 
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
-    steps: 
+    steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v4
 
@@ -212,6 +209,6 @@ jobs:
           name: nuget
 
       - name: Dotnet push
-        run: dotnet nuget push "*.nupkg" --api-key ${{secrets.nuget_api_key}} --source https://api.nuget.org/v3/index.json 
+        run: dotnet nuget push "*.nupkg" --api-key ${{secrets.nuget_api_key}} --source https://api.nuget.org/v3/index.json
       #     env:
       #       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

@@ -50,7 +50,7 @@ jobs:
           python3 -m pytest $GITHUB_WORKSPACE
 
   build_sdist_win:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - uses: actions/checkout@v4
 
@@ -133,9 +133,8 @@ jobs:
           python3 -m pip install pytest
           python3 -m pytest $GITHUB_WORKSPACE
 
-  # macos 13 is Intel
-  build_wheel_macos_13:
-    runs-on: macos-13
+  build_wheel_macos_intel:
+    runs-on: macos-15-intel
     strategy:
       matrix:
         python: [3.11]    
@@ -164,9 +163,8 @@ jobs:
           python3 -m pip install pytest
           python3 -m pytest $GITHUB_WORKSPACE
             
-  # macos 14 is M1
-  build_wheel_macos_14:
-    runs-on: macos-14 
+  build_wheel_macos_arm:
+    runs-on: macos-14  # macos-14 is arm64
     strategy:
       matrix:
         python: [3.11]    
@@ -196,7 +194,7 @@ jobs:
           python3 -m pytest $GITHUB_WORKSPACE
 
   build_wheel_windows:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - uses: actions/checkout@v4
 
@@ -223,7 +221,7 @@ jobs:
           python -m pytest 
           
   build_wheel_windows_313:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/build-unit-tests-external.yml

@@ -82,7 +82,7 @@ jobs:
         run: ctest --parallel --timeout 300 --output-on-failure 
 
   # release__windows_extra_unit_tests:
-  #   runs-on: windows-2019
+  #   runs-on: windows-2022
 
   #   steps:
   #     - uses: actions/checkout@v4
@@ -118,7 +118,7 @@ jobs:
   #     - name: Unit Test Extra
   #       working-directory: ${{runner.workspace}}/build
   #       shell: bash
-  #       run: ./bin/Release/unit_tests.exe highs-names-extra 
+  #       run: ./Release/bin/unit_tests.exe highs-names-extra 
 
   #     - name: Test
   #       working-directory: ${{runner.workspace}}/build

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

@@ -49,17 +49,17 @@ jobs:
           - [ubuntu-24.04, musllinux_x86_64] # No OpenBlas, no test
           - [ubuntu-24.04, musllinux_i686]
           - [ubuntu-24.04-arm, musllinux_aarch64]
-          - [macos-13, macosx_x86_64]
+          - [macos-15-intel, macosx_x86_64]
           - [macos-14, macosx_arm64]
-          - [windows-2019, win_amd64]
-          - [windows-2019, win32]
+          - [windows-2022, win_amd64]
+          - [windows-2022, win32]
         python: ["cp38", "cp39","cp310", "cp311","cp312", "cp313"]
 
     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/build-wheels.yml

@@ -39,15 +39,15 @@ jobs:
           - [ubuntu-24.04, musllinux_x86_64] # No OpenBlas, no test
           - [ubuntu-24.04, musllinux_i686]
           - [ubuntu-24.04-arm, musllinux_aarch64]
-          - [macos-13, macosx_x86_64]
+          - [macos-15-intel, macosx_x86_64]
           - [macos-14, macosx_arm64]
-          - [windows-2019, win_amd64]
-          - [windows-2019, win32]
+          - [windows-2022, win_amd64]
+          - [windows-2022, win32]
         python: ["cp38", "cp39","cp310", "cp311","cp312", "cp313"]
 
     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] }}