Bring back default time limit in spheral_ats.py and in machine.yaml

LLNL · Jan 17, 2025 · 5ca0171 · 5ca0171
1 parent 215cd57
commit 5ca0171
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.gitlab/machines.yml b/.gitlab/machines.yml
@@ -7,7 +7,7 @@
     - batch
   variables:
     SCHEDULER_ACTION: allocate
-    SCHEDULER_PARAMETERS: "--res=ci --exclusive -N 2"
+    SCHEDULER_PARAMETERS: "--res=ci --exclusive -N 2 -t 120"
     NPROC: 112
     HOSTNAME: 'ruby'
   timeout: 120 minutes

diff --git a/scripts/spheral_ats.py b/scripts/spheral_ats.py
@@ -156,18 +156,16 @@ def main():
         if any(x in hostname for x in toss_machine_names):
             numNodes = numNodes if numNodes else 2
             mac_args = [f"--numNodes {numNodes}"]
+            timeLimit = timeLimit if timeLimit else 120
             inAllocVars = ["SLURM_JOB_NUM_NODES", "SLURM_NNODES"]
-            launch_cmd = f"salloc --exclusive -N {numNodes} "
-            if (timeLimit):
-                launch_cmd += f"-t {timeLimit} "
+            launch_cmd = f"salloc --exclusive -N {numNodes} -t {timeLimit}"
         elif any(x in hostname for x in blueos_machine_names):
             blueOS = True
             numNodes = numNodes if numNodes else 2
-            inAllocVars = ["LSB_MAX_NUM_PROCESSORS"]
             mac_args = ["--smpi_off", f"--numNodes {numNodes}"]
-            launch_cmd = f"bsub -nnodes {numNodes} -Is -XF -core_isolation 2 -alloc_flags atsdisable "
-            if (timeLimit):
-                launch_cmd += f"-W {timeLimit} "
+            inAllocVars = ["LSB_MAX_NUM_PROCESSORS"]
+            timeLimit = timeLimit if timeLimit else 60
+            launch_cmd = f"bsub -nnodes {numNodes} -Is -XF -core_isolation 2 -alloc_flags atsdisable -W {timeLimit}"
         if (options.ciRun):
             for i, j in ci_launch_flags.items():
                 if (i in hostname):