Merge pull request #1641 from ERGO-Code/rel18-clean

Changes to highspy and cmake for release 1.8
ERGO-Code · Mar 4, 2024 · 8f477fc · 8f477fc
2 parents 2eab602 + 7721555
commit 8f477fc
Show file tree

Hide file tree

Showing 68 changed files with 2,799 additions and 2,087 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,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
@@ -37,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

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
@@ -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
@@ -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,6 +1,7 @@
 name: build-mingw
 
-on: [push, pull_request]
+# on: [push, pull_request]
+on: [pull_request]
 
 jobs:
   mingw:
@@ -41,7 +42,7 @@ jobs:
             ${{ matrix.target-prefix }}-cc
             ${{ matrix.target-prefix }}-ninja
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Configure CMake
         run: |

diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
@@ -27,10 +27,10 @@ jobs:
           - [macos-12, macosx_x86_64]
           - [macos-12, macosx_arm64]
           - [windows-2019, win_amd64]
-        python: ["cp38", "cp39","cp310", "cp311"]
+        python: ["cp38", "cp39","cp310", "cp311","cp312"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build wheels
         uses: pypa/[email protected]
         env:
@@ -43,7 +43,7 @@ jobs:
     name: Build source distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Build sdist
         shell: bash -l {0}

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         # Some projects don't allow in-source building, so create a separate build directory
@@ -47,7 +47,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         # Some projects don't allow in-source building, so create a separate build directory
@@ -81,7 +81,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         # Some projects don't allow in-source building, so create a separate build directory
@@ -115,7 +115,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         # Some projects don't allow in-source building, so create a separate build directory
@@ -149,7 +149,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         # Some projects don't allow in-source building, so create a separate build directory
@@ -183,7 +183,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Create Build Environment
         # Some projects don't allow in-source building, so create a separate build directory

diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: DoozyX/[email protected]
       with:
         source: 'app/ src/Highs.h ./src/lp_data ./src/mip ./src/model ./src/simplex ./src/presolve  ./src/simplex ./src/util ./src/test'

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -9,7 +9,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: julia-actions/setup-julia@latest
         with:
           version: '1.9'

diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml
@@ -10,7 +10,7 @@ jobs:
         os: [ubuntu-latest, macos-latest]
         sanitizer: [address, undefined, thread]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: "recursive"
           fetch-depth: 0

diff --git a/.github/workflows/test-c-example.yml b/.github/workflows/test-c-example.yml
@@ -6,10 +6,10 @@ name: test-c-example
 on: [push, pull_request]
 
 jobs:
-  build:
+  fast-build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Create Build Environment
         run: |
           mkdir build
@@ -23,14 +23,42 @@ jobs:
             -DCMAKE_BUILD_TYPE=Release \
             -DBUILD_SHARED_LIBS=ON \
             -DFAST_BUILD=ON \
-            -DIPX=OFF \
             $GITHUB_WORKSPACE
           cmake --build . --config Release --parallel
           make install
       - name: Compile and test C example
         shell: bash
         run: |
-          g++ $GITHUB_WORKSPACE/examples/call_highs_from_c.c \
+          gcc $GITHUB_WORKSPACE/examples/call_highs_from_c.c \
+            -o c_example \
+            -I installs/highs/include/highs \
+            -L installs/highs/lib -lhighs
+          LD_LIBRARY_PATH=installs/highs/lib ./c_example
+
+  fast-build-off:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Create Build Environment
+        run: |
+          mkdir build
+          mkdir installs
+      - name: Build HiGHS library
+        shell: bash
+        working-directory: build
+        run: |
+          cmake \
+            -DCMAKE_INSTALL_PREFIX=../installs/highs \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUILD_SHARED_LIBS=ON \
+            -DFAST_BUILD=OFF \
+            $GITHUB_WORKSPACE
+          cmake --build . --config Release --parallel
+          make install
+      - name: Compile and test C example
+        shell: bash
+        run: |
+          gcc $GITHUB_WORKSPACE/examples/call_highs_from_c.c \
             -o c_example \
             -I installs/highs/include/highs \
             -L installs/highs/lib -lhighs