Changeset 27782

Timestamp:

06/05/23 14:08:11 (22 months ago)

Author:

jdquinn

Message:

BUG: Allow runme to be called as function or script.

File:

• issm/trunk-jpl/test/NightlyRun/runme.py (modified) (1 diff)

issm/trunk-jpl/test/NightlyRun/runme.py

@@ -123 +123 @@
     i1, i2 = parallelrange(rank, numprocs, len(list_ids))  # Get tests for this CPU only
     list_ids = list_ids[i1:i2 + 1]
-    if id is not None:
-        if np.size(id) > 0 or (len(id[0]) > 0 or len(id[1]) > 0):
-            test_ids = set(GetIds(id)).intersection(set(list_ids))
-            benchmark = None
-        else:
-            print(('runme error: \'id\' argument "{}" does not follow the required protocol. When calling runme as a function from Python runtime, use runme(<int>). If calling runme.py from command line, use runme.py <options>'.format(id)))
-            exit()
+    # Check if we are calling runme as a function with a single integer or string argument and, if so, convert to the proper protocol
+    if isinstance(id, int):
+        id = str(id)
+    if isinstance(id, str):
+        id = [[id], []]
+    if len(id[0]) > 0 or len(id[1]) > 0:
+        test_ids = set(GetIds(id)).intersection(set(list_ids))
+        benchmark = None
     else:
         # If no tests are specifically provided, do them all