Merge branch 'latest' into flow-cover-cuts

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/workflows/build-nuget-package.yml

@@ -7,12 +7,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,9 +29,9 @@ jobs:
           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
@@ -126,7 +123,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

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

@@ -132,9 +132,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]    
@@ -163,9 +162,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]    

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

@@ -49,7 +49,7 @@ 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-2022, win_amd64]
           - [windows-2022, win32]

.github/workflows/build-wheels.yml

@@ -38,7 +38,7 @@ 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-2022, win_amd64]
           - [windows-2022, win32]

.github/workflows/build-windows.yml

@@ -180,35 +180,35 @@ jobs:
         # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
         run: ctest  --output-on-failure -C Debug
 
-  windows_debug_fb_off:
-    runs-on: windows-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Create Build Environment
-        # Some projects don't allow in-source building, so create a separate build directory
-        # We'll use this as our working directory for all subsequent commands
-        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 -DFAST_BUILD=OFF
-
-      - name: Build All
-        working-directory: ${{runner.workspace}}/build
-        shell: bash
-        # Execute the build.  You can specify a specific target with "--target <NAME>"
-        run: |
-          cmake --build . --parallel --config Debug
-
-      - name: Test All
-        working-directory: ${{runner.workspace}}/build
-        shell: bash
-        # Execute tests defined by the CMake configuration.
-        # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-        run: ctest --parallel --timeout 300 --output-on-failure -C Debug
+  # windows_debug_fb_off:
+  #   runs-on: windows-latest
+
+  #   steps:
+  #     - uses: actions/checkout@v4
+
+  #     - name: Create Build Environment
+  #       # Some projects don't allow in-source building, so create a separate build directory
+  #       # We'll use this as our working directory for all subsequent commands
+  #       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 -DFAST_BUILD=OFF
+
+  #     - name: Build All
+  #       working-directory: ${{runner.workspace}}/build
+  #       shell: bash
+  #       # Execute the build.  You can specify a specific target with "--target <NAME>"
+  #       run: |
+  #         cmake --build . --parallel --config Debug
+
+  #     - name: Test All
+  #       working-directory: ${{runner.workspace}}/build
+  #       shell: bash
+  #       # Execute tests defined by the CMake configuration.
+  #       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+  #       run: ctest --parallel --timeout 300 --output-on-failure -C Debug
 
   windows_release64:
     runs-on: windows-2022
@@ -381,36 +381,38 @@ jobs:
         # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
         run: ctest  --output-on-failure -C Debug
 
-  windows_debug64_fb_off:
-    runs-on: windows-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Create Build Environment
-        # Some projects don't allow in-source building, so create a separate build directory
-        # We'll use this as our working directory for all subsequent commands
-        run: cmake -E make_directory ${{runner.workspace}}/build
-
-      - name: Configure CMake
-        # Use a bash shell so we can use the same syntax for environment variable
-        # access regardless of the host operating system
-        shell: bash
-        working-directory: ${{runner.workspace}}/build
-        # Note the current convention is to use the -S and -B options here to specify source
-        # and build directories, but this is only available with CMake 3.13 and higher.
-        # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DFAST_BUILD=OFF -DHIGHSINT64=on -DHIGHS_NO_DEFAULT_THREADS=ON
-
-      - name: Build
-        working-directory: ${{runner.workspace}}/build
-        shell: bash
-        # Execute the build.  You can specify a specific target with "--target <NAME>"
-        run: cmake --build . --config Debug --parallel
-
-      - name: Test
-        working-directory: ${{runner.workspace}}/build
-        shell: bash
-        # Execute tests defined by the CMake configuration.
-        # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-        run: ctest  --output-on-failure -C Debug
+  # Switch off, fortran compiler lookup taking hours on new windows runner. 
+  # For fortran is best to use FAST_BUILD ON anyway.
+  # windows_debug64_fb_off:
+  #   runs-on: windows-latest
+
+  #   steps:
+  #     - uses: actions/checkout@v4
+
+  #     - name: Create Build Environment
+  #       # Some projects don't allow in-source building, so create a separate build directory
+  #       # We'll use this as our working directory for all subsequent commands
+  #       run: cmake -E make_directory ${{runner.workspace}}/build
+
+  #     - name: Configure CMake
+  #       # Use a bash shell so we can use the same syntax for environment variable
+  #       # access regardless of the host operating system
+  #       shell: bash
+  #       working-directory: ${{runner.workspace}}/build
+  #       # Note the current convention is to use the -S and -B options here to specify source
+  #       # and build directories, but this is only available with CMake 3.13 and higher.
+  #       # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+  #       run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DFAST_BUILD=OFF -DHIGHSINT64=on -DHIGHS_NO_DEFAULT_THREADS=ON
+
+  #     - name: Build
+  #       working-directory: ${{runner.workspace}}/build
+  #       shell: bash
+  #       # Execute the build.  You can specify a specific target with "--target <NAME>"
+  #       run: cmake --build . --config Debug --parallel
+
+  #     - name: Test
+  #       working-directory: ${{runner.workspace}}/build
+  #       shell: bash
+  #       # Execute tests defined by the CMake configuration.
+  #       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+  #       run: ctest  --output-on-failure -C Debug

.github/workflows/test-fortran-macos.yml

@@ -4,17 +4,17 @@ on: [push, pull_request]
 
 jobs:
   fast_build_release:
-    runs-on: [macos-13]
+    runs-on: [macos-15-intel]
 
 
     steps:
       - uses: actions/checkout@v4
 
-      - uses: fortran-lang/setup-fortran@v1.6
+      - uses: fortran-lang/setup-fortran@v1.8
         id: setup-fortran
         with:
           compiler: gcc 
-          version: 11
+          version: 14
 
       # - name: Install GFortran
       #   run: brew install gfortran gcc
@@ -27,8 +27,8 @@ jobs:
         working-directory: ${{runner.workspace}}/build
         run: |
           cmake --version
-          gfortran-11 --version
-          cmake $GITHUB_WORKSPACE -DFORTRAN=ON 
+          gfortran-14 --version
+          cmake $GITHUB_WORKSPACE -DFORTRAN=ON -DCMAKE_Fortran_COMPILER=gfortran-14
 
       - name: Build
         shell: bash

.github/workflows/test-nuget-macos.yml

@@ -7,9 +7,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # macos 13 is Intel
-  build_macos_13:
-    runs-on: macos-13
+  build_macos_intel:
+    runs-on: macos-15-intel
     # strategy:
       # matrix:
       #   python: [3.11]
@@ -55,9 +54,8 @@ jobs:
           dotnet run
 
             
-  # macos 14 is M1
-  build_macos_14:
-    runs-on: macos-14 
+  build_macos_arm:
+    runs-on: macos-14  # macos-14 is arm64
     steps:
       - uses: actions/checkout@v4
       - name: Build HiGHS

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

@@ -7,9 +7,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # macos 13 is Intel
-  build_macos_13:
-    runs-on: macos-13
+  build_macos_intel:
+    runs-on: macos-15-intel
     # strategy:
       # matrix:
       #   python: [3.11]
@@ -56,9 +55,8 @@ jobs:
 
 
             
-  # macos 14 is M1
-  build_macos_14:
-    runs-on: macos-14 
+  build_macos_arm:
+    runs-on: macos-14  # macos-14 is arm64
     steps:
       - uses: actions/checkout@v4
       - name: Build HiGHS

FEATURES.md

@@ -12,3 +12,4 @@ The irreducible infeasibility system (IIS) facility now detects infeasibility du
 
 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.
 
+As per [#2487](https://github.com/ERGO-Code/HiGHS/issues/2487), trivial heuristics now run before feasibility jump (FJ), and FJ will use any existing incumbent. FJ will clip any finite variable values in the incumbent to lower and upper bounds, and falls back to the existing logic (lower bound if finite, else upper bound if finite, else 0) for any infinite values in the incumbent.