Bug - Fix issues caused by omegaconf version update

superbench/executor/executor.py

@@ -228,29 +228,16 @@ def exec(self):
                     logger.warning('Monitor can not support CPU platform.')
 
             benchmark_real_name = benchmark_name.split(':')[0]
-            if 'frameworks' in benchmark_config:
-                for framework in benchmark_config.frameworks or [Framework.NONE.value]:
-                    if benchmark_real_name == 'model-benchmarks' or (
-                        ':' not in benchmark_name and benchmark_name.endswith('_models')
-                    ):
-                        for model in benchmark_config.models:
-                            full_name = f'{benchmark_name}/{framework}-{model}'
-                            logger.info('Executor is going to execute %s.', full_name)
-                            context = BenchmarkRegistry.create_benchmark_context(
-                                model,
-                                platform=self.__get_platform(),
-                                framework=Framework(framework.lower()),
-                                parameters=self.__get_arguments(
-                                    {} if 'parameters' not in benchmark_config else benchmark_config.parameters
-                                )
-                            )
-                            result = self.__exec_benchmark(full_name, context)
-                            benchmark_results.append(result)
-                    else:
-                        full_name = benchmark_name
+            frameworks = benchmark_config.get('frameworks', [Framework.NONE.value])
+            for framework in frameworks:
+                if benchmark_real_name == 'model-benchmarks' or (
+                    ':' not in benchmark_name and benchmark_name.endswith('_models')
+                ):
+                    for model in benchmark_config.models:
+                        full_name = f'{benchmark_name}/{framework}-{model}'
                         logger.info('Executor is going to execute %s.', full_name)
                         context = BenchmarkRegistry.create_benchmark_context(
-                            benchmark_real_name,
+                            model,
                             platform=self.__get_platform(),
                             framework=Framework(framework.lower()),
                             parameters=self.__get_arguments(
@@ -259,6 +246,18 @@ def exec(self):
                         )
                         result = self.__exec_benchmark(full_name, context)
                         benchmark_results.append(result)
+                else:
+                    full_name = benchmark_name
+                    logger.info('Executor is going to execute %s.', full_name)
+                    context = BenchmarkRegistry.create_benchmark_context(
+                        benchmark_real_name,
+                        platform=self.__get_platform(),
+                        framework=Framework(framework.lower()),
+                        parameters=self.
+                        __get_arguments({} if 'parameters' not in benchmark_config else benchmark_config.parameters)
+                    )
+                    result = self.__exec_benchmark(full_name, context)
+                    benchmark_results.append(result)
 
             if monitor:
                 monitor.stop()

superbench/runner/runner.py

@@ -84,7 +84,7 @@ def __validate_sb_config(self):    # noqa: C901
                     if 'proc_num' not in mode:
                         self._sb_benchmarks[name].modes[idx].proc_num = 8
                 elif mode.name == 'mpi':
-                    if 'machinefile' not in mode:
+                    if 'mca' not in mode:
                         self._sb_benchmarks[name].modes[idx].mca = {
                             'pml': 'ob1',
                             'btl': '^openib',
@@ -448,7 +448,7 @@ def _run_proc(self, benchmark_name, mode, vars):
             mode.env.update({'SB_MODE_SERIAL_INDEX': mode.serial_index, 'SB_MODE_PARALLEL_INDEX': mode.parallel_index})
         logger.info('Runner is going to run %s in %s mode, proc rank %d.', benchmark_name, mode.name, mode.proc_rank)
 
-        timeout = self._sb_benchmarks[benchmark_name].get('timeout', 60)
+        timeout = self._sb_benchmarks[benchmark_name].get('timeout', None)
         if isinstance(timeout, int):
             timeout = max(timeout, 60)
 

tests/executor/test_executor.py

@@ -166,5 +166,7 @@ def test_exec_default_benchmarks(self, mock_launch_benchmark):
             self.assertTrue(p.is_dir())
             self.assertTrue((p / 'results.json').is_file())
             with (p / 'results.json').open() as f:
-                for result in json.load(f):
+                results = json.load(f)
+                self.assertTrue(len(results) > 0)
+                for result in results:
                     self.assertIn(benchmark_name, result['name'])