Skip to content

Commit

Permalink
Update GAPs req
Browse files Browse the repository at this point in the history
  • Loading branch information
ppinchuk committed Oct 2, 2023
1 parent d9ebaa2 commit 1b0e9f0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
matplotlib>=3.1
NREL-rex>=0.2.84
NREL-phygnn>=0.0.23
NREL-gaps>=0.5.0
NREL-gaps>=0.6.0
NREL-farms>=1.0.4
google-auth-oauthlib==0.5.3
pytest>=5.2
Expand Down
2 changes: 1 addition & 1 deletion sup3r/solar/solar.py
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ def get_node_cmd(cls, config):
if job_name is not None:
status_dir = config.get('status_dir', None)
status_file_arg_str = f'"{status_dir}", '
status_file_arg_str += f'command="{ModuleName.SOLAR}", '
status_file_arg_str += f'pipeline_step="{ModuleName.SOLAR}", '
status_file_arg_str += f'job_name="{job_name}", '
status_file_arg_str += 'attrs=job_attrs'

Expand Down
10 changes: 5 additions & 5 deletions sup3r/utilities/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ def kickoff_slurm_job(

status = Status.retrieve_job_status(
out_dir,
command=module_name,
pipeline_step=module_name,
job_name=name,
subprocess_manager=slurm_manager,
)
Expand Down Expand Up @@ -245,7 +245,7 @@ def kickoff_slurm_job(
# add job to sup3r status file.
Status.mark_job_as_submitted(
out_dir,
command=module_name,
pipeline_step=module_name,
job_name=name,
replace=True,
job_attrs={'job_id': out, 'hardware': 'kestrel'},
Expand Down Expand Up @@ -275,7 +275,7 @@ def kickoff_local_job(cls, module_name, ctx, cmd):
subprocess_manager = SubprocessManager

status = Status.retrieve_job_status(
out_dir, command=module_name, job_name=name
out_dir, pipeline_step=module_name, job_name=name
)
job_failed = 'fail' in str(status).lower()
job_submitted = status != 'not submitted'
Expand All @@ -297,7 +297,7 @@ def kickoff_local_job(cls, module_name, ctx, cmd):
f'name "{name}".'
)
Status.mark_job_as_submitted(
out_dir, command=module_name, job_name=name, replace=True
out_dir, pipeline_step=module_name, job_name=name, replace=True
)
subprocess_manager.submit(cmd)
msg = f'Completed sup3r {module_name} job "{name}".'
Expand Down Expand Up @@ -329,7 +329,7 @@ def add_status_cmd(cls, config, module_name, cmd):
status_dir = config.get('status_dir', None)
if job_name is not None and status_dir is not None:
status_file_arg_str = f'"{status_dir}", '
status_file_arg_str += f'command="{module_name}", '
status_file_arg_str += f'pipeline_step="{module_name}", '
status_file_arg_str += f'job_name="{job_name}", '
status_file_arg_str += 'attrs=job_attrs'

Expand Down

0 comments on commit 1b0e9f0

Please sign in to comment.