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.

Sign up for GitHub

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

Split study in CMakefile #1583

Merged
merged 61 commits into from
Sep 12, 2023
Merged

Split study in CMakefile #1583

Show file tree
Hide file tree
Changes from 59 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
7683adc
Move writer in libs
JasonMarechal25 Aug 8, 2023
f072ec9
wip
JasonMarechal25 Aug 8, 2023
1f54d62
Benchmarking
JasonMarechal25 Jul 28, 2023
842f75b
Remove extra dependency
JasonMarechal25 Aug 8, 2023
a7d28cd
Move writer in libs
JasonMarechal25 Aug 9, 2023
0b5ac84
Fix post rebase
JasonMarechal25 Aug 9, 2023
e298249
Remove Yuni target include
JasonMarechal25 Aug 9, 2023
b2cbab5
Lots of lib change
JasonMarechal25 Aug 10, 2023
1e6dba1
Lots of lib change
JasonMarechal25 Aug 10, 2023
5d3af8f
Remove extra writer dependency
JasonMarechal25 Aug 10, 2023
2d2c41a
Improve Cmake correlation
JasonMarechal25 Aug 14, 2023
de3c1c2
Improve Cmake checks
JasonMarechal25 Aug 14, 2023
b1f4a35
Improve Cmake benchmarking
JasonMarechal25 Aug 14, 2023
23825fe
Improve Cmake array
JasonMarechal25 Aug 14, 2023
9b5ce54
Improve Cmake exception
JasonMarechal25 Aug 14, 2023
cc33857
Improve Cmake inifile
JasonMarechal25 Aug 14, 2023
2aed937
Improve Cmake io
JasonMarechal25 Aug 14, 2023
70cfc64
Improve Cmake jit
JasonMarechal25 Aug 14, 2023
2576f12
Improve Cmake logs
JasonMarechal25 Aug 14, 2023
188ae0d
Fix date cmake
JasonMarechal25 Aug 14, 2023
2cc0aa6
Fix compil for logs
JasonMarechal25 Aug 16, 2023
5010eb0
Sys wip
JasonMarechal25 Aug 17, 2023
2bec0d9
Memory wip
JasonMarechal25 Aug 17, 2023
2c49732
Finish Memory/sys
JasonMarechal25 Aug 17, 2023
4076abb
Merge remote-tracking branch 'origin/develop' into feature/cmake_memo…
JasonMarechal25 Aug 18, 2023
d8b6d49
Fix post merge
JasonMarechal25 Aug 18, 2023
9a81f51
Remove extra include
JasonMarechal25 Aug 21, 2023
7a46828
Fix include
JasonMarechal25 Aug 21, 2023
45a5f8d
Remove sys as direct dependency of antares-core (#1561)
JasonMarechal25 Aug 21, 2023
331d28c
Merge remote-tracking branch 'origin/develop' into feature/cmake_memo…
JasonMarechal25 Aug 21, 2023
bd96c41
Remove memory usage
JasonMarechal25 Aug 21, 2023
e9930fe
Merge branch 'feature/delete_memory_usage' into feature/cmake_memory_2
JasonMarechal25 Aug 21, 2023
b85e09a
Fix merge
JasonMarechal25 Aug 22, 2023
f7749d0
Remove extra dependency
JasonMarechal25 Aug 22, 2023
2117563
Move public dependency as private
JasonMarechal25 Aug 22, 2023
c8a6faa
Remove deprecated dependency
JasonMarechal25 Aug 22, 2023
d0bed60
Split Duration collector and StudyInfoCollector
JasonMarechal25 Aug 22, 2023
9f402ee
Move OptimizationInfo in proper place
JasonMarechal25 Aug 22, 2023
2d00b89
Split SimulationInfoCollection from Benchmarking
JasonMarechal25 Aug 22, 2023
0ca7bb9
Split study in CMakefile
JasonMarechal25 Aug 23, 2023
ad6f6cd
Merge remote-tracking branch 'origin/feature/cmake_memory_2' into fea…
JasonMarechal25 Aug 23, 2023
d9c94e7
Merge remote-tracking branch 'origin/develop' into feature/cmake_memo…
JasonMarechal25 Aug 23, 2023
12ca770
Merge remote-tracking branch 'origin/develop' into feature/work
JasonMarechal25 Aug 23, 2023
1a6f294
Merge branch 'feature/cmake_memory_2' into feature/work
JasonMarechal25 Aug 23, 2023
4fd01cc
Merge branch 'feature/work' into feature/study
JasonMarechal25 Aug 23, 2023
d6e5113
Fix merge
JasonMarechal25 Aug 23, 2023
40b2c65
Remove lots of libs from core
JasonMarechal25 Aug 24, 2023
d25dc66
Remove dependency to libantares-core
JasonMarechal25 Aug 24, 2023
0f27e4b
Merge remote-tracking branch 'origin/develop' into feature/study
JasonMarechal25 Aug 28, 2023
6aacab7
Fix boost compil
JasonMarechal25 Aug 28, 2023
cb8b3c3
Fix boost compil
JasonMarechal25 Aug 28, 2023
5df5380
Fix hostname/policy link error
JasonMarechal25 Aug 29, 2023
a6d258a
Add missing link to thermal definition
JasonMarechal25 Aug 29, 2023
e397255
Make yuni public in lib-matrix for test
JasonMarechal25 Aug 29, 2023
1bb5828
Loosen build parallelization
JasonMarechal25 Aug 29, 2023
f3dd7b5
Try fix
JasonMarechal25 Aug 29, 2023
26b47b0
Remove extra include to log causing link error
JasonMarechal Aug 30, 2023
5905fe4
Fix windows compilation: missing link to winsock
JasonMarechal Aug 30, 2023
71fede5
Fix UI compilation
JasonMarechal Aug 30, 2023
28e1e5d
Revert removing -j options during CI
JasonMarechal25 Sep 12, 2023
40e4383
Remove deps to core (#1586)
JasonMarechal25 Sep 12, 2023
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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/windows-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:

- name: Build
run: |
cmake --build _build --config release -j2
cmake --build _build --config release
JasonMarechal25 marked this conversation as resolved.
Show resolved Hide resolved

- name: Remove OR-Tools install directory to free some disk space
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-vcpkg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
- name: Build
shell: bash
run: |
cmake --build _build --config release -j2
cmake --build _build --config release
JasonMarechal25 marked this conversation as resolved.
Show resolved Hide resolved

- name: Run unfeasibility-related tests
run: |
Expand Down
7 changes: 4 additions & 3 deletions src/analyzer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,12 @@ INSTALL(EXPORT antares-analyzer

target_link_libraries(antares-${ANTARES_PRG_VERSION}-analyzer
PRIVATE
libantares-core
Antares::date
Antares::sys
yuni-static-core
${CMAKE_THREADS_LIBS_INIT}
libantares-core #local.h
PUBLIC
Antares::study #atsp -> xcast
Antares::sys
)

import_std_libs(antares-${ANTARES_PRG_VERSION}-analyzer)
Expand Down
2 changes: 1 addition & 1 deletion src/analyzer/atsp/atsp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <memory>
#include <yuni/core/string.h>
#include <antares/study/xcast/xcast.h>
#include <antares/study.h>
#include <antares/study/study.h>

namespace Antares
{
Expand Down
Loading