Merge pull request #131 from hagertnl/nick-issue24

Create a better strategy for RGT_ACCT_ID and RGT_SUBMIT_QUEUE
olcf · Oct 16, 2023 · b8e0950 · b8e0950
2 parents ae43fec + 9d11d4e
commit b8e0950
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 14 deletions.
diff --git a/configs/example_machine.ini b/configs/example_machine.ini
@@ -6,6 +6,7 @@ joblauncher_type = srun
 cpus_per_node = 16
 gpus_per_node = 1
 batch_queue = batch
+project_id = abc123
 submit_args = 
 nccs_test_harness_module = olcf_harness
 
@@ -21,4 +22,4 @@ git_https_server_url = https://github.com
 [TestshotDefaults]
 path_to_sspace = /home/a_user/other_dir
 system_log_tag = a_label
-project_id = abc123
+
diff --git a/harness/machine_types/lsf.py b/harness/machine_types/lsf.py
@@ -35,14 +35,16 @@ def submit_job(self, batchfilename):
         qargs = ""
         if 'RGT_SUBMIT_QUEUE' in os.environ:
             qargs += " -q " + os.environ.get('RGT_SUBMIT_QUEUE')
+        elif 'RGT_BATCH_QUEUE' in os.environ:
+            qargs += " -q " + os.environ.get('RGT_BATCH_QUEUE')
 
         if 'RGT_SUBMIT_ARGS' in os.environ:
-            qargs += " " + os.getenv('RGT_SUBMIT_ARGS')
+            qargs += " " + os.environ.get('RGT_SUBMIT_ARGS')
 
-        if 'RGT_PROJECT_ID' in os.environ:
+        if 'RGT_SUBMIT_ACCT' in os.environ:
+            qargs += " -P " + os.environ.get('RGT_SUBMIT_ACCT')
+        elif 'RGT_PROJECT_ID' in os.environ:
             qargs += " -P " + os.environ.get('RGT_PROJECT_ID')
-        elif 'RGT_ACCT_ID' in os.environ:
-            qargs += " -P " + os.environ.get('RGT_ACCT_ID')
 
         qcommand = self.__submitCmd + " " + qargs + " " + batchfilename
         print(qcommand)

diff --git a/harness/machine_types/pbs.py b/harness/machine_types/pbs.py
@@ -33,14 +33,16 @@ def submit_job(self, batchfilename):
         qargs = ""
         if 'RGT_SUBMIT_QUEUE' in os.environ:
             qargs += " -q " + os.environ.get('RGT_SUBMIT_QUEUE')
+        elif 'RGT_BATCH_QUEUE' in os.environ:
+            qargs += " -q " + os.environ.get('RGT_BATCH_QUEUE')
 
         if 'RGT_SUBMIT_ARGS' in os.environ:
-            qargs += " " + os.getenv('RGT_SUBMIT_ARGS')
+            qargs += " " + os.environ.get('RGT_SUBMIT_ARGS')
 
-        if 'RGT_PROJECT_ID' in os.environ:
+        if 'RGT_SUBMIT_ACCT' in os.environ:
+            qargs += " -A " + os.environ.get('RGT_SUBMIT_ACCT')
+        elif 'RGT_PROJECT_ID' in os.environ:
             qargs += " -A " + os.environ.get('RGT_PROJECT_ID')
-        elif 'RGT_ACCT_ID' in os.environ:
-            qargs += " -A " + os.environ.get('RGT_ACCT_ID')
 
         qcommand = self.__submitCmd + " " + qargs + " " + batchfilename
         print(qcommand)

diff --git a/harness/machine_types/rgt_test.py b/harness/machine_types/rgt_test.py
@@ -499,10 +499,10 @@ def _read_rgt_input_ini(self):
         env_dict = {}
         bq = self.get_batch_queue()
         if bq:
-            env_dict = {'submit_queue' : bq}
+            env_dict['batch_queue'] = bq
         proj = self.get_project()
         if proj:
-            env_dict = {'project_id' : proj}
+            env_dict['project_id'] = proj
         rgt_utilities.set_harness_environment(env_dict, override=True)
 
         if 'EnvVars' in rgt_test_config:

diff --git a/harness/machine_types/slurm.py b/harness/machine_types/slurm.py
@@ -35,14 +35,16 @@ def submit_job(self, batchfilename):
         qargs = ""
         if 'RGT_SUBMIT_QUEUE' in os.environ:
             qargs += " -p " + os.environ.get('RGT_SUBMIT_QUEUE')
+        elif 'RGT_BATCH_QUEUE' in os.environ:
+            qargs += " -p " + os.environ.get('RGT_BATCH_QUEUE')
 
         if 'RGT_SUBMIT_ARGS' in os.environ:
             qargs += " " + os.environ.get('RGT_SUBMIT_ARGS')
 
-        if 'RGT_PROJECT_ID' in os.environ:
+        if 'RGT_SUBMIT_ACCT' in os.environ:
+            qargs += " -A " + os.environ.get('RGT_SUBMIT_ACCT')
+        elif 'RGT_PROJECT_ID' in os.environ:
             qargs += " -A " + os.environ.get('RGT_PROJECT_ID')
-        elif 'RGT_ACCT_ID' in os.environ:
-            qargs += " -A " + os.environ.get('RGT_ACCT_ID')
 
         qcommand = self.__submitCmd + " " + qargs + " " + batchfilename
         print(qcommand)