Skip to content

Commit

Permalink
Run fix-style
Browse files Browse the repository at this point in the history
  • Loading branch information
koning committed Sep 22, 2023
1 parent b8e40b3 commit e437323
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions merlin/spec/specification.py
Original file line number Diff line number Diff line change
Expand Up @@ -371,9 +371,9 @@ def process_spec_defaults(self):
MerlinSpec.fill_missing_defaults(step["run"], defaults.STUDY_STEP_RUN)
# Insert VLAUNCHER specific variables if necessary
if "$(VLAUNCHER)" in step["run"]["cmd"]:
SHSET=""
SHSET = ""
if "csh" in step["run"]["shell"]:
SHSET="set "
SHSET = "set "
for vlaunch_var, vlaunch_val in defaults.VLAUNCHER_VARS.items():
if vlaunch_var not in step["run"]["cmd"]:
step["run"]["cmd"] = f"{SHSET}{vlaunch_var}={vlaunch_val}\n" + step["run"]["cmd"]
Expand Down
6 changes: 3 additions & 3 deletions merlin/study/script_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ class but will eventually call it. This is necessary for the VLAUNCHER to work.
- a path to the script for the cmd
- a path to the script for the restart cmd
"""
setup_vlaunch(step.run, "lsf" , False)
setup_vlaunch(step.run, "lsf", False)

return super().write_script(ws_path, step)

Expand Down Expand Up @@ -345,7 +345,7 @@ class but will eventually call it. This is necessary for the VLAUNCHER to work.
- a path to the script for the cmd
- a path to the script for the restart cmd
"""
setup_vlaunch(step.run, "slurm" , False)
setup_vlaunch(step.run, "slurm", False)

return super().write_script(ws_path, step)

Expand Down Expand Up @@ -425,7 +425,7 @@ class but will eventually call it. This is necessary for the VLAUNCHER to work.
- a path to the script for the cmd
- a path to the script for the restart cmd
"""
setup_vlaunch(step.run, "flux" , True)
setup_vlaunch(step.run, "flux", True)

return super().write_script(ws_path, step)

Expand Down

0 comments on commit e437323

Please sign in to comment.