Revert "3.6"

This reverts commit 3781d60
AntaresSimulatorTeam · Oct 9, 2023 · a18118e · a18118e
1 parent 825d5a1
commit a18118e
Show file tree

Hide file tree

Showing 16 changed files with 1,592 additions and 25 deletions.
diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
@@ -4,5 +4,5 @@ runs:
   using: "composite"
   steps:
     - run: |
-        uname -a
-        git --version
+        echo `uname -a`
+        echo `git --version`
diff --git a/.github/workflows/build_centos7.yml b/.github/workflows/build_centos7.yml
@@ -0,0 +1,154 @@
+name: Centos7 Build
+
+on:
+  merge_group:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+  release:
+    types: [ created ]
+
+env:
+  GITHUB_TOKEN: ${{ github.token }}
+
+jobs:
+  docker_publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+        with:
+          fetch-depth: 0
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v32
+        with:
+          files: |
+            docker/centos7-bare
+
+      - name: Docker file push
+        id: docker_push
+        if: steps.changed-files.outputs.any_changed == 'true'
+        uses: elgohr/Publish-Docker-Github-Action@master
+        with:
+          name: antaresrte/rte-antares
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          workdir: docker
+          dockerfile: centos7-bare
+          cache: false
+          tags: centos7-xpansion-bare
+
+  versions:
+    runs-on: ubuntu-latest
+    outputs:
+      antares-version: ${{steps.antares-version.outputs.result}}
+      antares-xpansion-version: ${{steps.antares-xpansion-version.outputs.result}}
+      antares-deps-version: ${{steps.antares-deps-version.outputs.result}}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Read antares-solver version
+        id: antares-version
+        uses: ./.github/actions/read-json-value
+        with:
+          path: 'antares-version.json'
+          key: 'antares_version'
+
+      - name: Read antares-xpansion version
+        id: antares-xpansion-version
+        uses: ./.github/actions/read-json-value
+        with:
+          path: 'antares-version.json'
+          key: 'antares_xpansion_version'
+
+      - name: Read antares-deps version
+        id: antares-deps-version
+        uses: ./.github/actions/read-json-value
+        with:
+          path: 'antares-version.json'
+          key: 'antares_deps_version'
+
+  build:
+    runs-on: ubuntu-latest
+    needs: [ docker_publish, versions ]
+    container: 'antaresrte/rte-antares:centos7-xpansion-bare'
+    strategy:
+      matrix:
+        xprs: [ XPRESS-ON, XPRESS-OFF ]
+    env:
+      XPRESSDIR: ${{ github.workspace }}/xpress
+      XPRESS: ${{ github.workspace }}/xpress/bin
+      XPRS_LIB_Path: ${{ github.workspace }}/xpress/lib
+      XPRESSDIR_CONTAINER: ${GITHUB_WORKSPACE}/xpress
+      XPRESS_CONTAINER: ${GITHUB_WORKSPACE}/xpress/bin
+      XPRS_LIB_Path_CONTAINER: ${GITHUB_WORKSPACE}/xpress/lib
+
+    steps:
+      - name: Get release
+        if: github.event_name == 'release' && github.event.action == 'created'
+        id: get_release
+        uses: bruceadams/[email protected]
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Checkout xpressmp linux
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.AS_TOKEN }}
+          repository: rte-france/xpress-mp
+          path: ${{ env.XPRESSDIR }}
+          github-server-url: https://github.com
+          ref: 8.13a
+        if: matrix.xprs == 'XPRESS-ON'
+
+      - name: Download pre-compiled librairies
+        uses: ./.github/workflows/download-extract-precompiled-libraries-tgz
+        with:
+          antares-deps-version: ${{needs.versions.outputs.antares-deps-version}}
+          antares-version: ${{needs.versions.outputs.antares-version}}
+          os: centos7
+          os-full-name: CentOS-7.9.2009
+          #variant: -ortools-xpress
+
+      - name: Compile Boost
+        uses: ./.github/workflows/compile-boost
+        with:
+          prefix: "../rte-antares-deps-Release/"
+
+      - name: Install dependencies
+        run: |
+          pip3 install -r requirements-tests.txt
+          pip3 install -r requirements-ui.txt
+      - name: Configure
+        run: |
+          [[ ${{ matrix.xprs }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF" 
+          source /opt/rh/devtoolset-9/enable
+          export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH
+          export PATH=/usr/lib64/openmpi/bin:$PATH
+          cmake3 -B _build -S . \
+                 -DDEPS_INSTALL_DIR=rte-antares-deps-Release \
+                 -DBUILD_TESTING=ON \
+                 -DCMAKE_BUILD_TYPE=Release \
+                 -DCMAKE_INSTALL_PREFIX=_install \
+                 -DBUILD_UI=ON \
+                 -DXPRESS=${{ env.XPRESS_VALUE }} \
+                 -DXPRESS_ROOT=${{ env.XPRESSDIR }} \
+                 -DALLOW_RUN_AS_ROOT=ON
+      - name: Build
+        run: |
+          source /opt/rh/devtoolset-9/enable
+          export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH
+          export PATH=/usr/lib64/openmpi/bin:$PATH
+          cmake3 --build _build --config Release -j8 --target install
+      - name: Running unit tests
+        timeout-minutes: 120
+        shell: bash
+        run: |
+          source /etc/profile.d/modules.sh
+          module load mpi
+          export LD_LIBRARY_PATH=LD_LIBRARY_PATH:${{ env.XPRS_LIB_Path_CONTAINER }}
+          export XPRESS=${{ env.XPRESS_CONTAINER }}
+          cd _build
+          ctest3 -C Release --output-on-failure -L "unit|benders|lpnamer|medium"
diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
@@ -0,0 +1,123 @@
+name: Ubuntu build
+
+on:
+  merge_group:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+  release:
+    types: [ created ]
+
+env:
+  GITHUB_TOKEN: ${{ github.token }}
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    strategy:
+      matrix:
+        os: [ ubuntu-20.04 ]
+        xprs: [ XPRESS-ON, XPRESS-OFF ]
+    env:
+      XPRESSDIR: ${{ github.workspace }}/xpress
+      XPRESS: ${{ github.workspace }}/xpress/bin
+      XPRS_LIB_Path: ${{ github.workspace }}/xpress/lib
+
+    steps:
+      - run: |
+          apt update
+
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Checkout xpressmp linux
+        if: matrix.xprs == 'XPRESS-ON'
+        uses: actions/checkout@v3
+        with:
+          repository: rte-france/xpress-mp
+          path: ${{ env.XPRESSDIR }}
+          ref: 8.13
+          token: ${{ secrets.AS_TOKEN }} #reniew token periodically
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          cache: 'pip'
+          python-version: 3.8
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements-tests.txt
+          pip install -r requirements-ui.txt
+
+      - name: Install mandatory system libraries
+        run: |
+          sudo apt-get update --fix-missing
+          sudo apt-get install libjsoncpp-dev libgtest-dev libboost-mpi-dev libboost-program-options-dev libtbb-dev
+          cd /usr/src/googletest/
+          sudo cmake .
+          sudo cmake --build .
+
+      - name: Read antares-solver version
+        id: antares-version
+        uses: ./.github/actions/read-json-value
+        with:
+          path: 'antares-version.json'
+          key: 'antares_version'
+
+      - name: Read antares-xpansion version
+        id: antares-xpansion-version
+        uses: ./.github/actions/read-json-value
+        with:
+          path: 'antares-version.json'
+          key: 'antares_xpansion_version'
+
+      - name: Read antares-deps version
+        id: antares-deps-version
+        uses: ./.github/actions/read-json-value
+        with:
+          path: 'antares-version.json'
+          key: 'antares_deps_version'
+
+      - 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
+
+      - name: Compile Boost
+        uses: ./.github/workflows/compile-boost
+        with:
+          prefix: "../rte-antares-deps-Release/"
+
+      - name: Configure
+        shell: bash
+        #XPRESS_VALUE = ${{ matrix.xprs }} == "XPRESS-ON" ? "ON" : "OFF"
+        run: |
+          [[ ${{ matrix.xprs }} == "XPRESS-ON" ]] && XPRESS_VALUE="ON" || XPRESS_VALUE="OFF" 
+          cmake -B _build -S . \
+                -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+                -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+                -DDEPS_INSTALL_DIR=rte-antares-deps-Release \
+                -DBUILD_TESTING=ON \
+                -DCMAKE_BUILD_TYPE=Release \
+                -DCMAKE_INSTALL_PREFIX=_install \
+                -DBUILD_UI=ON  \
+                -DXPRESS=${{ env.XPRESS_VALUE }} \
+                -DXPRESS_ROOT=${{ env.XPRESSDIR }}
+
+      - name: Build
+        run: |
+          cmake --build _build --config Release -j8
+
+      - name: Test
+        run: |
+          cd _build
+          ctest -C Release --output-on-failure -L "medium|unit|benders|lpnamer"