OR-Tools Integration & C++17 upgrade

.github/workflows/ci.yml

@@ -7,6 +7,7 @@ on:
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
+  GTEST_REF: b85864c64758dec007208e56af933fc3f52044ee
 
 jobs:
   build-on-ubuntu:
@@ -26,24 +27,53 @@ jobs:
         echo "GTEST=$GTEST" >> $GITHUB_ENV
         SSCDIR=$GITHUB_WORKSPACE/ssc
         echo "SSCDIR=$SSCDIR" >> $GITHUB_ENV
+        ORTOOLSDIR=$GITHUB_WORKSPACE/or-tools
+        echo "ORTOOLSDIR=$ORTOOLSDIR" >> $GITHUB_ENV
 
+    - name: Get cached OR-Tools
+      uses: actions/cache@v4
+      id: cachedortools
+      with:
+        path: ${{env.ORTOOLSDIR}}/
+        key: ortools-ubuntu
+
+    - name: Download OR-Tools
+      if: steps.cachedortools.outputs.cache-hit != 'true'
+      run: |
+          sudo apt update
+          sudo apt install -y build-essential cmake lsb-release
+          cd $GITHUB_WORKSPACE
+          wget -q https://github.com/google/or-tools/releases/download/v9.9/or-tools_amd64_ubuntu-23.04_cpp_v9.9.3963.tar.gz
+          tar -xvf or-tools_amd64_ubuntu-23.04_cpp_v9.9.3963.tar.gz
+          mkdir or-tools
+          mv or-tools*/* or-tools
+
+    - name: Get cached GTest
+      uses: actions/cache@v4
+      id: cachedgtest
+      with:
+        path: ${{env.GTEST}}/
+        key: gtest-ubuntu
+
     - name: Clone Gtest
-      uses: actions/checkout@v2
+      if: steps.cachedgtest.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
       with:
         repository: google/googletest
         path: googletest
-        ref: b85864c64758dec007208e56af933fc3f52044ee
+        ref: ${{env.GTEST_REF}}
 
     - name: build Gtest
+      if: steps.cachedgtest.outputs.cache-hit != 'true'
       run: | 
           export 
           mkdir ${GTEST}/build
           cd ${GTEST}/build
           cmake -DCMAKE_CXX_FLAGS=-std=c++11 ..
           make          
-    
+
     - name: Checkout SSC
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
          path: ssc
 
@@ -52,7 +82,7 @@ jobs:
       run: |
         mkdir ${SSCDIR}/build
         cd ${SSCDIR}/build
-        cmake .. -DCMAKE_BUILD_TYPE=Release -DSAM_SKIP_TOOLS=1
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DSAM_SKIP_TOOLS=1 -DCMAKE_INSTALL_PREFIX=${ORTOOLSDIR}
 
     - name: Build
       # Build your program with the given configuration
@@ -68,7 +98,7 @@ jobs:
         ${SSCDIR}/build/test/Test
 
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
       with:
           name: SSC Linux Shared Libraries
           path: |
@@ -95,15 +125,49 @@ jobs:
         echo "GTEST=$GTEST" >> $GITHUB_ENV
         SSCDIR=$GITHUB_WORKSPACE/ssc
         echo "SSCDIR=$SSCDIR" >> $GITHUB_ENV
+        ORTOOLSDIR=$GITHUB_WORKSPACE/or-tools
+        echo "ORTOOLSDIR=$ORTOOLSDIR" >> $GITHUB_ENV
 
+    - name: Get cached OR-Tools
+      uses: actions/cache@v4
+      id: cachedortools
+      with:
+        path: ${{env.ORTOOLSDIR}}/
+        key: ortools-${{ matrix.os }}
+
+    - name: download OR-Tools for Arm64
+      if: ${{ matrix.os == 'macos-latest' && steps.cachedortools.outputs.cache-hit != 'true'}}
+      run: |
+          cd $GITHUB_WORKSPACE
+          curl -LJO https://github.com/google/or-tools/releases/download/v9.9/or-tools_arm64_macOS-14.3.1_cpp_v9.9.3963.tar.gz
+          tar -xvf or-tools_arm64*.tar.gz
+          mkdir or-tools
+          mv or-tools*/* or-tools
+    - name: download OR-Tools for Intel
+      if: ${{ matrix.os == 'macos-14-large' && steps.cachedortools.outputs.cache-hit != 'true'}}
+      run: |
+          cd $GITHUB_WORKSPACE
+          curl -LJO https://github.com/google/or-tools/releases/download/v9.9/or-tools_x86_64_macOS-14.3.1_cpp_v9.9.3963.tar.gz
+          tar -xvf or-tools_x86_64*tar.gz
+          mkdir or-tools
+          mv or-tools*/* or-tools
+
+    - name: Get cached GTest
+      uses: actions/cache@v4
+      id: cachedgtest
+      with:
+        path: ${{env.GTEST}}/
+        key: ortools-${{ matrix.os }}
     - name: Clone Gtest
-      uses: actions/checkout@v2
+      if: steps.cachedgtest.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
       with:
         repository: google/googletest
         path: googletest
-        ref: b85864c64758dec007208e56af933fc3f52044ee
+        ref: ${{env.GTEST_REF}}
 
     - name: build Gtest
+      if: steps.cachedgtest.outputs.cache-hit != 'true'
       run: | 
           export 
           mkdir ${GTEST}/build
@@ -112,7 +176,7 @@ jobs:
           make          
 
     - name: Checkout SSC
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
          path: ssc
 
@@ -121,7 +185,7 @@ jobs:
       run: |
         mkdir ${SSCDIR}/build
         cd ${SSCDIR}/build
-        cmake .. -DCMAKE_BUILD_TYPE=Release -DSAM_SKIP_TOOLS=1 -DSAMAPI_EXPORT=0 
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DSAM_SKIP_TOOLS=1 -DSAMAPI_EXPORT=0 -DCMAKE_INSTALL_PREFIX=${ORTOOLSDIR}
 
     - name: Build
       # Build your program with the given configuration
@@ -134,11 +198,11 @@ jobs:
       run: |
         set -e
         ${SSCDIR}/build/test/Test
-      shell: bash      
+      shell: bash
 
     - name: Upload Artifacts
       if: ${{ matrix.os == 'macos-latest' }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
       with:
           name: SSC Mac Arm Shared Libraries
           path: |
@@ -147,7 +211,7 @@ jobs:
 
     - name: Upload Artifacts
       if: ${{ matrix.os != 'macos-latest' }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
       with:
           name: SSC Mac Intel Shared Libraries
           path: |
@@ -159,7 +223,7 @@ jobs:
 
     steps:
     - name: Setup cmake
-      uses: jwlawson/actions-setup-cmake@v1.12
+      uses: jwlawson/actions-setup-cmake@v2
       with:
         cmake-version: '3.24.x'
     - name: Test cmake version
@@ -172,50 +236,82 @@ jobs:
         echo "GTEST=$GTEST" >> $GITHUB_ENV
         SSCDIR=$GITHUB_WORKSPACE/ssc
         echo "SSCDIR=$SSCDIR" >> $GITHUB_ENV
-
+        ORTOOLSDIR=$GITHUB_WORKSPACE/or-tools/install
+        echo "ORTOOLSDIR=$ORTOOLSDIR" >> $GITHUB_ENV
+
+    - name: Get cached OR-Tools
+      uses: actions/cache@v4
+      id: cachedortools
+      with:
+        path: ${{env.ORTOOLSDIR}}/
+        key: ortools-windows
+
+    - name: Clone OR-Tools
+      if: steps.cachedortools.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
+      with:
+        repository: google/or-tools
+        path: or-tools
+        # ref: 87ac305ace23e1d77beec597c9a714b86082e9ee
+
+    - name: Build OR-Tools
+      if: steps.cachedortools.outputs.cache-hit != 'true'
+      shell: bash
+      run: | 
+        cd or-tools
+        cmake -S . -B build -DBUILD_DEPS=ON -DUSE_COINOR=OFF -DUSE_HIGHS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SAMPLES=OFF -DBUILD_DOC=OFF -DINSTALL_DOC=OFF -DUSE_XPRESS=OFF -DCMAKE_INSTALL_PREFIX=${ORTOOLSDIR}
+        cmake --build build --config Release --target install -v -j 4
+
+    - name: Get cached GTest
+      uses: actions/cache@v4
+      id: cachedgtest
+      with:
+        path: ${{env.GTEST}}/
+        key: gtest-windows
+
     - name: Clone Gtest
-      uses: actions/checkout@v2
+      if: steps.cachedgtest.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
       with:
         repository: google/googletest
         path: googletest
-        ref: b85864c64758dec007208e56af933fc3f52044ee
+        ref: ${{env.GTEST_REF}}
 
     - name: build Gtest
+      if: steps.cachedgtest.outputs.cache-hit != 'true'
       shell: bash
-      # Need to build both Release and Debug for the SSC CMake below
       run: | 
           export 
           mkdir ${GTEST}/build
           cd ${GTEST}/build
           cmake -Dgtest_force_shared_crt=ON ..
           cmake --build . --config Release -j4
-          cmake --build . --config Debug -j4
 
-    - name: Checkout SSC
-      uses: actions/checkout@v2
-      with:
-          path: ssc
+    # - name: Checkout SSC
+    #   uses: actions/checkout@v4
+    #   with:
+    #       path: ssc
 
-    - name: Configure CMake
-      shell: bash
-      # Configure cmake to build ssc tests but not tools
-      run: |
-        mkdir ${SSCDIR}/build
-        cd ${SSCDIR}/build
-        cmake .. -DSAM_SKIP_TOOLS=1
-        cmake --build . --config Release -j4
-        cp ssc/Release/* test/Release
+    # - name: Configure CMake
+    #   shell: bash
+    #   # Configure cmake to build ssc tests but not tools
+    #   run: |
+    #     mkdir ${SSCDIR}/build
+    #     cd ${SSCDIR}/build
+    #     cmake .. -DSAM_SKIP_TOOLS=1
+    #     cmake --build . --config Release -j4
+    #     cp ssc/Release/* test/Release
 
-    - name: Test
-      shell: bash
-      # Turn off fast fail for when the landbosse tests write to cerr
-      run: |
-        cd ${SSCDIR}/build/test/Release
-        ./Test.exe
+    # - name: Test
+    #   shell: bash
+    #   # Turn off fast fail for when the landbosse tests write to cerr
+    #   run: |
+    #     cd ${SSCDIR}/build/test/Release
+    #     ./Test.exe
 
-    - name: Upload Artifacts
-      uses: actions/upload-artifact@v3
-      with:
-          name: SSC Windows Shared Libraries
-          path: |
-            ${{env.SSCDIR}}\build\ssc\Release\ssc.dll
+    # - name: Upload Artifacts
+    #   uses: actions/upload-artifact@v3
+    #   with:
+    #       name: SSC Windows Shared Libraries
+    #       path: |
+    #         ${{env.SSCDIR}}\build\ssc\Release\ssc.dll

.gitignore

@@ -33,6 +33,8 @@ bld/
 build/
 cmake-build-debug/
 cmake-build-release/
+CMakeFiles
+CMakeCache.txt
 test/Test
 
 # Visual Studio 2015 cache/options directory
@@ -344,6 +346,7 @@ build_osx/Test
 build_linux/Test
 build_linux/config.status
 linux_test\.txt
+build2
 
 nlopt/config.h
 nlopt/config.status
@@ -360,3 +363,5 @@ ssc/ssc\.exp
 ssc/sscd\.exp
 
 build_android/lib_oldssc.zip
+
+or-tools