Merge pull request #1651 from ERGO-Code/latest

Merge latest for release
ERGO-Code · Mar 7, 2024 · 50670fd · 50670fd
2 parents dd4a9a2 + 8dd3fbb
commit 50670fd
Show file tree

Hide file tree

Showing 356 changed files with 18,120 additions and 10,632 deletions.
diff --git a/.github/workflows/build-bazel.yml b/.github/workflows/build-bazel.yml
@@ -10,7 +10,7 @@ jobs:
         os: [macos-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: bazelbuild/setup-bazelisk@v2
 

diff --git a/.github/workflows/build-clang.yml b/.github/workflows/build-clang.yml
@@ -10,7 +10,7 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build
@@ -34,7 +34,7 @@ jobs:
         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 2 --timeout 300 --output-on-failure -C $BUILD_TYPE
+        run: ctest --parallel 2 --timeout 300 --output-on-failure 
 
   release:
     runs-on: ${{ matrix.os }}
@@ -43,7 +43,7 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build
@@ -76,7 +76,7 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build
@@ -100,7 +100,7 @@ jobs:
         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 2 --timeout 300 --output-on-failure -C $BUILD_TYPE
+        run: ctest --parallel 2 --timeout 300 --output-on-failure 
 
   release64:
     runs-on: ${{ matrix.os }}
@@ -109,7 +109,7 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build

diff --git a/.github/workflows/build-fast.yml b/.github/workflows/build-fast.yml
@@ -10,16 +10,15 @@ jobs:
         os: [macOS-latest]
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build
 
       - name: Configure CMake
         shell: bash
         working-directory: ${{runner.workspace}}/build
-        run: cmake -DFAST_BUILD=ON -DEXP=ON $GITHUB_WORKSPACE
+        run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DCMAKE_BUILD_TYPE=RELEASE
 
       - name: Build
         working-directory: ${{runner.workspace}}/build
@@ -29,21 +28,7 @@ jobs:
       - name: Test
         working-directory: ${{runner.workspace}}/build
         shell: bash
-        run: ctest
-
-      # disable for now, py11 changes broke it. something trivial but 
-      # not necessary, that was proof of concept. leaving here for now.
-      # - name: Doctest
-      #   working-directory: ${{runner.workspace}}/build
-      #   shell: bash
-      #   run: ./bin/doctest
-
-      - name: Install
-        run: |
-          cmake -E make_directory ${{runner.workspace}}/install \
-          cmake -DFAST_BUILD=ON -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install $GITHUB_WORKSPACE \
-          cmake --build . --parallel \
-          cmake --install . \
+        run: ctest --parallel --timeout 300 --output-on-failure -C RELEASE
 
   fast-build-debug:
     runs-on: ${{ matrix.os }}
@@ -52,7 +37,7 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build
@@ -66,7 +51,7 @@ jobs:
         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
+        run: cmake --build . --parallel
 
       - name: Test
         working-directory: ${{runner.workspace}}/build

diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -10,7 +10,7 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build
@@ -32,7 +32,7 @@ jobs:
         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 2 --timeout 300 --output-on-failure -C $BUILD_TYPE
+        run: ctest --parallel 2 --timeout 300 --output-on-failure 
 
   release:
     runs-on: ${{ matrix.os }}
@@ -41,7 +41,7 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build
@@ -72,7 +72,7 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build
@@ -103,7 +103,7 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -1,6 +1,6 @@
 name: build-macos
 
-on: [pull_request]
+on: [push, pull_request]
 
 jobs:
   debug:
@@ -10,7 +10,7 @@ jobs:
         os: [macos-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build
@@ -32,7 +32,7 @@ jobs:
         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 2 --timeout 300 --output-on-failure -C $BUILD_TYPE
+        run: ctest --parallel 2 --timeout 300 --output-on-failure 
 
   release:
     runs-on: ${{ matrix.os }}
@@ -41,7 +41,7 @@ jobs:
         os: [macos-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build
@@ -72,7 +72,7 @@ jobs:
         os: [macos-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build
@@ -103,7 +103,7 @@ jobs:
         os: [macos-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build

diff --git a/.github/workflows/build-meson.yml b/.github/workflows/build-meson.yml
@@ -1,4 +1,4 @@
-name: Meson Builds with Conda
+name: build-meson
 on: [push, pull_request]
 
 jobs:
@@ -8,7 +8,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest] # windows-latest takes to long
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: "recursive"
           fetch-depth: 0
@@ -33,11 +33,15 @@ jobs:
         run: |
           meson setup bbdir -Duse_zlib=enabled -Dwith_tests=True
           meson test -C bbdir
-      - name: Test compiled highspy
-        shell: bash -l {0}
-        run: |
-          meson configure bbdir -Dwith_pybind11=True
-          meson compile -C bbdir
-          LD_LIBRARY_PATH=$(pwd)/bbdir/src \
-          PYTHONPATH=$(pwd)/bbdir \
-          python examples/call_highs_from_python.py
+      
+      # highspy no longer compiled with meson, back to 
+      # setuptools and CMakeBuild
+      # todo: use it optionally in some way
+      # - name: Test compiled highspy
+      #   shell: bash -l {0}
+      #   run: |
+      #     meson configure bbdir -Dwith_pybind11=True
+      #     meson compile -C bbdir
+      #     LD_LIBRARY_PATH=$(pwd)/bbdir/src \
+      #     PYTHONPATH=$(pwd)/bbdir \
+      #     python examples/call_highs_from_python.py
diff --git a/.github/workflows/build-mingw.yml b/.github/workflows/build-mingw.yml
@@ -1,5 +1,6 @@
 name: build-mingw
 
+# on: [push, pull_request]
 on: [pull_request]
 
 jobs:
@@ -41,12 +42,12 @@ jobs:
             ${{ matrix.target-prefix }}-cc
             ${{ matrix.target-prefix }}-ninja
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Configure CMake
         run: |
           mkdir build && cd build
-          cmake .. -DFAST_BUILD=${{ matrix.fast-build }} -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DHIGHSINT64=${{ matrix.int64 }}
+          cmake .. -DFAST_BUILD=${{ matrix.fast-build }} -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DHIGHSINT64=${{ matrix.int64 }} -DHIGHS_NO_DEFAULT_THREADS=ON
 
       - name: Build
         # Execute the build.  You can specify a specific target with "--target <NAME>"