Fixes

AntaresSimulatorTeam · May 23, 2024 · 909c9ba · 909c9ba
1 parent 7cdfccb
commit 909c9ba
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 16 deletions.
diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
@@ -23,13 +23,14 @@ jobs:
         os: [ ubuntu-20.04 ]
         xprs: [
           #{ value: XPRESS-ON, ref: 8.13a },
-          { value: XPRESS-ON, ref: 9.2.5 },
-          #       { value: XPRESS-OFF }
+          #{ value: XPRESS-ON, ref: 9.2.5 },
+                 { value: XPRESS-OFF }
         ]
     env:
       XPRESSDIR: ${{ github.workspace }}/xpress
       XPRESS: ${{ github.workspace }}/xpress/bin
       XPRS_LIB_Path: ${{ github.workspace }}/xpress/lib
+      ORTOOLS_DIR: ${{ github.workspace }}/or-tools
 
     steps:
       - uses: actions/checkout@v4
@@ -45,6 +46,9 @@ jobs:
           ref: ${{ matrix.xprs.ref}}
           token: ${{ secrets.AS_TOKEN }} #reniew token periodically
 
+      - run: |
+          apt-get update
+
       - name: ccache
         uses: hendrikmuhs/[email protected]
         with:
@@ -104,24 +108,28 @@ jobs:
           path: 'antares-version.json'
           key: 'antares_deps_version'
 
+      - name: Config OR-Tools URL
+        run: |
+          echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/v9.8-rte1.0/ortools_cxx_ubuntu-20.04_static_sirius.zip" >> $GITHUB_ENV
+
       - name: Download pre-compiled librairies
         uses: ./.github/workflows/download-extract-precompiled-libraries-tgz
         with:
           antares-deps-version: ${{steps.antares-deps-version.outputs.result}}
           antares-version: ${{steps.antares-version.outputs.result}}
           os: ${{matrix.os}}
           os-full-name: Ubuntu-20.04
+          ortools-url: ${{env.ORTOOLS_URL}}
+          ortools-dir: ${{env.ORTOOLS_DIR}}
+
+      - run: |
+          ls ${{env.ORTOOLS_DIR}}
 
       - run: |
           mkdir -p ${{ github.workspace }}/vcpkg_cache
 
-      - name: vcpkg install
-        run: |
-          pushd vcpkg
-          git fetch --unshallow
-          ./bootstrap-vcpkg.sh
-          popd
-          vcpkg/vcpkg install
+      - name: vcpkg
+        uses: lukka/run-vcpkg@v11
 
       - name: Configure
         shell: bash
@@ -136,10 +144,12 @@ jobs:
                 -DDEPS_INSTALL_DIR=rte-antares-deps-Release \
                 -DBUILD_TESTING=ON \
                 -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_INSTALL_PREFIX="_install;antares-9.1.0-Ubuntu-20.04" \
+                -DCMAKE_INSTALL_PREFIX=_install \
+                -DCMAKE_PREFIX_PATH=${{env.ORTOOLS_DIR}}/install \
                 -DBUILD_UI=ON  \
                 -DXPRESS=${{ env.XPRESS_VALUE }} \
-                -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake
+                -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake \
+                -DCMAKE_FIND_DEBUG_MODE=TRUE
 
       - name: Build
         run: |

diff --git a/.github/workflows/download-extract-precompiled-libraries-tgz/action.yml b/.github/workflows/download-extract-precompiled-libraries-tgz/action.yml
@@ -21,6 +21,12 @@ inputs:
     description: 'extra qualifiers'
     required: false
     default: ""
+  ortools-url:
+    description: 'URL for OR-Tools'
+    required: true
+  ortools-dir:
+    description: 'Destination directory for OR-Tools'
+    required: true
 runs:
   using: "composite"
   steps: 
@@ -37,5 +43,12 @@ runs:
       wget https://github.com/AntaresSimulatorTeam/Antares_Simulator/releases/download/v${{inputs.antares-version}}/antares-9.1.0-${{inputs.os-full-name}}${{inputs.variant}}.tar.gz
       tar -xvf antares-9.1.0-${{inputs.os-full-name}}${{inputs.variant}}.tar.gz -C rte-antares-deps-${{inputs.buildtype}} --strip-components=1
       rm -rf antares-9.1.0-${{inputs.os-full-name}}${{inputs.variant}}.tar.gz
-      
-      
+
+  - name: Download & extract OR-Tools
+    shell: bash
+    run: |
+      mkdir -p  ${{inputs.ortools-dir}}
+      cd ${{inputs.ortools-dir}}
+      wget ${{inputs.ortools-url}} -O ortools.zip
+      unzip ortools.zip
+      rm ortools.zip
diff --git a/data_test/external_loop_test/lp/master_last_basis.bss b/data_test/external_loop_test/lp/master_last_basis.bss
@@ -1,5 +1,5 @@
 NAME                                                                          
- LL G_p_max_0_0                            0
- XU alpha             R1                          19             0
- XL alpha_0           R2                          19           -19
+ UL G_p_max_0_0                           10
+ XU alpha             R1                          36             0
+ XL alpha_0           R5                          36           -36
 ENDATA 
diff --git a/vcpkg.json b/vcpkg.json
@@ -7,6 +7,7 @@
     "gtest",
     "boost-mpi",
     "boost-program-options",
+    "boost-test",
     "zlib",
     "yaml-cpp"
   ],