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

Profiling #880

Draft
wants to merge 445 commits into
base: develop
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
445 commits
Select commit Hold shift + click to select a range
b5b1e17
Merge branch 'refs/heads/ci/simplify_ci_3' into ci/antares_in_memory_ci
JasonMarechal25 Jun 7, 2024
35720b6
fix OL8
JasonMarechal25 Jun 7, 2024
0701183
fix OL8
JasonMarechal25 Jun 7, 2024
e84841a
vcpkg fixes
JasonMarechal25 Jun 7, 2024
39147eb
Merge branch 'refs/heads/ci/simplify_ci_3' into ci/antares_in_memory_ci
JasonMarechal25 Jun 7, 2024
d796fd8
Fix handle possibly deleted during opening
JasonMarechal25 Jun 7, 2024
0272c08
Adapte to minizip 4.0.0
JasonMarechal25 Jun 10, 2024
908153f
Update Antares Simulator to 9.1.0
JasonMarechal25 Jun 18, 2024
29f633d
Fix OL8
JasonMarechal25 Jun 18, 2024
614db5a
Merge branch 'develop' into ci/antares9.1.0
JasonMarechal25 Jun 19, 2024
2d79fbd
Fix merge
JasonMarechal25 Jun 19, 2024
850a5bf
Revert to 1.3.0
JasonMarechal25 Jun 19, 2024
4feb8d7
f
JasonMarechal25 Jun 19, 2024
acf90a3
Schedul full build workflow at 00 Sunday
JasonMarechal25 Jun 5, 2024
0386cbe
Delete workflows
JasonMarechal25 Jun 5, 2024
a75e091
f test
JasonMarechal25 Jun 6, 2024
7a76556
Fix release
JasonMarechal25 Jun 6, 2024
4f3d8f4
Revert "Delete workflows"
JasonMarechal25 Jun 6, 2024
b0bdd15
remove workflows
JasonMarechal25 Jun 6, 2024
ac26046
Re-enable tests
JasonMarechal25 Jun 6, 2024
3dfed7d
No checkout for release job
JasonMarechal25 Jun 6, 2024
c06681e
Fuse build and release
JasonMarechal25 Jun 6, 2024
19d23f1
Sonar cache vcpkg
JasonMarechal25 Jun 6, 2024
1f7ffd9
Fix centos7
JasonMarechal25 Jun 6, 2024
96bfbdb
fix ubuntu
JasonMarechal25 Jun 6, 2024
df7f59e
Fix centos7
JasonMarechal25 Jun 6, 2024
f8c10ab
vcpkg fixes
JasonMarechal25 Jun 7, 2024
75d2b34
Adapte to minizip 4.0.0
JasonMarechal25 Jun 10, 2024
f26fd3f
Antares deps as port
JasonMarechal25 Jun 10, 2024
db80a8a
Remove independent download of antares deps
JasonMarechal25 Jun 10, 2024
11f1f37
Remove boost and gtest install in favor of vcpkg
JasonMarechal25 Jun 10, 2024
16cc6ae
Fix for solver
JasonMarechal25 Jun 10, 2024
24c8277
debug
JasonMarechal25 Jun 10, 2024
c10107c
Update
JasonMarechal25 Jun 10, 2024
4cd2654
Try fix
JasonMarechal25 Jun 11, 2024
73ab644
Try fix
JasonMarechal25 Jun 11, 2024
05b877a
f ?
JasonMarechal25 Jun 11, 2024
9577ac8
Split deps part1: coin utils
JasonMarechal25 Jun 12, 2024
f3daf03
Osi CBC
JasonMarechal25 Jun 12, 2024
d6c958a
Clp
JasonMarechal25 Jun 12, 2024
fa1c74c
CGl
JasonMarechal25 Jun 12, 2024
9888de7
Cbc
JasonMarechal25 Jun 12, 2024
0ea8b90
Gflags
JasonMarechal25 Jun 12, 2024
76c6b3c
Remove antares deps
JasonMarechal25 Jun 12, 2024
a36b563
remove antares deps
JasonMarechal25 Jun 12, 2024
0241b68
Remove antares deps
JasonMarechal25 Jun 12, 2024
2f8db6f
Remove antares deps
JasonMarechal25 Jun 12, 2024
4c2a470
Remove antares deps
JasonMarechal25 Jun 12, 2024
295609b
Remove antares deps
JasonMarechal25 Jun 12, 2024
741e12e
Fix sirius sll missing
JasonMarechal25 Jun 12, 2024
4668a6f
debug
JasonMarechal25 Jun 12, 2024
20766ac
Improve ports
JasonMarechal25 Jun 12, 2024
15d06df
Test
JasonMarechal25 Jun 12, 2024
9bb326a
Fix OL8
JasonMarechal25 Jun 13, 2024
7a7b8b8
Debug Windows
JasonMarechal25 Jun 13, 2024
a0b7509
Fix full build
JasonMarechal25 Jun 13, 2024
4851bca
Debug windows
JasonMarechal25 Jun 13, 2024
8b236a6
Disable workflows
JasonMarechal25 Jun 13, 2024
13dc79d
fix cache issue ?
JasonMarechal25 Jun 13, 2024
09c5d0a
fix win ?
JasonMarechal25 Jun 13, 2024
47fc176
Try fix cache
JasonMarechal25 Jun 13, 2024
79eeea2
Try fix win
JasonMarechal25 Jun 13, 2024
4b92eae
log
JasonMarechal25 Jun 13, 2024
59f60fb
fix cache
JasonMarechal25 Jun 13, 2024
41d5249
try
JasonMarechal25 Jun 13, 2024
d621dae
f
JasonMarechal25 Jun 13, 2024
30d416a
f
JasonMarechal25 Jun 13, 2024
4890e5b
f
JasonMarechal25 Jun 13, 2024
3ef1bab
f
JasonMarechal25 Jun 13, 2024
99e9d7b
f
JasonMarechal25 Jun 13, 2024
e00640d
f
JasonMarechal25 Jun 13, 2024
7a07ed0
f
JasonMarechal25 Jun 13, 2024
46c84ed
test
JasonMarechal25 Jun 13, 2024
1e21111
log
JasonMarechal25 Jun 13, 2024
c2c01a8
log
JasonMarechal25 Jun 13, 2024
77f2847
log
JasonMarechal25 Jun 13, 2024
f0883c8
log
JasonMarechal25 Jun 13, 2024
a75439f
meh
JasonMarechal25 Jun 13, 2024
1b60a66
meh
JasonMarechal25 Jun 13, 2024
81b3b03
meh
JasonMarechal25 Jun 13, 2024
a622a5b
test
JasonMarechal25 Jun 13, 2024
bd1be7f
Revert "Disable workflows"
JasonMarechal25 Jun 14, 2024
06e2e48
Try more log
JasonMarechal25 Jun 14, 2024
42d132c
test debug
JasonMarechal Jun 14, 2024
39a737f
Static Coin
JasonMarechal25 Jun 17, 2024
ce57647
cleanup
JasonMarechal25 Jun 17, 2024
7149c55
fix
JasonMarechal25 Jun 17, 2024
1f6406c
fix
JasonMarechal25 Jun 17, 2024
51c24f3
fix
JasonMarechal25 Jun 17, 2024
c3e5784
fix
JasonMarechal25 Jun 17, 2024
2514586
fix
JasonMarechal25 Jun 17, 2024
885d554
vcpkg
JasonMarechal25 Jun 17, 2024
5f72345
vcpkg
JasonMarechal25 Jun 17, 2024
16a1992
vcpkg
JasonMarechal25 Jun 17, 2024
0ace7df
vcpkg
JasonMarechal25 Jun 17, 2024
a599dea
vcpkg
JasonMarechal25 Jun 17, 2024
852f7b8
vcpkg
JasonMarechal25 Jun 17, 2024
f5bc8ce
vcpkg
JasonMarechal25 Jun 17, 2024
02dc039
vcpkg
JasonMarechal25 Jun 17, 2024
07f55ec
vcpkg
JasonMarechal25 Jun 17, 2024
8a5dd4a
vcpkg
JasonMarechal25 Jun 17, 2024
129b540
f
JasonMarechal25 Jun 17, 2024
8d7ba18
f windows
JasonMarechal25 Jun 17, 2024
7d7b3e0
f OL8
JasonMarechal25 Jun 17, 2024
b1746ee
f CentOS7
JasonMarechal25 Jun 17, 2024
041e4bf
Fix
JasonMarechal25 Jun 17, 2024
d480d33
Fix
JasonMarechal25 Jun 17, 2024
c5e0766
f windows
JasonMarechal25 Jun 17, 2024
5a21bfc
f
JasonMarechal25 Jun 17, 2024
0f58fab
Install sirius solver
JasonMarechal25 Jun 18, 2024
3a4c7ad
ADR for vcpkg
JasonMarechal25 Jun 19, 2024
4348c65
Revert "Try more log"
JasonMarechal25 Jun 19, 2024
3cbbf57
Remove TBB dependency
JasonMarechal25 Jun 19, 2024
d765d96
f
JasonMarechal25 Jun 19, 2024
a894c11
Merge branch 'develop' into ci/antares_deps_vcpkg
JasonMarechal25 Jun 19, 2024
3bd1357
f
JasonMarechal25 Jun 20, 2024
09f283a
Fix antares and deps install full build
JasonMarechal25 Jun 20, 2024
2d62605
f
JasonMarechal25 Jun 20, 2024
c37a546
f
JasonMarechal25 Jun 20, 2024
4ef833a
Merge remote-tracking branch 'origin/develop' into ci/antares_deps_vcpkg
JasonMarechal25 Jun 20, 2024
8e1497e
Properly configure vcpkg caching
JasonMarechal25 Jun 20, 2024
a923c37
Properly configure vcpkg cache path
JasonMarechal25 Jun 20, 2024
979417f
Merge branch 'refs/heads/ci/vcpkg_cach' into ci/antares_in_memory_ci
JasonMarechal25 Jun 20, 2024
5c107a3
Ports version like antares deps
JasonMarechal25 Jun 21, 2024
caa9068
Fix not finding Antares
JasonMarechal25 Jun 21, 2024
5f88a12
Cleanup
JasonMarechal25 Jun 24, 2024
dcf220e
Add test on convertSignToLEG
JasonMarechal25 Jun 24, 2024
224027d
Full build/not full
JasonMarechal25 Jun 24, 2024
c2fa754
Refactor convertSignToLEG
JasonMarechal25 Jun 25, 2024
addf3e8
temp
JasonMarechal25 Jun 26, 2024
c08747f
Fix antares deps
JasonMarechal25 Jun 26, 2024
ea173ff
f
JasonMarechal25 Jun 26, 2024
c3462e6
Regenerate expected results with 1.3.0 release
JasonMarechal25 Jun 27, 2024
334e41e
Fix
JasonMarechal25 Jun 27, 2024
d695e81
Properly download antares special versions (x.y.z-other)
JasonMarechal25 Jun 27, 2024
5bb4333
Update antares version
JasonMarechal25 Jun 27, 2024
59fe7df
f
JasonMarechal25 Jun 27, 2024
b7d12af
F windows
JasonMarechal25 Jun 28, 2024
b675452
Fix full build
JasonMarechal25 Jun 28, 2024
ff482e4
fix windows
JasonMarechal25 Jun 28, 2024
4bb21b1
fix centos
JasonMarechal25 Jun 28, 2024
d01bb72
f windows
JasonMarechal25 Jun 28, 2024
047ee3a
fix build
JasonMarechal25 Jun 28, 2024
635c499
Revert "fix build"
JasonMarechal25 Jun 28, 2024
f8591ef
fix build
JasonMarechal25 Jun 28, 2024
162a6f0
fix OL8
JasonMarechal25 Jun 28, 2024
9cdc42c
Only build release vcpkg deps during CI
JasonMarechal25 Jul 1, 2024
f7d4d63
Update OL8 to gcc11
JasonMarechal25 Jul 1, 2024
5e69217
Fix triplet release vcpkg
JasonMarechal25 Jul 1, 2024
3f54ec8
Merge remote-tracking branch 'origin/develop' into ci/antares_in_memo…
JasonMarechal25 Jul 1, 2024
4d49b95
Fix build
JasonMarechal25 Jul 1, 2024
fe36646
Fix release triplet
JasonMarechal25 Jul 1, 2024
b0f6a1e
Fix windows
JasonMarechal25 Jul 2, 2024
dc7adfc
Merge branch 'develop' into ci/antares_in_memory_ci
JasonMarechal25 Jul 2, 2024
e0a9c91
Merge remote-tracking branch 'refs/remotes/origin/develop' into ci/an…
JasonMarechal25 Jul 2, 2024
43a28b1
Merge branch 'develop' into feature/antares_in_memory
JasonMarechal25 Jul 2, 2024
f33d4e3
Merge remote-tracking branch 'refs/remotes/origin/feature/antares_in_…
JasonMarechal25 Jul 2, 2024
0be3097
Improve ADR
JasonMarechal25 Jul 2, 2024
d0b4f95
Fix windows
JasonMarechal25 Jul 2, 2024
f0f7ef3
Merge branch 'feature/antares_in_memory' into ci/antares_in_memory_ci
JasonMarechal25 Jul 2, 2024
3901ebb
Merge branch 'develop' into feature/antares_in_memory
JasonMarechal25 Jul 2, 2024
9457793
Merge branch 'feature/antares_in_memory' into ci/antares_in_memory_ci
JasonMarechal25 Jul 2, 2024
1bc7c4a
test
JasonMarechal25 Jul 4, 2024
3dac3ee
test
JasonMarechal25 Jul 4, 2024
fd247a6
test
JasonMarechal25 Jul 4, 2024
f5490f0
test
JasonMarechal25 Jul 4, 2024
516af22
test
JasonMarechal25 Jul 4, 2024
d1c8ac7
test
JasonMarechal25 Jul 4, 2024
4eaa06c
test
JasonMarechal25 Jul 4, 2024
80f8365
Prevent unnecessary string copy
JasonMarechal25 Jul 5, 2024
6dcc9bd
Profiling
JasonMarechal25 Jul 15, 2024
6bc3008
Install itt for proiling
JasonMarechal25 Jul 19, 2024
4a8e88f
f install
JasonMarechal25 Jul 19, 2024
0d113d6
Print memory info
JasonMarechal25 Jul 22, 2024
c5a19e0
Memory info more readable
JasonMarechal25 Jul 22, 2024
7e94778
Node
JasonMarechal25 Jul 22, 2024
dda1072
Install itt
JasonMarechal25 Jul 22, 2024
9d33426
Disable workflows
JasonMarechal25 Jul 22, 2024
5007a4e
co
JasonMarechal25 Jul 22, 2024
1b5d57f
branch
JasonMarechal25 Jul 22, 2024
b6ae942
path
JasonMarechal25 Jul 22, 2024
788765a
linux2
JasonMarechal25 Jul 22, 2024
a5ec824
fix install
JasonMarechal25 Jul 22, 2024
2e918ea
Version
JasonMarechal25 Jul 23, 2024
6902ea9
Disable tests and ui
JasonMarechal25 Jul 23, 2024
be15523
Don't install full run
JasonMarechal25 Jul 23, 2024
6c4bb18
[ANT-1890] Properly handle playlist_reset in generaldata.ini (#879)
JasonMarechal25 Jul 23, 2024
bf67878
Unable ubuntu
JasonMarechal25 Jul 23, 2024
c703bd0
fix ubuntu
JasonMarechal25 Jul 23, 2024
cd4f481
Revert "Don't install full run"
JasonMarechal25 Jul 24, 2024
ba4e501
Don't install every exe
JasonMarechal25 Jul 24, 2024
fdbb41a
Install full run
JasonMarechal25 Jul 24, 2024
48c319b
Revert "Install full run"
JasonMarechal25 Jul 24, 2024
8f705e3
[API]Use antares lib (#825)
JasonMarechal25 Jul 25, 2024
789c826
Merge branch 'develop' into feature/antares_in_memory
JasonMarechal25 Jul 25, 2024
f166355
Try fix build
JasonMarechal25 Jul 25, 2024
54587b0
log
JasonMarechal25 Jul 26, 2024
88b2e3f
Merge branch 'develop' into feature/antares_in_memory
JasonMarechal25 Jul 31, 2024
0411b69
Fix build
JasonMarechal25 Jul 31, 2024
463a9ea
Update antares to 9.2.0-rc1
JasonMarechal25 Aug 1, 2024
0a21b13
Remove temporary trick for antares versions
JasonMarechal25 Aug 1, 2024
2afb6d6
Update ortools
JasonMarechal25 Aug 2, 2024
000e061
Update ortools
JasonMarechal25 Aug 2, 2024
f24d9d9
Fix data
JasonMarechal25 Aug 2, 2024
6bd53fe
Remove sirius port
JasonMarechal25 Aug 8, 2024
1c28acc
Fix Link when coin is not build
JasonMarechal25 Aug 8, 2024
e66ebb7
Don't force static build of coin. Avoid incompatibility issue with or…
JasonMarechal25 Aug 8, 2024
64b39e6
Download precompiled sirius
JasonMarechal25 Aug 9, 2024
776f2a1
Download precompiled sirius
JasonMarechal25 Aug 9, 2024
2dba990
Fix assets
JasonMarechal25 Aug 9, 2024
d97aac0
Fix assets
JasonMarechal25 Aug 9, 2024
50ec079
Fix assets
JasonMarechal25 Aug 9, 2024
8fd8281
Fix assets
JasonMarechal25 Aug 9, 2024
679d6c3
Fix windows
JasonMarechal25 Aug 9, 2024
c142820
Fix oracle
JasonMarechal25 Aug 9, 2024
2c03d9c
Fix windows
JasonMarechal25 Aug 9, 2024
5da8233
Fix windows
JasonMarechal25 Aug 9, 2024
042bcfd
Merge branch 'develop' into feature/antares_in_memory
JasonMarechal25 Aug 9, 2024
791dfef
Force don't build antares to debug why not detected
JasonMarechal25 Aug 12, 2024
c1c9dc5
Remove round 10 digit
JasonMarechal25 Aug 14, 2024
f4bfd19
CI
JasonMarechal25 Aug 14, 2024
7f0b4e5
Revert "Don't install every exe"
JasonMarechal25 Aug 14, 2024
644156e
Revert data
JasonMarechal25 Aug 19, 2024
9f85c05
Merge remote-tracking branch 'origin/develop' into feature/antares_in…
JasonMarechal25 Aug 19, 2024
646263e
Update ortools version
JasonMarechal25 Aug 19, 2024
312a9a8
Improve log
JasonMarechal25 Aug 19, 2024
79c424a
logging
JasonMarechal25 Aug 19, 2024
30f3122
Update ortools
JasonMarechal25 Aug 19, 2024
ea0c532
v
JasonMarechal25 Aug 20, 2024
405b329
v
JasonMarechal25 Aug 20, 2024
813eec4
v
JasonMarechal25 Aug 20, 2024
d6b70db
v
JasonMarechal25 Aug 20, 2024
6faaa13
devtoolset 11
JasonMarechal25 Aug 20, 2024
37eea3c
devtoolset 11
JasonMarechal25 Aug 20, 2024
973b8bb
Merge branch 'refs/heads/feature/antares_in_memory' into profiling
JasonMarechal25 Aug 20, 2024
a7573a6
Version
JasonMarechal25 Aug 20, 2024
11278a6
f
JasonMarechal25 Aug 20, 2024
4b1fb4d
Update build doc
JasonMarechal25 Aug 21, 2024
56d2f4c
API02
JasonMarechal25 Aug 21, 2024
db32bed
Fix
JasonMarechal25 Aug 21, 2024
e894881
Print stack
JasonMarechal25 Aug 22, 2024
c450afc
More log
JasonMarechal25 Aug 22, 2024
231f4a6
Even more log
JasonMarechal25 Aug 22, 2024
3277f6a
Add disk info
JasonMarechal25 Aug 23, 2024
142f711
Add disk info
JasonMarechal25 Aug 23, 2024
603993f
Handle normal
JasonMarechal25 Aug 23, 2024
a79f476
RelWithDebInfo
JasonMarechal25 Aug 23, 2024
ea5c638
RelWithDebInfo
JasonMarechal25 Aug 23, 2024
2315902
Add log
JasonMarechal25 Aug 23, 2024
47e90c1
Avoid copying lps
JasonMarechal25 Aug 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove temporary trick for antares versions
JasonMarechal25 committed Aug 1, 2024
commit 0a21b13d8d50cf13ad0c08e9b0ec1d5b3671d5f4
4 changes: 1 addition & 3 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
@@ -120,13 +120,11 @@ jobs:
ortools-url: ${{env.ORTOOLS_URL}}
ortools-dir: ${{env.ORTOOLS_DIR}}

- run: echo "version=$(echo ${{steps.antares-version.outputs.result}} | sed 's/-.*//')" >> $GITHUB_ENV
shell: bash
- name: Configure
shell: bash
run: |
cmake -B _build -S . \
-DCMAKE_PREFIX_PATH="${{github.workspace}}/rte-antares-${{env.version}}-installer-64bits;${{env.ORTOOLS_DIR}}/install" \
-DCMAKE_PREFIX_PATH="${{github.workspace}}/rte-antares-${{steps.antares-version.outputs.result}}-installer-64bits;${{env.ORTOOLS_DIR}}/install" \
-DBUILD_TESTING=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_TOOLCHAIN_FILE="${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake" \
Original file line number Diff line number Diff line change
@@ -26,11 +26,10 @@ runs:
- name: download-extract antares
shell: bash
run: |
version=$(echo ${{inputs.antares-version}} | sed 's/-.*//')
mkdir -p deps
wget https://github.com/AntaresSimulatorTeam/Antares_Simulator/releases/download/v${{inputs.antares-version}}/antares-${version}-${{inputs.os-full-name}}.tar.gz
tar -xvf antares-${version}-${{inputs.os-full-name}}.tar.gz -C deps --strip-components=1
rm -rf antares-${version}-${{inputs.os-full-name}}.tar.gz
wget https://github.com/AntaresSimulatorTeam/Antares_Simulator/releases/download/v${{inputs.antares-version}}/antares-${{inputs.antares-version}}-${{inputs.os-full-name}}.tar.gz
tar -xvf antares-${{inputs.antares-version}}-${{inputs.os-full-name}}.tar.gz -C deps --strip-components=1
rm -rf antares-${{inputs.antares-version}}-${{inputs.os-full-name}}.tar.gz

- name: Download & extract OR-Tools
shell: bash
Original file line number Diff line number Diff line change
@@ -28,10 +28,9 @@ runs:
- id: download-extract
shell: bash
run: |
version=$(echo ${{inputs.antares-version}} | sed 's/-.*//')
wget https://github.com/AntaresSimulatorTeam/Antares_Simulator/releases/download/v${{inputs.antares-version}}/rte-antares-${version}-installer-64bits.zip
unzip rte-antares-${version}-installer-64bits.zip
rm -rf rte-antares-${version}-installer-64bits.zip
wget https://github.com/AntaresSimulatorTeam/Antares_Simulator/releases/download/v${{inputs.antares-version}}/rte-antares-${{inputs.antares-version}}-installer-64bits.zip
unzip rte-antares-${{inputs.antares-version}}-installer-64bits.zip
rm -rf rte-antares-${{inputs.antares-version}}-installer-64bits.zip

- name: Download & extract OR-Tools
shell: bash