[YJ] knitro branch sqaush

google · Oct 24, 2024 · 4f4a07b · 4f4a07b
1 parent eaeb85a
commit 4f4a07b
Show file tree

Hide file tree

Showing 70 changed files with 7,611 additions and 494 deletions.
diff --git a/.github/workflows/aarch64_toolchain.yml → .github/not_used/aarch64_toolchain.yml b/.github/workflows/aarch64_toolchain.yml → .github/not_used/aarch64_toolchain.yml
diff --git a/.github/workflows/amd64_cmake_glop_cpp.yml → .github/not_used/amd64_cmake_glop_cpp.yml b/.github/workflows/amd64_cmake_glop_cpp.yml → .github/not_used/amd64_cmake_glop_cpp.yml
diff --git a/.github/workflows/amd64_docker_bazel.yml → .github/not_used/amd64_docker_bazel.yml b/.github/workflows/amd64_docker_bazel.yml → .github/not_used/amd64_docker_bazel.yml
diff --git a/.github/workflows/amd64_docker_cmake.yml → .github/not_used/amd64_docker_cmake.yml b/.github/workflows/amd64_docker_cmake.yml → .github/not_used/amd64_docker_cmake.yml
diff --git a/.github/workflows/amd64_freebsd_cmake.yml → .github/not_used/amd64_freebsd_cmake.yml b/.github/workflows/amd64_freebsd_cmake.yml → .github/not_used/amd64_freebsd_cmake.yml
diff --git a/.github/workflows/amd64_linux_bazel.yml → .github/not_used/amd64_linux_bazel.yml b/.github/workflows/amd64_linux_bazel.yml → .github/not_used/amd64_linux_bazel.yml
diff --git a/...orkflows/amd64_linux_cmake_coinor_off.yml → ...not_used/amd64_linux_cmake_coinor_off.yml b/...orkflows/amd64_linux_cmake_coinor_off.yml → ...not_used/amd64_linux_cmake_coinor_off.yml
diff --git a/...ub/workflows/amd64_linux_cmake_dotnet.yml → ...hub/not_used/amd64_linux_cmake_dotnet.yml b/...ub/workflows/amd64_linux_cmake_dotnet.yml → ...hub/not_used/amd64_linux_cmake_dotnet.yml
diff --git a/.../workflows/amd64_linux_cmake_scip_off.yml → ...b/not_used/amd64_linux_cmake_scip_off.yml b/.../workflows/amd64_linux_cmake_scip_off.yml → ...b/not_used/amd64_linux_cmake_scip_off.yml
diff --git a/.github/workflows/amd64_macos_bazel.yml → .github/not_used/amd64_macos_bazel.yml b/.github/workflows/amd64_macos_bazel.yml → .github/not_used/amd64_macos_bazel.yml
diff --git a/.github/workflows/amd64_macos_cmake_cpp.yml → .github/not_used/amd64_macos_cmake_cpp.yml b/.github/workflows/amd64_macos_cmake_cpp.yml → .github/not_used/amd64_macos_cmake_cpp.yml
diff --git a/...ub/workflows/amd64_macos_cmake_dotnet.yml → ...hub/not_used/amd64_macos_cmake_dotnet.yml b/...ub/workflows/amd64_macos_cmake_dotnet.yml → ...hub/not_used/amd64_macos_cmake_dotnet.yml
diff --git a/.github/workflows/amd64_macos_cmake_java.yml → .github/not_used/amd64_macos_cmake_java.yml b/.github/workflows/amd64_macos_cmake_java.yml → .github/not_used/amd64_macos_cmake_java.yml
diff --git a/...ub/workflows/amd64_macos_cmake_python.yml → ...hub/not_used/amd64_macos_cmake_python.yml b/...ub/workflows/amd64_macos_cmake_python.yml → ...hub/not_used/amd64_macos_cmake_python.yml
diff --git a/.../workflows/amd64_windows_cmake_dotnet.yml → ...b/not_used/amd64_windows_cmake_dotnet.yml b/.../workflows/amd64_windows_cmake_dotnet.yml → ...b/not_used/amd64_windows_cmake_dotnet.yml
diff --git a/.github/not_used/amd64_windows_cmake_java.yml b/.github/not_used/amd64_windows_cmake_java.yml
@@ -0,0 +1,75 @@
+# ref: https://github.com/actions/runner-images
+name: amd64 Windows CMake Java
+
+on: [push, pull_request, workflow_dispatch]
+
+# Building using the github runner environement directly.
+jobs:
+  native:
+    strategy:
+      matrix:
+        cmake: [
+          {generator: "Visual Studio 17 2022", config: Release, build_target: ALL_BUILD, test_target: RUN_TESTS, install_target: INSTALL},
+        ]
+        java: [
+          # see https://endoflife.date/azul-zulu
+          {distrib: 'zulu', version: '8'}, # 2030/12
+          {distrib: 'zulu', version: '11'}, # 2026/09
+          {distrib: 'zulu', version: '17'}, # 2029/09
+          {distrib: 'zulu', version: '21'}, # 2031/09
+          # see https://endoflife.date/eclipse-temurin
+          {distrib: 'temurin', version: '8'}, # 2026/11
+          {distrib: 'temurin', version: '11'}, # 2027/10
+          {distrib: 'temurin', version: '17'}, # 2027/10
+          {distrib: 'temurin', version: '21'}, # 2029/12
+          # see https://endoflife.date/microsoft-build-of-openjdk
+          {distrib: 'microsoft', version: '11'}, # 2027/09
+          {distrib: 'microsoft', version: '17'}, # 2027/09
+          {distrib: 'microsoft', version: '21'}, # 2028/09
+        ]
+      fail-fast: false
+    name: Windows • ${{ matrix.cmake.generator }} • ${{ matrix.java.distrib }}-${{ matrix.java.version }}
+    runs-on: windows-latest
+    env:
+      CTEST_OUTPUT_ON_FAILURE: 1
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: ${{ matrix.java.distrib }}
+          java-version: ${{ matrix.java.version }}
+      - name: Update maven
+        run: |
+          choco upgrade maven
+          echo "C:\ProgramData\chocolatey\lib\maven\apache-maven-3.9.9\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      - name: Check java
+        run: |
+          java -version
+          mvn --version
+      - name: Check cmake
+        run: cmake --version
+      - name: Configure
+        run: >
+          cmake -S. -Bbuild
+          -G "${{ matrix.cmake.generator }}"
+          -DCMAKE_BUILD_TYPE=${{ matrix.cmake.config }}
+          -DBUILD_CXX_SAMPLES=OFF -DBUILD_CXX_EXAMPLES=OFF
+          -DBUILD_JAVA=ON
+      - name: Build
+        run: >
+          cmake --build build
+          --config ${{ matrix.cmake.config }}
+          --target ${{ matrix.cmake.build_target }}
+          -v -j2
+      - name: Test
+        run: >
+          cmake --build build
+          --config ${{ matrix.cmake.config }}
+          --target ${{ matrix.cmake.test_target }}
+          -v
+      - name: Install
+        run: >
+          cmake --build build
+          --config ${{ matrix.cmake.config }}
+          --target ${{ matrix.cmake.install_target }}
+          -v
diff --git a/.../workflows/amd64_windows_cmake_python.yml → ...b/not_used/amd64_windows_cmake_python.yml b/.../workflows/amd64_windows_cmake_python.yml → ...b/not_used/amd64_windows_cmake_python.yml
diff --git a/.github/workflows/amd64_windows_bazel.yml → .github/not_used/arm64_macos_bazel.yml b/.github/workflows/amd64_windows_bazel.yml → .github/not_used/arm64_macos_bazel.yml
@@ -1,5 +1,5 @@
 # ref: https://github.com/actions/runner-images
-name: amd64 Windows Bazel
+name: arm64 MacOS Bazel
 
 on: [push, pull_request, workflow_dispatch]
 
@@ -8,24 +8,22 @@ jobs:
   native:
     strategy:
       matrix:
-        runner: [windows-2022]
         python: [
           {version: '3.10'},
           {version: '3.11'},
           {version: '3.12'},
           {version: '3.13'},
         ]
-      fail-fast: false # Don't cancel all jobs if one fails.
-    name: ${{ matrix.runner }} • Bazel • Python-${{ matrix.python.version }}
-    runs-on: ${{ matrix.runner }}
+      fail-fast: false
+    name: MacOS • Bazel • Python-${{ matrix.python.version }}
+    runs-on: macos-latest # macos arm64 based runner
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v3
+      - name: Set Java to OpenJDK 17 (Temurin)
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '17'
-      - name: Check java
-        run: java -version
       - name: Check mvn
         run: mvn --version
       - name: Setup Python
@@ -34,10 +32,14 @@ jobs:
           python-version: ${{ matrix.python.version }}
       - name: Check Python
         run: python --version
-      - name: Install Bazel
-        run: choco install bazel
       - name: Check Bazel
         run: bazel version
+      - name: Change Python in WORKSPACE
+        run: >
+          sed
+          -i ''
+          -e 's/\(DEFAULT_PYTHON =\) "3.[0-9]*"/\1 "${{ matrix.python.version }}"/g'
+          WORKSPACE
       - name: Build
         run: >
           bazel build

diff --git a/.github/not_used/arm64_macos_cmake_cpp.yml b/.github/not_used/arm64_macos_cmake_cpp.yml
@@ -0,0 +1,47 @@
+# ref: https://github.com/actions/runner-images
+name: arm64 MacOS CMake C++
+
+on: [push, pull_request, workflow_dispatch]
+
+# Building using the github runner environement directly.
+jobs:
+  native:
+    strategy:
+      matrix:
+        cmake: [
+          {generator: "Xcode", config: Release, build_target: ALL_BUILD, test_target: RUN_TESTS, install_target: install},
+          {generator: "Unix Makefiles", config: Release, build_target: all, test_target: test, install_target: install},
+        ]
+      fail-fast: false
+    name: MacOS • ${{ matrix.cmake.generator }} • C++
+    runs-on: macos-latest # macos arm64 based runner
+    steps:
+      - uses: actions/checkout@v4
+      - name: Check cmake
+        run: cmake --version
+      - name: Configure
+        run: >
+          cmake -S. -Bbuild
+          -G "${{ matrix.cmake.generator }}"
+          -DCMAKE_BUILD_TYPE=${{ matrix.cmake.config }}
+          -DBUILD_DEPS=ON
+          -DCMAKE_INSTALL_PREFIX=install
+      - name: Build
+        run: >
+          cmake --build build
+          --config ${{ matrix.cmake.config }}
+          --target ${{ matrix.cmake.build_target }}
+          -v -j2
+      - name: Test
+        run: >
+          CTEST_OUTPUT_ON_FAILURE=1
+          cmake --build build
+          --config ${{ matrix.cmake.config }}
+          --target ${{ matrix.cmake.test_target }}
+          -v
+      - name: Install
+        run: >
+          cmake --build build
+          --config ${{ matrix.cmake.config }}
+          --target ${{ matrix.cmake.install_target }}
+          -v
diff --git a/.github/not_used/arm64_macos_cmake_dotnet.yml b/.github/not_used/arm64_macos_cmake_dotnet.yml
@@ -0,0 +1,58 @@
+# ref: https://github.com/actions/runner-images
+name: arm64 MacOS CMake .Net
+
+on: [push, pull_request, workflow_dispatch]
+
+# Building using the github runner environement directly.
+jobs:
+  native:
+    strategy:
+      matrix:
+        cmake: [
+          {generator: "Xcode", config: Release, build_target: ALL_BUILD, test_target: RUN_TESTS, install_target: install},
+          {generator: "Unix Makefiles", config: Release, build_target: all, test_target: test, install_target: install},
+        ]
+      fail-fast: false
+    name: MacOS • ${{ matrix.cmake.generator }} • .Net
+    runs-on: macos-latest # macos arm64 based runner
+    steps:
+      - uses: actions/checkout@v4
+      - name: Swig install
+        run: |
+          brew install swig
+          swig -version
+      - name: Setup .NET 6.0
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 6.0.x
+      - name: Check dotnet
+        run: dotnet --info
+      - name: Check cmake
+        run: cmake --version
+      - name: Configure
+        run: >
+          cmake -S. -Bbuild
+          -G "${{ matrix.cmake.generator }}"
+          -DCMAKE_BUILD_TYPE=${{ matrix.cmake.config }}
+          -DBUILD_CXX_SAMPLES=OFF -DBUILD_CXX_EXAMPLES=OFF
+          -DBUILD_DOTNET=ON
+          -DCMAKE_INSTALL_PREFIX=install
+      - name: Build
+        run: >
+          cmake --build build
+          --config ${{ matrix.cmake.config }}
+          --target ${{ matrix.cmake.build_target }}
+          -v -j2
+      - name: Test
+        run: >
+          CTEST_OUTPUT_ON_FAILURE=1
+          cmake --build build
+          --config ${{ matrix.cmake.config }}
+          --target ${{ matrix.cmake.test_target }}
+          -v
+      - name: Install
+        run: >
+          cmake --build build
+          --config ${{ matrix.cmake.config }}
+          --target ${{ matrix.cmake.install_target }}
+          -v
diff --git a/.github/not_used/arm64_macos_cmake_java.yml b/.github/not_used/arm64_macos_cmake_java.yml
@@ -0,0 +1,55 @@
+# ref: https://github.com/actions/runner-images
+name: arm64 MacOS CMake Java
+
+on: [push, pull_request, workflow_dispatch]
+
+# Building using the github runner environement directly.
+jobs:
+  native:
+    strategy:
+      matrix:
+        cmake: [
+          {generator: "Xcode", config: Release, build_target: ALL_BUILD, test_target: RUN_TESTS, install_target: install},
+          {generator: "Unix Makefiles", config: Release, build_target: all, test_target: test, install_target: install},
+        ]
+      fail-fast: false
+    name: MacOS • ${{ matrix.cmake.generator }} • Java
+    runs-on: macos-latest # macos arm64 based runner
+    steps:
+      - uses: actions/checkout@v4
+      - name: Swig install
+        run: |
+          brew install swig
+          swig -version
+      - name: Check java
+        run: java -version
+      - name: Check cmake
+        run: cmake --version
+      - name: Configure
+        run: >
+          cmake -S. -Bbuild
+          -G "${{ matrix.cmake.generator }}"
+          -DCMAKE_BUILD_TYPE=${{ matrix.cmake.config }}
+          -DBUILD_CXX_SAMPLES=OFF -DBUILD_CXX_EXAMPLES=OFF
+          -DBUILD_JAVA=ON -DSKIP_GPG=ON
+          -DCMAKE_INSTALL_PREFIX=install
+      - name: Build
+        run: >
+          cmake --build build
+          --config ${{ matrix.cmake.config }}
+          --target ${{ matrix.cmake.build_target }}
+          -v -j2
+      - name: Test
+        run: >
+          CTEST_OUTPUT_ON_FAILURE=1
+          cmake --build build
+          --config ${{ matrix.cmake.config }}
+          --target ${{ matrix.cmake.test_target }}
+          -v
+      - name: Install
+        run: >
+          cmake --build build
+          --config ${{ matrix.cmake.config }}
+          --target ${{ matrix.cmake.install_target }}
+          -v
+          
diff --git a/...ub/workflows/amd64_linux_cmake_python.yml → ...hub/not_used/arm64_macos_cmake_python.yml b/...ub/workflows/amd64_linux_cmake_python.yml → ...hub/not_used/arm64_macos_cmake_python.yml
@@ -1,5 +1,5 @@
 # ref: https://github.com/actions/runner-images
-name: amd64 Linux CMake Python
+name: arm64 MacOS CMake Python
 
 on: [push, pull_request, workflow_dispatch]
 
@@ -9,8 +9,7 @@ jobs:
     strategy:
       matrix:
         cmake: [
-          {generator: "Ninja", config: Release, build_target: all, test_target: test, install_target: install},
-          {generator: "Ninja Multi-Config", config: Release, build_target: all, test_target: test, install_target: install},
+          {generator: "Xcode", config: Release, build_target: ALL_BUILD, test_target: RUN_TESTS, install_target: install},
           {generator: "Unix Makefiles", config: Release, build_target: all, test_target: test, install_target: install},
         ]
         python: [
@@ -21,24 +20,22 @@ jobs:
           {version: "3.13"},
         ]
       fail-fast: false
-    name: Linux • ${{ matrix.cmake.generator }} • Python-${{ matrix.python.version }}
-    runs-on: ubuntu-latest
+    name: MacOS • ${{ matrix.cmake.generator }} • Python-${{ matrix.python.version }}
+    runs-on: macos-latest # macos arm64 based runner
     steps:
       - uses: actions/checkout@v4
-      - name: Install Ninja
-        run: |
-          sudo apt update
-          sudo apt install -y ninja-build
       - name: Swig install
         run: |
-          sudo apt install -y swig
+          brew install swig
           swig -version
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python.version }}
       - name: Update Path
-        run: echo "$HOME/.local/bin" >> $GITHUB_PATH
+        run: |
+          echo "$HOME/Library/Python/${{ matrix.python.version }}/bin" >> $GITHUB_PATH
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
       - name: Check cmake
         run: cmake --version
       - name: Configure

diff --git a/.github/workflows/mips_toolchain.yml → .github/not_used/mips_toolchain.yml b/.github/workflows/mips_toolchain.yml → .github/not_used/mips_toolchain.yml
diff --git a/.github/workflows/powerpc_toolchain.yml → .github/not_used/powerpc_toolchain.yml b/.github/workflows/powerpc_toolchain.yml → .github/not_used/powerpc_toolchain.yml
diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile
diff --git a/.github/workflows/amd64_linux_cmake_cpp.yml b/.github/workflows/amd64_linux_cmake_cpp.yml
@@ -6,6 +6,10 @@ on: [push, pull_request, workflow_dispatch]
 # Building using the github runner environement directly.
 jobs:
   native:
+    env:
+      KNITRODIR: ${{ github.workspace }}/knitro_distrib/knitro-14.0.0-Linux64
+      ARTELYS_LICENSE: ${{ github.workspace }}/knitro_distrib
+      OR_ROOT: ${{ github.workspace }}
     strategy:
        matrix:
          cmake: [
@@ -18,6 +22,35 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Checkout Knitro Linux
+        uses: actions/checkout@v4
+        with:
+          repository: yojvr/knitro1400-Linux64
+          path: knitro_distrib
+          token: ${{ secrets.KNITRO_DISTRIB }}
+      - name: Untar large files
+        run: |
+          cd ${{ env.KNITRODIR }}
+          cd knitromatlab
+          tar -xzf knitromatlab_mex.mexa64.tar.gz
+          rm knitromatlab_mex.mexa64.tar.gz
+          cd ../knitroampl
+          tar -xzf knitroampl.tar.gz
+          rm knitroampl.tar.gz
+          cd ../lib
+          tar -xzf libknitro1400.a.tar.gz
+          tar -xzf libknitro1400.so.tar.gz
+          rm libknitro1400.*.tar.gz
+      - name: Copy license
+        run: |
+          echo "${{ secrets.KNITRO_DISTRIB_LICENSE }}" >> ${{ env.ARTELYS_LICENSE }}/artelys_lic_cicd.txt
+      - name: Check Knitro install
+        run: |
+          ls -l ${{ env.ARTELYS_LICENSE }}
+          ls -l ${{ env.KNITRODIR }}
+          ls -l ${{ env.KNITRODIR }}/lib
+          ls -l ${{ env.KNITRODIR }}/knitroampl
+          ls -l ${{ env.KNITRODIR }}/knitromatlab
       - name: Install Ninja
         run: |
           sudo apt-get update