GAPs integration #168
Merged
GAPs integration #168
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
Conflicts: requirements.txt sup3r/batch/batch.py sup3r/bias/bias_calc.py sup3r/pipeline/__init__.py sup3r/pipeline/config.py sup3r/pipeline/forward_pass.py sup3r/pipeline/pipeline.py sup3r/postprocessing/collection.py sup3r/preprocessing/data_handling.py sup3r/qa/qa.py sup3r/qa/stats.py sup3r/qa/visual_qa.py sup3r/solar/solar.py sup3r/utilities/cli.py sup3r/utilities/regridder.py
Conflicts: sup3r/preprocessing/data_handling/base.py sup3r/utilities/regridder.py
bnb32
requested changes
Oct 5, 2023
sup3r/solar/solar_cli.py
Outdated
| @@ -63,7 +63,7 @@ def from_config(ctx, config_file, verbose): | |||
| cmd_log = '\n\t'.join(cmd.split('\n')) | |||
| logger.debug(f'Running command:\n\t{cmd_log}') | |||
|
|
|||
| if hardware_option.lower() in ('eagle', 'slurm'): | |||
| if hardware_option.lower() in ('kestrel', 'eagle', 'slurm'): | |||
There was a problem hiding this comment.
Lets make ('kestrel', 'eagle', 'slurm') a global AVAILABLE_HARDWARE_OPTIONS, since it shows up so much.
| @@ -23,7 +22,6 @@ | |||
| 'numpy': np.__version__, | |||
| 'nrel-phygnn': phygnn.__version__, | |||
| 'nrel-rex': rex.__version__, | |||
sup3r/cli.py
Outdated
| @@ -116,16 +118,16 @@ def forward_pass(ctx, verbose): | |||
| "execution_control": { | |||
| "option": "local" | |||
| }, | |||
| "execution_control_eagle": { | |||
| "option": "eagle", | |||
| "execution_control_kestrel": { | |||
There was a problem hiding this comment.
I don't think we need this entry actually, unless this is a gaps thing? execution_control is where we put non local options also.
There was a problem hiding this comment.
Not a GAPs thing. All args should go in the execution_control block for sure. I kept it around since you guys used it in your documentation for eagle args. Do you want me to replace the original execution_control block with the HPC required args? Or just delete it entrierly?
There was a problem hiding this comment.
Yeah I'm not sure why we had that lol. The former would be great, thanks.
bnb32
approved these changes
Oct 5, 2023
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.
Remove reliance on
gaps.legacyby updating the code to use GAPs classes/functions directly. Incidentally, this allows the removal of thereVdependency as well.A cute bonus is that sup3r config files now can be JSON, JSON5, YAML, or TOML
Also updated references to
eaglewithkestrel.Also updated reqs to use latest version ofThis had already been pushed torex, which fixes the double logging issue.mainpreviously