diff --git a/.github/workflows/build-nuget-package.yml b/.github/workflows/build-nuget-package.yml index 390132b1a04..8d868a5fe0c 100644 --- a/.github/workflows/build-nuget-package.yml +++ b/.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 diff --git a/.github/workflows/build-python-package.yml b/.github/workflows/build-python-package.yml index 595c5f4103a..7b9a4b55327 100644 --- a/.github/workflows/build-python-package.yml +++ b/.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] diff --git a/.github/workflows/build-wheels-push.yml b/.github/workflows/build-wheels-push.yml index ea8a0eedc1d..f9358853149 100644 --- a/.github/workflows/build-wheels-push.yml +++ b/.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] diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index ccd5ceac850..5ed2540c43c 100644 --- a/.github/workflows/build-wheels.yml +++ b/.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] diff --git a/.github/workflows/test-fortran-macos.yml b/.github/workflows/test-fortran-macos.yml index 599e1f10430..3ecf6d8edb8 100644 --- a/.github/workflows/test-fortran-macos.yml +++ b/.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 diff --git a/.github/workflows/test-nuget-macos.yml b/.github/workflows/test-nuget-macos.yml index 24e466e0f52..6f73616740f 100644 --- a/.github/workflows/test-nuget-macos.yml +++ b/.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 diff --git a/.github/workflows/test-nuget-package.yml b/.github/workflows/test-nuget-package.yml index a7aa3f44db7..435e840cddd 100644 --- a/.github/workflows/test-nuget-package.yml +++ b/.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 diff --git a/README.md b/README.md index de6e8c9a932..287260ff99f 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ As an alternative, HiGHS can be installed using the `meson` build interface: meson setup bbdir -Dwith_tests=True meson test -C bbdir ``` -_The meson build files are provided by the community and are not officially supported by the HiGHS development team._ +_The meson build files are provided by the community and are not officially supported by the HiGHS development team._ **If you use this method and encounter issues, please consider contributing fixes or updates by checking the [HiGHS Contribution Guide](https://github.com/ERGO-Code/HiGHS/blob/master/CONTRIBUTING.md).** #### Build with Nix diff --git a/docs/src/interfaces/other.md b/docs/src/interfaces/other.md index 298d1706562..863cc3f1e2d 100644 --- a/docs/src/interfaces/other.md +++ b/docs/src/interfaces/other.md @@ -24,7 +24,9 @@ including [pre-build libraries](https://github.com/coin-or/GAMSlinks/releases). ## MATLAB -* [HiGHSMEX](https://github.com/savyasachi/HiGHSMEX) is a MATLAB interface for Windows to provide all the functionality of HiGHS, except the following: Reading problem data from a model file; Setting names for the rows and columns of the model, or setting name for the objective; Advanced features such as solution of systems using the current basis matrix. +* [HiGHSMEX](https://github.com/savyasachi/HiGHSMEX) is a MATLAB interface that provides all the functionality of HiGHS, except the following: Reading problem data from a model file; Setting names for the rows and columns of the model, or setting name for the objective; Advanced features such as solution of systems using the current basis matrix. + + The interface is avalailable for Windows, MacOS and Linux, and has been tested on Windows and MacOS. Pre-built binaries (mex files) for Windows and MacOS are available in the repository, which also includes instructions for building from source in [README.md](https://github.com/savyasachi/HiGHSMEX/blob/main/README.md). * The HiGHS MIP and dual simplex LP solvers have been used _within_ MATLAB (so for all architectures) by default since release 2024a.