maubin/sbmy_control
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more improvements

Browse source
This commit is contained in:
Mayeul Aubin 2025-03-06 16:22:04 +01:00
parent e488275523
commit 5fa4dd9683
6 changed files with 56 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scola.py
View file

@ -44,6 +44,7 @@ def main_scola(parsed_args):
elif parsed_args.execution == "slurm":
from slurm_submission import create_slurm_script, parse_arguments_slurm
from args_main import parse_arguments_main
import os
print_message("Running scola in slurm mode.", 1, "scola", verbose=parsed_args.verbose)
slurm_dict=parse_arguments_slurm(parsed_args)
main_dict=parse_arguments_main(parsed_args)
@ -53,8 +54,8 @@ def main_scola(parsed_args):
print_message("Submitting all boxes.", 2, "scola", verbose=parsed_args.verbose)
slurm_script = slurm_dict["scripts"]+"scola.sh"
if not isfile(slurm_script):
print_message(f"SLURM script {slurm_script} does not exist. Creating it.", 2, "scola", verbose=parsed_args.verbose)
if not isfile(slurm_script) or parsed_args.force:
print_message(f"SLURM script {slurm_script} does not exist (or forced). Creating it.", 2, "scola", verbose=parsed_args.verbose)
create_slurm_script(
slurm_template=slurm_dict["scola_template"],
slurm_script=slurm_script,
@ -62,6 +63,7 @@ def main_scola(parsed_args):
job_config_file=paramfile,
job_log=log_file,
array=(1, nboxes_tot),
job_name=main_dict["simname"],
)
print_message(f"SLURM script written to {slurm_script}.", 3, "scola", verbose=parsed_args.verbose)
else:
@ -94,6 +96,7 @@ def main_scola(parsed_args):
job_config_file=paramfile,
job_log=log_file,
array=missing_tiles,
job_name=main_dict["simname"],
)
print_message(f"SLURM script written to {slurm_script}.", 3, "scola", verbose=parsed_args.verbose)
else:
@ -109,8 +112,8 @@ def main_scola(parsed_args):
print_message("sCOLA job submitted.", 2, "scola", verbose=parsed_args.verbose)
os.remove(slurm_script) # Remove the script after submission (because it is specific to the missing tiles)
else:
raise ValueError(f"Execution mode {parsed_args.execution} not recognized.")