Merge pull request #2038 from ERGO-Code/latest

HiGHS Release 1.8.1
ERGO-Code · Nov 13, 2024 · 4a7f24a · 4a7f24a
2 parents fcfb534 + 7779c46
commit 4a7f24a
Show file tree

Hide file tree

Showing 116 changed files with 7,503 additions and 2,631 deletions.
diff --git a/.github/workflows/build-nuget-package.yml b/.github/workflows/build-nuget-package.yml
@@ -7,9 +7,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # macos 12 is Intel
-  build_macos_12:
-    runs-on: macos-12
+  # macos 13 is Intel
+  build_macos_13:
+    runs-on: macos-13
     # strategy:
       # matrix:
       #   python: [3.11]
@@ -32,7 +32,7 @@ jobs:
           name: macos-x64
           path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
 
-  # macos 14 is M1 (beta)
+  # macos 14 is M1
   build_macos_14:
     runs-on: macos-14 
     steps:
@@ -124,7 +124,7 @@ jobs:
 
   build_windows:
     runs-on: windows-latest
-    needs: [build_macos_12, build_macos_14, build_windows_32, build_linux, build_linux_arm64]
+    needs: [build_macos_13, build_macos_14, build_windows_32, build_linux, build_linux_arm64]
     steps:
       - uses: actions/checkout@v4
       - name: Build HiGHS Windows native
@@ -185,7 +185,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.8.0
+        run: dotnet pack -c Release /p:Version=1.8.1
 
       - uses: actions/upload-artifact@v4
         with:

diff --git a/.github/workflows/build-python-package.yml b/.github/workflows/build-python-package.yml
@@ -105,13 +105,12 @@ jobs:
           python3 -m pip install pytest
           python3 -m pytest $GITHUB_WORKSPACE
           
-          
-  # macos 12 is Intel
-  build_wheel_macos_12:
-    runs-on: macos-12
+  # macos 13 is Intel
+  build_wheel_macos_13:
+    runs-on: macos-13
     strategy:
       matrix:
-        python: [3.11]
+        python: [3.11]    
     steps:
       - uses: actions/checkout@v4
 
@@ -134,12 +133,12 @@ jobs:
 
       - name: Test highspy
         run: |
-          python3 -m pip install pytest 
+          python3 -m pip install pytest
           python3 -m pytest $GITHUB_WORKSPACE
             
-  # macos 13 is Intel
-  build_wheel_macos_13:
-    runs-on: macos-13
+  # macos 14 is M1
+  build_wheel_macos_14:
+    runs-on: macos-14 
     strategy:
       matrix:
         python: [3.11]    
@@ -154,7 +153,7 @@ jobs:
       - name: Build wheel
         run: |
           python3 -m pip install cibuildwheel
-          python3 -m cibuildwheel --only cp311-macosx_x86_64 $GITHUB_WORKSPACE
+          python3 -m cibuildwheel --only cp311-macosx_arm64 $GITHUB_WORKSPACE
 
       - name: Install wheel
         run: |
@@ -167,38 +166,34 @@ jobs:
         run: |
           python3 -m pip install pytest
           python3 -m pytest $GITHUB_WORKSPACE
-            
-  # macos 14 is M1 (beta)
-  build_wheel_macos_14:
-    runs-on: macos-14 
-    strategy:
-      matrix:
-        python: [3.11]    
+
+  build_wheel_windows:
+    runs-on: windows-2019
     steps:
       - uses: actions/checkout@v4
 
       - name: Install correct python version
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python }}
+          python-version: 3.9
 
       - name: Build wheel
         run: |
-          python3 -m pip install cibuildwheel
-          python3 -m cibuildwheel --only cp311-macosx_arm64 $GITHUB_WORKSPACE
+          python -m pip install cibuildwheel
+          python -m cibuildwheel --only cp39-win_amd64 $GITHUB_WORKSPACE
 
       - name: Install wheel
         run: |
           ls wheelhouse
-          python3 --version
-          python3 -m pip install wheelhouse/*.whl
-          python3 -c "import highspy; print(dir(highspy))"
+          $item = Get-ChildItem wheelhouse
+          python -m pip install "$item"
+          python -c "import highspy; print(dir(highspy))"
 
       - name: Test highspy
         run: |
-          python3 -m pip install pytest
-          python3 -m pytest $GITHUB_WORKSPACE
-
+          python -m pip install pytest
+          python -m pytest 
+          
   build_wheel_windows:
     runs-on: windows-2019
     steps:
@@ -207,12 +202,12 @@ jobs:
       - name: Install correct python version
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.13
 
       - name: Build wheel
         run: |
           python -m pip install cibuildwheel
-          python -m cibuildwheel --only cp39-win_amd64 $GITHUB_WORKSPACE
+          python -m cibuildwheel --only cp313-win_amd64 $GITHUB_WORKSPACE
 
       - name: Install wheel
         run: |

diff --git a/.github/workflows/build-unit-tests-external.yml b/.github/workflows/build-unit-tests-external.yml
@@ -0,0 +1,128 @@
+name: build-unit-tests-external
+
+on: [push, pull_request]
+
+jobs: 
+  release_extra_only:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Clone extra unit tests repo 
+        shell: bash
+        working-directory: ${{runner.workspace}}
+        run: |
+          git clone https://github.com/galabovaa/highs-unit-tests.git
+
+      - name: Create symlink
+        shell: bash
+        working-directory: ${{runner.workspace}}
+        run: ln -s ${{runner.workspace}}/highs-unit-tests $GITHUB_WORKSPACE/check
+
+      - 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 -DBUILD_EXTRA_UNIT_TESTS=ON -DBUILD_EXTRA_UNIT_ONLY=ON -DBUILD_CXX=OFF
+
+      - name: Build All
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: |
+          cmake --build . --parallel
+
+      - name: Test Extra Only
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: ctest --parallel --timeout 300 --output-on-failure 
+
+  release_all_tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Clone extra unit tests repo 
+        shell: bash
+        working-directory: ${{runner.workspace}}
+        run: |
+          git clone https://github.com/galabovaa/highs-unit-tests.git
+
+      - name: Create symlink
+        shell: bash
+        working-directory: ${{runner.workspace}}
+        run: ln -s ${{runner.workspace}}/highs-unit-tests $GITHUB_WORKSPACE/check
+
+      - 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 -DALL_TESTS=ON -DBUILD_EXTRA_UNIT_TESTS=ON 
+
+      - name: Build All
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: |
+          cmake --build . --parallel 
+
+      - name: Test All
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: ctest --parallel --timeout 300 --output-on-failure 
+
+  # release__windows_extra_unit_tests:
+  #   runs-on: windows-2019
+
+  #   steps:
+  #     - uses: actions/checkout@v4
+
+  #     - name: Create Build Environment
+  #       run: cmake -E make_directory ${{runner.workspace}}/build
+
+  #     - name: Clone extra unit tests repo 
+  #       working-directory: ${{runner.workspace}}/build
+  #       run: git clone https://github.com/galabovaa/highs-unit-tests.git
+
+  #     - name: Create symlink
+  #       shell: bash
+  #       working-directory: $GITHUB_WORKSPACE/check
+  #       run: mklink /d highs-unit-tests ${{runner.workspace}}/highs-unit-tests
+
+  #     - 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 -DALL_TESTS=ON -DBUILD_EXTRA_UNIT_TESTS=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 Release --parallel
+
+  #     - name: Unit Test Extra
+  #       working-directory: ${{runner.workspace}}/build
+  #       shell: bash
+  #       run: ./bin/Release/unit_tests.exe highs-names-extra 
+
+  #     - 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 --timeout 300 --output-on-failure -C Release