Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/remove sirius direct #176

Open
wants to merge 83 commits into
base: New-Antares-Emulator-2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
cc5c712
Remove Sirius direct : move options ortoolsUsed + rename ortoolsSolve…
guilpier-code Feb 29, 2024
3f5c364
Remove Sirius direct : consequence on python scripts for automatic te…
guilpier-code Feb 29, 2024
835afc2
Remove Sirius direct : temporarily remove named mps tests run
guilpier-code Feb 29, 2024
cf8ac0e
Remove Sirius direct : temporarily remove other mps tests run
guilpier-code Feb 29, 2024
6c3646b
Remove manual dynamic memory usage (#2254)
payetvin Jul 17, 2024
67f31e4
Remove manual dynamic allocations in Xcast (#2270)
payetvin Jul 19, 2024
bc23762
Infeasibility analyzer : improve unit tests (#2249)
guilpier-code Jul 22, 2024
af43670
Remove useless forward declaration (#2268)
flomnes Jul 22, 2024
d9b944e
Use OR-Tools v9.10 (#2277)
flomnes Jul 23, 2024
ea71166
Use devtoolset-11 on CentOS7 to fix build (#2282)
flomnes Jul 23, 2024
68a388d
Fix Sonar warning: use compile_commands.json (#2281)
a-zakir Jul 23, 2024
2587876
Add short-term storage doc for optim model (#2283)
flomnes Jul 23, 2024
cb270ed
Remove dynamic manually allocated memory (#2273)
payetvin Jul 24, 2024
b8c8285
Add short test to coverage analysis (#2280)
a-zakir Jul 25, 2024
0359290
Add unit tests to see coverage increase (#2267)
payetvin Jul 25, 2024
abc0c85
Feature/test name translator (#2285)
a-zakir Jul 25, 2024
6f412e7
Use a formula for the number of cores used (#2284)
payetvin Jul 25, 2024
d7c5442
Run all tests even if one of them fails (#2265)
flomnes Jul 26, 2024
724e85d
Add missing changelog for v8.8.7 (#2287)
flomnes Jul 29, 2024
bca91fc
Remove spurious assert(false), fix debug binaries (#2291)
flomnes Aug 5, 2024
c2c6afc
Fix reset order (#2304)
payetvin Aug 5, 2024
9cc20fb
fix links (#2310)
a-zakir Aug 7, 2024
05117e0
update AUTHORS.txt (#2312)
a-zakir Aug 7, 2024
50e28d2
Force color output in cmake (#2320)
payetvin Aug 8, 2024
07d1dab
Fix Windows Debug version crash (#2322)
a-zakir Aug 9, 2024
c02af5d
Free up space for SonarCloud job (#2315)
flomnes Aug 12, 2024
2508646
Short term storage costs [ANT-1854] (#2302)
payetvin Aug 12, 2024
9d6d809
Update simtest version, 9.2.0c (#2336)
payetvin Aug 19, 2024
1d166e8
Fix/rhs hydro power constraint (#2034)
flomnes Aug 19, 2024
c79cbb9
Use const char** for argv, remove function `prepareArgs` (#2338)
flomnes Aug 19, 2024
8a929e5
Enable parallel run for API (#2337)
JasonMarechal25 Aug 19, 2024
ffec921
Remove useless ;, macro definition (#2348)
flomnes Aug 21, 2024
b401969
Revert "Fix/rhs hydro power constraint (#2034)" (#2350)
JasonMarechal25 Aug 21, 2024
f157f0b
Fix various compilation warnings (#2346)
flomnes Aug 21, 2024
f206d45
Remove duplication in simulation run (#2274)
guilpier-code Aug 23, 2024
6e26d9c
Districts : simplifying the code (#2279)
guilpier-code Aug 23, 2024
f6ee594
Fix clang++ warning about typeid (#2340)
flomnes Aug 26, 2024
c8ffce8
Disable CMAKE_COLOR_DIAGNOSTICS (#2344)
flomnes Aug 26, 2024
b472829
Remove manually allocated memory (#2363)
payetvin Aug 30, 2024
01960d0
Add cucumber tests tool (#2347)
pet-mit Sep 2, 2024
420ccba
Expression visitors : first implementation (#2290)
flomnes Sep 2, 2024
9accb36
Remove adequacy patch lmr [ANT-1933] (#2341)
payetvin Sep 3, 2024
69a8b12
Properly set common data in API output when using playlist (#2364)
JasonMarechal25 Sep 4, 2024
fcb5254
Adequacy patch CSR - revamp output variables [ANT-1932] (#2306)
flomnes Sep 4, 2024
2361699
Add help button to website (#2368)
pet-mit Sep 4, 2024
27b22dd
Fix windows build (#2373)
payetvin Sep 4, 2024
3f2be18
Bump simtest version (#2375)
payetvin Sep 4, 2024
600c6ac
Remove unused headers in src/solver (yuni, cstdint, sim_*.h) (#2371)
flomnes Sep 4, 2024
2791e30
Centos mirror list (#2372)
payetvin Sep 4, 2024
8fc1599
Better dependencies with cmake, antares matrix (#2369)
payetvin Sep 6, 2024
cda5d42
Update deprecated actions (#2381)
payetvin Sep 9, 2024
24256a1
Modeler API [ANT-1876] (#2286)
payetvin Sep 10, 2024
775224e
Add iterators on ASTs, allowing for loops, std::find/std::find_if, st…
flomnes Sep 10, 2024
3344d60
Add contribution guidelines (#2380)
flomnes Sep 11, 2024
bc4cc13
Mark overriden functions as such in hydroLevelsData (#2389)
flomnes Sep 11, 2024
cb75161
Remove unused adqPatchParams argument, class member (#2390)
flomnes Sep 11, 2024
7947b36
Revert "Fix bug hydro heuristic with mingen (ANT-1825) (#2258)" (#2394)
payetvin Sep 12, 2024
3eaa8df
Remove unused CoutDeDefaillanceEnReserve (#2392)
flomnes Sep 12, 2024
0a45c7e
rc 4 (#2397)
payetvin Sep 13, 2024
9aa0e7f
Replace AddNode with SumNode (#2396)
pet-mit Sep 16, 2024
5b8cd4a
Local matching removal : remove unused thread_number / numSpace (#2404)
guilpier-code Sep 18, 2024
e24124d
Add SumNode "wide" test (#2403)
flomnes Sep 18, 2024
8f62902
Modeler 2.4c: portfield substitution (#2406)
payetvin Sep 19, 2024
f7e5af7
Fix or-tools integration (#2402)
JasonMarechal25 Sep 19, 2024
c70a4ad
Partial revert following #2406 (#2409)
flomnes Sep 20, 2024
fa2f309
Remove last global variable (#2410)
payetvin Sep 20, 2024
777b041
Remove unused code & #defines (#2412)
flomnes Sep 23, 2024
380ccd7
Reset adequacy patch enabled (#2420)
payetvin Sep 24, 2024
c4b9373
Headers files : remove useless inclusions in OPT (#2411)
guilpier-code Sep 24, 2024
895555d
bump simtest (#2398)
payetvin Sep 25, 2024
33f35be
visualize ast with graphviz (#2399)
a-zakir Sep 25, 2024
abe3f99
Remove awkward operator<< overload, use operator() instead (#2427)
flomnes Sep 25, 2024
d174a1b
remove old Doxygen.txt files (#2428)
a-zakir Sep 26, 2024
bc8e74c
Visitor AST into DOT : trial for more clarity (#2426)
guilpier-code Sep 26, 2024
1d75f08
AST to DOT : forgotten commit (#2429)
guilpier-code Sep 26, 2024
f3922b2
Better handling of discontinued parameters (#2414)
payetvin Sep 26, 2024
8ce6107
Modeler 2.4c: PortFieldSum and substitution (#2415)
payetvin Sep 26, 2024
f20ffc8
API modeler - 1.1.b (#2391)
guilpier-code Sep 27, 2024
ff94648
Merge branch 'develop' into feature/remove-sirius-direct
guilpier-code Sep 27, 2024
8faeff1
Remove Sirius direct : after update, make it compile
guilpier-code Oct 1, 2024
439fb61
Remove Sirius direct : fix a bug (a unit test of simple-study won't p…
guilpier-code Oct 1, 2024
1a5cad1
Remove Sirius direct : corrections + improvements after check on bran…
guilpier-code Oct 1, 2024
61380cf
Remove Sirius direct : try to solve CI problem
guilpier-code Oct 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/support_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
name: Request for support
about: Ask any question
title: ''
labels: help wanted

---

**Your identity**
Your name, company, why you are interested in Antares-Simulator...
Any information that can help us understand the context of your request!

**Question**
Your question, remark...
35 changes: 18 additions & 17 deletions .github/workflows/centos7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,19 @@ jobs:

- name: Install gcc 10
run: |
# update mirrors, official centos7 is deprecated
sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo &&\
sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo &&\
sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo &&\
yum update -y

# not a typo, centos-release-scl is needed to install devtoolset-10 but introduce deprecated mirror
sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo &&\
sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo &&\
sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo

yum install -y centos-release-scl
yum install -y devtoolset-10-gcc*
yum install -y devtoolset-11-gcc*

- name: Install cmake 3.28
run: pip3 install cmake==3.28.4
Expand Down Expand Up @@ -75,7 +86,7 @@ jobs:

- name: Config OR-Tools URL
run: |
echo "URL_ORTOOLS=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_centos7_static_sirius.zip" >> $GITHUB_ENV
echo "URL_ORTOOLS=https://github.com/rte-france/or-tools-rte/releases/download/$(cat ortools_tag)/ortools_cxx_centos7_static_sirius.zip" >> $GITHUB_ENV

- name: Download OR-Tools
id: ortools
Expand All @@ -89,12 +100,12 @@ jobs:
if: ${{ env.IS_RELEASE == 'true' }}
run: |
wget https://github.com/cli/cli/releases/download/v2.52.0/gh_2.52.0_linux_amd64.rpm
rpm -i gh_2.52.0_linux_amd64.rpm
gh --version
rpm -i gh_2.52.0_linux_amd64.rpm
gh --version

- name: Configure
run: |
source /opt/rh/devtoolset-10/enable
source /opt/rh/devtoolset-11/enable
source /opt/rh/rh-git227/enable
cmake -B _build -S src \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
Expand All @@ -110,7 +121,7 @@ jobs:

- name: Build
run: |
source /opt/rh/devtoolset-10/enable
source /opt/rh/devtoolset-11/enable
source /opt/rh/rh-git227/enable
cmake --build _build --config Release -j$(nproc)
ccache -s
Expand All @@ -135,24 +146,14 @@ jobs:
cd _build
cpack -G TGZ

- name: Installer TGZ push
uses: actions/upload-artifact@v3
with:
path: _build/*.tar.gz

- name: Installer RPM push
uses: actions/upload-artifact@v3
with:
path: _build/*.rpm

- name: Publish assets
if: ${{ env.IS_RELEASE == 'true' }}
env:
GITHUB_TOKEN: ${{ github.token }}
tag: ${{ github.event.inputs.release_tag }}
run: |
gh release upload "$tag" _build/*.tar.gz _build/*.rpm

- name: Cache vcpkg binary dir
if: always()
id: save-cache-vcpkg-binary
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/cucumber-tests/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: "Run cucumber tests"
description: "Run cucumber tests"
inputs:
feature:
description: 'Feature file or folder to run (default runs all features in "features" folder)'
required: false
default: 'features'
tags:
description: 'Tags to run (default skips tests marked @flaky)'
required: false
default: '~@flaky'
runs:
using: "composite"
steps:
- name: Install Python requirements
shell: bash
run: python3 -m pip install -r src/tests/cucumber/requirements.txt

- name: Run tests
shell: bash
run: |
cd src/tests/cucumber
behave --tags ${{ inputs.tags }} ${{ inputs.feature }}
11 changes: 5 additions & 6 deletions .github/workflows/oracle8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ jobs:

- name: Restore vcpkg binary dir from cache
id: cache-vcpkg-binary
# Note: we are stuck with v3, because v4 is not compatible with oracle8 image
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
path: ${{ env.VCPKG_CACHE_DIR }}
key: vcpkg-cache-oracle8-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }}
Expand All @@ -74,7 +73,7 @@ jobs:

- name: Config OR-Tools URL
run: |
echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_oraclelinux-8_static_sirius.zip" >> $GITHUB_ENV
echo "ORTOOLS_URL=https://github.com/rte-france/or-tools-rte/releases/download/$(cat ortools_tag)/ortools_cxx_oraclelinux-8_static_sirius.zip" >> $GITHUB_ENV

- name: Download & extract OR-Tools
run: |
Expand Down Expand Up @@ -144,13 +143,13 @@ jobs:
- name: Installer TGZ push
uses: actions/upload-artifact@v4
with:
name: targz
name: oracle-targz
path: _build/*.tar.gz

- name: Installer RPM push
uses: actions/upload-artifact@v4
with:
name: rpm
name: oracle-rpm
path: _build/*.rpm

- name: Publish assets
Expand All @@ -164,7 +163,7 @@ jobs:
- name: Cache vcpkg binary dir
if: always()
id: save-cache-vcpkg-binary
uses: actions/cache/save@v3
uses: actions/cache/save@v4
with:
path: ${{ env.VCPKG_CACHE_DIR }}
key: vcpkg-cache-oracle8-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }}
40 changes: 36 additions & 4 deletions .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,21 @@ jobs:
ORTOOLS_DIR: ${{ github.workspace }}/or-tools
# Caching strategy of VCPKG dependencies
VCPKG_BINARY_SOURCES: "clear;files,${{ github.workspace }}/vcpkg_cache,readwrite"
BUILD_WRAPPER_OUT_DIR: ${{ github.workspace }}/_build/output # Directory where build-wrapper output will be placed

steps:
# Disk space on / is insufficient, leading to errors
# We use this 'hack' to remove unused stuff (android, dotnet, etc.) and change partition layout
- name: Maximize build space
uses: easimon/maximize-build-space@v10
with:
root-reserve-mb: 5120
swap-size-mb: 1024
remove-dotnet: true
remove-android: true
remove-haskell: true
remove-codeql: true

- uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
Expand All @@ -40,7 +53,7 @@ jobs:

- name: Config OR-Tools URL
run: |
echo "ORTOOLS_URL=https://github.com/rte-france/or-tools/releases/download/$(cat ortools_tag)/ortools_cxx_ubuntu-20.04_static_sirius.zip" >> $GITHUB_ENV
echo "ORTOOLS_URL=https://github.com/rte-france/or-tools-rte/releases/download/$(cat ortools_tag)/ortools_cxx_ubuntu-20.04_static_sirius.zip" >> $GITHUB_ENV

- name: Install sonar-scanner and build-wrapper
uses: SonarSource/sonarcloud-github-c-cpp@v3
Expand Down Expand Up @@ -78,6 +91,16 @@ jobs:
python -m pip install --upgrade pip
pip3 install -r src/tests/examples/requirements.txt

- name: Read simtest version
run: |
echo 'SIMTEST_JSON<<EOF' >> $GITHUB_ENV
cat ./simtest.json >> $GITHUB_ENV
echo 'EOF' >> $GITHUB_ENV

- name: Export simtest version
run: |
echo "SIMTEST=${{ fromJson(env.SIMTEST_JSON).version }}" >> $GITHUB_ENV

- name: Init submodule
run: |
git submodule update --init --remote src/tests/resources/Antares_Simulator_Tests
Expand All @@ -92,22 +115,31 @@ jobs:
-DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake \
-DVCPKG_TARGET_TRIPLET=x64-linux-release \
-DCODE_COVERAGE=ON \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH="../install;${{ env.ORTOOLS_DIR }}/install" \
-DBUILD_TESTING=ON \
-DMZ_CODE_COVERAGE=ON \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DPython3_EXECUTABLE='${{ steps.setup-python.outputs.python-path }}'

- name: Build
run: |
build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/_build/output cmake --build _build --config release -j$(nproc)
build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build _build --config Release -j$(nproc)

- name: Test and generate coverage
continue-on-error: true
run: |
cd $GITHUB_WORKSPACE/_build
ctest -C Release --output-on-failure -L "unit"

- name: Run short-tests
continue-on-error: true
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{ env.SIMTEST }}
batch-name: short-tests
os: ${{ matrix.os }}

- name: Collect coverage into one XML report
run: |
gcovr --sonarqube --output coverage.xml
Expand All @@ -116,7 +148,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}"
run: sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" --define sonar.cfamily.compile-commands="${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json"

- name: Cache vcpkg binary dir
if: always()
Expand Down
Loading