Skip to content

Commit

Permalink
eagle -> kestrel
Browse files Browse the repository at this point in the history
  • Loading branch information
ppinchuk committed Sep 13, 2023
1 parent 9bd3a82 commit f571ad7
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion sup3r/bias/bias_calc_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def from_config(ctx, config_file, verbose=False):
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'):
kickoff_slurm_job(ctx, cmd, **exec_kwargs)
else:
kickoff_local_job(ctx, cmd)
Expand Down
42 changes: 21 additions & 21 deletions sup3r/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,16 @@ def forward_pass(ctx, verbose):
"execution_control": {
"option": "local"
},
"execution_control_eagle": {
"option": "eagle",
"execution_control_kestrel": {
"option": "kestrel",
"walltime": 4,
"alloc": "sup3r"
}
}
Note that the ``execution_control`` block will run the job locally, while
the ``execution_control_eagle`` block are kwargs that would be required to
distribute the job on multiple nodes on the NREL HPC.
Note that the ``execution_control`` block will run the job locally,
while the ``execution_control_kestrel`` block are kwargs that would
be required to distribute the job on multiple nodes on the NREL HPC.
"""
config_file = ctx.obj['CONFIG_FILE']
verbose = any([verbose, ctx.obj['VERBOSE']])
Expand Down Expand Up @@ -167,16 +167,16 @@ def solar(ctx, verbose):
"execution_control": {
"option": "local"
},
"execution_control_eagle": {
"option": "eagle",
"execution_control_kestrel": {
"option": "kestrel",
"walltime": 4,
"alloc": "sup3r"
}
}
Note that the ``execution_control`` block will run the job locally, while
the ``execution_control_eagle`` block are kwargs that would be required to
distribute the job on multiple nodes on the NREL HPC.
Note that the ``execution_control`` block will run the job locally,
while the ``execution_control_kestrel`` block are kwargs that would
be required to distribute the job on multiple nodes on the NREL HPC.
"""
config_file = ctx.obj['CONFIG_FILE']
verbose = any([verbose, ctx.obj['VERBOSE']])
Expand Down Expand Up @@ -231,16 +231,16 @@ def bias_calc(ctx, verbose):
"execution_control": {
"option": "local"
},
"execution_control_eagle": {
"option": "eagle",
"execution_control_kestrel": {
"option": "kestrel",
"walltime": 4,
"alloc": "sup3r"
}
}
Note that the ``execution_control`` block will run the job locally, while
the ``execution_control_eagle`` block are kwargs that would be required to
distribute the job on multiple nodes on the NREL HPC.
Note that the ``execution_control`` block will run the job locally,
while the ``execution_control_kestrel`` block are kwargs that would
be required to distribute the job on multiple nodes on the NREL HPC.
"""
config_file = ctx.obj['CONFIG_FILE']
verbose = any([verbose, ctx.obj['VERBOSE']])
Expand Down Expand Up @@ -279,7 +279,7 @@ def data_extract(ctx, verbose):
}
Note that the ``execution_control`` has the same options as forward-pass
and you can set ``"option": "eagle"`` to run on the NREL HPC.
and you can set ``"option": "kestrel"`` to run on the NREL HPC.
"""
config_file = ctx.obj['CONFIG_FILE']
verbose = any([verbose, ctx.obj['VERBOSE']])
Expand Down Expand Up @@ -318,7 +318,7 @@ def data_collect(ctx, verbose):
}
Note that the ``execution_control`` has the same options as forward-pass
and you can set ``"option": "eagle"`` to run on the NREL HPC.
and you can set ``"option": "kestrel"`` to run on the NREL HPC.
"""
config_file = ctx.obj['CONFIG_FILE']
verbose = any([verbose, ctx.obj['VERBOSE']])
Expand Down Expand Up @@ -359,7 +359,7 @@ def qa(ctx, verbose):
}
Note that the ``execution_control`` has the same options as forward-pass
and you can set ``"option": "eagle"`` to run on the NREL HPC.
and you can set ``"option": "kestrel"`` to run on the NREL HPC.
"""
config_file = ctx.obj['CONFIG_FILE']
verbose = any([verbose, ctx.obj['VERBOSE']])
Expand Down Expand Up @@ -399,7 +399,7 @@ def visual_qa(ctx, verbose):
}
Note that the ``execution_control`` has the same options as forward-pass
and you can set ``"option": "eagle"`` to run on the NREL HPC.
and you can set ``"option": "kestrel"`` to run on the NREL HPC.
"""
config_file = ctx.obj['CONFIG_FILE']
verbose = any([verbose, ctx.obj['VERBOSE']])
Expand Down Expand Up @@ -443,7 +443,7 @@ def stats(ctx, verbose):
}
Note that the ``execution_control`` has the same options as forward-pass
and you can set ``"option": "eagle"`` to run on the NREL HPC.
and you can set ``"option": "kestrel"`` to run on the NREL HPC.
"""
config_file = ctx.obj['CONFIG_FILE']
verbose = any([verbose, ctx.obj['VERBOSE']])
Expand Down Expand Up @@ -486,7 +486,7 @@ def regrid(ctx, verbose):
}
Note that the ``execution_control`` has the same options as forward-pass
and you can set ``"option": "eagle"`` to run on the NREL HPC.
and you can set ``"option": "kestrel"`` to run on the NREL HPC.
"""
config_file = ctx.obj['CONFIG_FILE']
verbose = any([verbose, ctx.obj['VERBOSE']])
Expand Down
2 changes: 1 addition & 1 deletion sup3r/pipeline/forward_pass_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def from_config(ctx, config_file, verbose=False):
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'):
kickoff_slurm_job(ctx, cmd, **exec_kwargs)
else:
kickoff_local_job(ctx, cmd)
Expand Down
2 changes: 1 addition & 1 deletion sup3r/postprocessing/data_collect_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def from_config(ctx, config_file, verbose=False):
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'):
kickoff_slurm_job(ctx, cmd, **exec_kwargs)
else:
kickoff_local_job(ctx, cmd)
Expand Down
2 changes: 1 addition & 1 deletion sup3r/preprocessing/data_extract_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def from_config(ctx, config_file, verbose=False):
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'):
kickoff_slurm_job(ctx, cmd, **exec_kwargs)
else:
kickoff_local_job(ctx, cmd)
Expand Down
2 changes: 1 addition & 1 deletion sup3r/solar/solar_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def from_config(ctx, config_file, verbose=False):
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'):
kickoff_slurm_job(ctx, cmd, **exec_kwargs)
else:
kickoff_local_job(ctx, cmd)
Expand Down
4 changes: 2 additions & 2 deletions sup3r/utilities/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def from_config(cls, module_name, module_class, 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'):
cls.kickoff_slurm_job(module_name, ctx, cmd, **exec_kwargs)
else:
cls.kickoff_local_job(module_name, ctx, cmd)
Expand Down Expand Up @@ -248,7 +248,7 @@ def kickoff_slurm_job(
command=module_name,
job_name=name,
replace=True,
job_attrs={'job_id': out, 'hardware': 'eagle'},
job_attrs={'job_id': out, 'hardware': 'kestrel'},
)

click.echo(msg)
Expand Down
2 changes: 1 addition & 1 deletion sup3r/utilities/regridder_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def from_config(ctx, config_file, verbose=False):
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'):
kickoff_slurm_job(ctx, cmd, **exec_kwargs)
else:
kickoff_local_job(ctx, cmd)
Expand Down

0 comments on commit f571ad7

Please sign in to comment.