Merge pull request #1305 from ERGO-Code/latest

Latest
ERGO-Code · May 27, 2023 · 45a127b · 45a127b
2 parents e6fe8a7 + 975dfc3
commit 45a127b
Show file tree

Hide file tree

Showing 331 changed files with 12,763 additions and 8,353 deletions.
diff --git a/.github/workflows/build-bazel.yml b/.github/workflows/build-bazel.yml
@@ -19,7 +19,13 @@ jobs:
         with:
           path: "~/.cache/bazel"
           key: bazel
-      - run: bazel build //...
 
+      - name: bazel clean
+        run: bazel clean
+
+      - name: build bazel
+        run: |
+          bazel build //...
+      
       - name: test
-      - run: ./bazel-bin/examples/call_highs_example
+        run: ./bazel-bin/call-highs-example
diff --git a/.github/workflows/build-fast.yml b/.github/workflows/build-fast.yml
@@ -31,10 +31,12 @@ jobs:
         shell: bash
         run: ctest
 
-      - name: Doctest
-        working-directory: ${{runner.workspace}}/build
-        shell: bash
-        run: ./bin/doctest
+      # 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: |

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Configure CMake
         shell: bash
         working-directory: ${{runner.workspace}}/build
-        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DFAST_BUILD=OFF
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug 
 
       - name: Build
         working-directory: ${{runner.workspace}}/build
@@ -49,7 +49,7 @@ jobs:
       - name: Configure CMake
         shell: bash
         working-directory: ${{runner.workspace}}/build
-        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DFAST_BUILD=OFF
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release 
 
       - name: Build
         working-directory: ${{runner.workspace}}/build

diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macOS-10.15] #  windows-2019 ubuntu-20.04,
+        os: [macOS-12] #  windows-2019 ubuntu-20.04,
 
     steps:
       - uses: actions/checkout@v3
@@ -50,7 +50,7 @@ jobs:
 
       - name: Build wheels
         run: |
-          cd  $GITHUB_WORKSPACE/src/interfaces/highspy
+          cd  $GITHUB_WORKSPACE
           export REPAIR_LIBRARY_PATH=${{runner.workspace}}/installs/highs/lib
           export LD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH
           export DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -0,0 +1,19 @@
+name: Documentation
+on:
+  push:
+    branches: [latest]
+    tags: '*'
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: julia-actions/setup-julia@latest
+        with:
+          version: '1.6'
+      - name: Build and deploy
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: julia --project=docs/ docs/make.jl
diff --git a/.github/workflows/test-c-example.yml b/.github/workflows/test-c-example.yml
@@ -13,13 +13,13 @@ jobs:
       - name: Create Build Environment
         run: |
           mkdir build
-          mkdir install
+          mkdir installs
       - name: Build HiGHS library
         shell: bash
         working-directory: build
         run: |
           cmake \
-            -DCMAKE_INSTALL_PREFIX=../install \
+            -DCMAKE_INSTALL_PREFIX=../installs/highs \
             -DCMAKE_BUILD_TYPE=Release \
             -DBUILD_SHARED_LIBS=ON \
             -DFAST_BUILD=ON \
@@ -32,6 +32,6 @@ jobs:
         run: |
           g++ $GITHUB_WORKSPACE/examples/call_highs_from_c.c \
             -o c_example \
-            -I install/include/highs \
-            -L install/lib -lhighs
-          LD_LIBRARY_PATH=install/lib ./c_example
+            -I installs/highs/include/highs \
+            -L installs/highs/lib -lhighs
+          LD_LIBRARY_PATH=installs/highs/lib ./c_example
diff --git a/.github/workflows/test-python-api-mac.yml b/.github/workflows/test-python-api-mac.yml
@@ -0,0 +1,51 @@
+name: test-python-api-mac
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest]
+        python: [3.9]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Create Build Environment
+        run: cmake -E make_directory ${{runner.workspace}}/build
+
+      - name: Create Install dir
+        run: cmake -E make_directory ${{runner.workspace}}/installs
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{runner.workspace}}/build
+        run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DBUILD_SHARED_LIBS=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 . --parallel 
+          cmake --install .
+
+      - name: Install correct python version
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python }}
+
+      - name: Install Python Dependencies
+        shell: bash
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install pybind11 numpy pyomo pytest 
+
+      - name: Test Python Interface
+        shell: bash
+        working-directory: ${{runner.workspace}}
+        run: |
+          pip install -e ./HiGHS
+          pytest -v ./HiGHS/highspy/tests/
diff --git a/.github/workflows/test-python-api.yml → .github/workflows/test-python-api-ubuntu.yml b/.github/workflows/test-python-api.yml → .github/workflows/test-python-api-ubuntu.yml
@@ -1,4 +1,4 @@
-name: test-python-api
+name: test-python-api-ubuntu
 
 on: [push, pull_request]
 
@@ -16,7 +16,7 @@ jobs:
       - name: Create Build Environment
         run: cmake -E make_directory ${{runner.workspace}}/build
 
-      - name: Create Install Directory
+      - name: Create Install dir
         run: cmake -E make_directory ${{runner.workspace}}/installs
 
       - name: Configure CMake
@@ -29,8 +29,8 @@ jobs:
         shell: bash
         # Execute the build.  You can specify a specific target with "--target <NAME>"
         run: |
-          cmake --build . --parallel --config Release
-          make install
+          cmake --build . --parallel 
+          cmake --install .
           HIGHS_LIB_DIR=${{runner.workspace}}/installs/highs/lib
           echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HIGHS_LIB_DIR" >> $GITHUB_ENV
           echo "DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$HIGHS_LIB_DIR" >> $GITHUB_ENV
@@ -44,11 +44,11 @@ jobs:
         shell: bash
         run: |
           python -m pip install --upgrade pip
-          python -m pip install pybind11 numpy pyomo nose pip
+          python -m pip install pybind11 numpy pyomo pytest 
 
       - name: Test Python Interface
         shell: bash
         working-directory: ${{runner.workspace}}
         run: |
-          pip install -e ./HiGHS/src/interfaces/highspy/
-          nosetests -v ./HiGHS/src/interfaces/highspy/
+          pip install -e ./HiGHS
+          pytest -v ./HiGHS/highspy/tests/
diff --git a/.github/workflows/test-python-api-win.yml b/.github/workflows/test-python-api-win.yml
@@ -0,0 +1,55 @@
+name: test-python-api-win
+
+on: []
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-latest]
+        python: [3.9]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Create Build Environment
+        run: cmake -E make_directory ${{runner.workspace}}/build
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{runner.workspace}}/build
+        run: cmake $GITHUB_WORKSPACE -DFAST_BUILD=ON -DBUILD_SHARED_LIBS=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 . --parallel --config Release
+          cmake --install .
+
+        # $Env:HIGHS_LIB_DIR=${{runner.workspace}}/build/highs/lib
+        # $Env:Path=$Env:Path+";"+ $Env:HIGHS_LIB_DIR
+        # $Env:LIBPATH=$Env:LIBPATH+";"+ $Env:HIGHS_LIB_DIR
+        # $Env:PYTHONPATH=$Env:PYTHONPATH+";"+ $Env:HIGHS_LIB_DIR
+        # echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HIGHS_LIB_DIR" >> $GITHUB_ENV
+        # echo "DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$HIGHS_LIB_DIR" >> $GITHUB_ENV
+
+      - name: Install correct python version
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python }}
+
+      - name: Install Python Dependencies
+        shell: bash
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install pybind11 numpy pyomo pytest 
+
+      - name: Test Python Interface
+        shell: bash
+        working-directory: ${{runner.workspace}}
+        run: |
+          pip install -e ./HiGHS
+          pytest -v ./HiGHS/highspy/tests/
diff --git a/.github/workflows/test-python-platforms.yml b/.github/workflows/test-python-platforms.yml
@@ -50,5 +50,5 @@ jobs:
         shell: bash
         working-directory: ${{runner.workspace}}
         run: |
-          pip install -e ./HiGHS/src/interfaces/highspy/
-          nosetests -v ./HiGHS/src/interfaces/highspy/
+          pip install -e ./HiGHS
+          nosetests -v ./HiGHS
diff --git a/.gitignore b/.gitignore
@@ -243,7 +243,7 @@ pip-log.txt
 #SCIP interface
 lpi_highs.cpp
 
-src/interfaces/highspy/highspy/highs_bindings.*.so
+highspy/highs_bindings.*.so
 
 # Model written with HiGHSDEV=on
 HighsRunModel.mps
@@ -268,4 +268,4 @@ qjh.mps
 bazel*
 
 # webdemo
-build_webdemo
+build_webdemo
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_cc//cc:defs.bzl", "cc_library")
+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_binary")
 load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
 
 copy_file(
@@ -66,3 +66,12 @@ cc_library(
         "@zlib",
     ],
 )
+
+cc_binary(
+    name = "call-highs-example",
+    srcs= ["examples/call_highs_from_cpp.cpp"],
+    deps = [
+        "//:highs",
+    ],
+    visibility = ["//visibility:public"]
+)