[API] Better handling of execution modes #797
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
JasonMarechal25
commented
Apr 26, 2024
•
JasonMarechal25
commented
- Properly distinguish between archive, file and study mode
- study mode (using antares lib) not implemented yet
- Code cleanup
- Refactor how to handle mandatory but exclusive parameters. Hopefully make it easier to add new one in the future
JasonMarechal25
changed the base branch from
develop
to
feature/refacto_test_lpnamer
tbittar
requested changes
May 15, 2024
data_test/tests_lpnamer/SmallTestFiveCandidates/reportbenders.txt
Outdated
Show resolved
Hide resolved
|
|
||
| CreateDirectories(deduced_xpansion_output_dir); | ||
| CreateDirectories(xpansion_output_dir); // Ca ou -Xpansion ? |
There was a problem hiding this comment.
Does the Python part (or any other part of the code) rely on the -Xpansion suffix ?
There was a problem hiding this comment.
Yes, but the conditions are foggy
| @@ -187,6 +223,8 @@ void ProblemGeneration::RunProblemGeneration( | |||
| antares_version < first_version_without_variables_files; | |||
| (*logger)(LogUtils::LOGLEVEL::INFO) | |||
| << "rename problems: " << std::boolalpha << rename_problems << std::endl; | |||
|
|
|||
|
|
|||
| auto files_mapper = FilesMapper(antares_archive_path, xpansion_output_dir); | |||
| auto mpsList = files_mapper.MpsAndVariablesFilesVect(); | |||
There was a problem hiding this comment.
Should we do this in ANTARES_API mode ?
There was a problem hiding this comment.
Renaming? Probably not. Adding a todo in #753
There was a problem hiding this comment.
No I meant creating the mpsList object (it seems unused in ANTARES_API mode) ?
There was a problem hiding this comment.
Yes in the final implementation they're not used for API mode.
flomnes
reviewed
May 16, 2024
tbittar
approved these changes
May 16, 2024
JasonMarechal25
force-pushed
the
feature/modes
branch
from
7e15208 to
f8c8ebb
Compare
JasonMarechal25
force-pushed
the
feature/modes
branch
from
f8c8ebb to
1775349
Compare
|
18 tasks
JasonMarechal25
added a commit
that referenced
this pull request
Sep 13, 2024
Introduce "study mode". A way to run xpansion and problem generation with a study folder as parameter. In this case Antares will not be run as a stand-alone but as a library by problem generation. - New ADRs - Add a "new" data set for lpnamer E2E tests: SmallTestFiveCandidates, a copy of the example provided by Xpansion. - Refactor test_lpnamerEndToEnd.py : when possible prefer the use multiple @parametrize instead of writing the combinations in a list. - Refactor test_lpnamerEndToEnd.py : copy the test data in a temporary folder and works there. Prevent creating outputs in source code. - Add a test case for Study mode in test_lpnamerEndToEnd.py - Add a new E2E test: short memory - Refactor ProblemGenerationExeOptionsTest to test several combinations of mutually exclusive parameters - In SolverFactory.cpp call Init() on solver objects before returning them. Prevent temporal coupling for Xpress solver where a call to init() was mandatory. - Add Antares as a build dependency Missing pieces (every thing is open to discussion): - [ ] Handle Antares error #888 - [x] Update general data ini - [ ] Revert general data ini #889 - [x] Write ADR - [ ] Update sequence diagram #890 - [ ] Maybe update C4 #890 - [x] Use enum mode in LPFileExtractor #797 - [ ] find/define a way to log before lp dir exist (for antares error for exemple) #888 - [ ] Handle variables.txt directly at Lps level (SignificationMetierDesVariables) - [ ] Factorise variables name and "calculate" time step with week number on xpansion side (A faire dans Antares bien et vite) - [x] Cleanup python to only support memory mode (See ADR, we keep some support for now) - [x] antares named problèmes force mps writing. Peut etre pas besoin de l'option named sachant que les variables sont nommées dans la structure LP - [ ] Mettre à jour les docs: notamment comment build, dépendances, etc #893 - [ ] Investigate to use full run executable with --study option and use fullrun driver #892 - [x] Handle PBGen step with memory - [ ] Add entry in multisolver to rename a range of col/var #753 (comment) #891 - [ ] Run Antares in parallele mode Following other PR: - [ ] Don't overly rename problem in API mode --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: abdoulbari zakir <[email protected]> Co-authored-by: tbittar <[email protected]> Co-authored-by: Thomas Bittar <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.