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

Feature/refactoring parallel years #180

Open
wants to merge 9 commits into
base: New-Antares-Emulator-2
Choose a base branch
from
Open

Feature/refactoring parallel years #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9e1f5a7
[DEV] Rework parallelization computation and remove duplication
kathvargasr Dec 14, 2022
b2e33ee
Add more UTs and resolve code review comments
kathvargasr Dec 19, 2022
d8cba1d
Explain why call to loadAreaList is necessary
JasonMarechal25 Jan 23, 2023
3d36a4c
Inject the number of core to compute parallel years
JasonMarechal25 Jan 23, 2023
dc8aba1
Remove dependency to Data::StudyLoadOptions for test
JasonMarechal25 Jan 24, 2023
2da0d63
Remove unused fixture member
JasonMarechal25 Jan 24, 2023
813cc77
Changes setSizes to a simple counter
JasonMarechal25 Jan 24, 2023
813e2c0
Rename some member to follow conventions
JasonMarechal25 Jan 24, 2023
11a8564
Fix Simulation Cores in UI
flomnes Feb 7, 2023
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
2 changes: 2 additions & 0 deletions src/libs/antares/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,8 @@ set(SRC
study.h
study/estimate.memory-footprint.cpp
study/study.cpp
study/parallel-years.cpp
study/parallel-years.h
study/correlation-updater.hxx
study/study.importprepro.cpp
study/memory-usage.h
Expand Down
9 changes: 1 addition & 8 deletions src/libs/antares/study/load.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,8 @@ bool Study::internalLoadFromFolder(const String& path, const StudyLoadOptions& o
// -------------------------
// Getting the number of logical cores to use before loading and creating the areas :
// Areas need this number to be up-to-date at construction.
getNumberOfCores(options.forceParallel, options.maxNbYearsInParallel);

// In case the study is run in the draft mode, only 1 core is allowed
if (parameters.mode == Data::stdmAdequacyDraft)
maxNbYearsInParallel = 1;

// In case parallel mode was not chosen, only 1 core is allowed
if (!options.enableParallel && !options.forceParallel)
maxNbYearsInParallel = 1;
getNumberOfCores(options.forceParallel, options.enableParallel, options.maxNbYearsInParallel);

// End logical core --------

Expand Down
Loading