Changeset 4751

Timestamp:

Oct 19, 2020 5:03:07 PM (4 years ago)

Author:

knoop

Message:

New feature for palmtest to configure number of OpenMP threads per testcase

Location:

palm/trunk

Files:

• SCRIPTS/palmtest (modified) (2 diffs)
• TESTS/cases/user_interface/case_config.yml (modified) (1 diff)

palm/trunk/SCRIPTS/palmtest

@@ -548 +548 @@
 
     def _execute(self, name, build_name):
-        execution_failed = Executor.execute(
+        cmd_list = [
+            os.path.join(self.test_dir, 'trunk', 'SCRIPTS', 'palmrun'),
+            '-c', '\"' + build_name + '\"',
+            '-r', name,
+            '-a', '\"' + ' '.join(self.test_case.activation_strings) + '\"',
+            '-X', str(self.cores),
+        ]
+        if self.test_case.omp_num_threads_found:
+            cmd_list.extend(
+                [
+                    '-O', str(self.test_case.omp_num_threads),
+                ]
+            )
+        cmd_list.extend(
             [
-                os.path.join(self.test_dir, 'trunk', 'SCRIPTS', 'palmrun'),
-                '-c', '\"' + build_name + '\"',
-                '-r', name,
-                '-a', '\"' + ' '.join(self.test_case.activation_strings) + '\"',
-                '-X', str(self.cores),
-                '-T', str(self.cores),
                 '-B',
                 '-v',
                 '-z',
-            ],
+            ]
+        )
+        execution_failed = Executor.execute(
+            cmd_list,
             cwd=self.test_dir,
             verbose=self.verbose,
@@ -944 +954 @@
             return True, colored('[missing \"allowed_number_of_cores\" keyword]', 'red')
         self.allowed_number_of_cores = config['allowed_number_of_cores']
+
+        if 'omp_num_threads' in config:
+            self.omp_num_threads_found = True
+            self.omp_num_threads = config['omp_num_threads']
+        else:
+            self.omp_num_threads_found = False
 
         if 'activation_strings' not in config:

palm/trunk/TESTS/cases/user_interface/case_config.yml

@@ -12 +12 @@
   - 16
 
+omp_num_threads: 2
+
 activation_strings:
   - "d3#"