Fix thread/proc config in benchmarks.py

Author: amandalund

benchmarks/benchmarks.py

@@ -8,27 +8,25 @@
 
 __all__ = []
 
-for _module_name, (benchmark_name, builder, thread_opts, mpi_opts, custom_metrics) in sorted(
+for _module_name, (benchmark_name, builder, configs, custom_metrics) in sorted(
     MODEL_REGISTRY.items(), key=lambda item: item[1][0]
 ):
     cls = make_benchmark(
         benchmark_name,
         builder,
-        thread_options=thread_opts,
-        mpi_options=mpi_opts,
+        configs=configs,
         custom_metrics=custom_metrics,
     )
     globals()[benchmark_name] = cls
     __all__.append(benchmark_name)
 
-for _module_name, (benchmark_name, module_path, thread_opts, mpi_opts, custom_metrics, return_metrics) in sorted(
+for _module_name, (benchmark_name, module_path, configs, custom_metrics, return_metrics) in sorted(
     SCRIPT_REGISTRY.items(), key=lambda item: item[1][0]
 ):
     cls = make_python_benchmark(
         benchmark_name,
         module_path,
-        thread_options=thread_opts,
-        mpi_options=mpi_opts,
+        configs=configs,
         custom_metrics=custom_metrics,
         return_metrics=return_metrics,
     )

benchmarks/suites/base.py

@@ -30,7 +30,7 @@ class _BaseBenchmark:
     """Common base for all benchmarks with ``time -v`` metrics."""
 
     params = (_CONFIGS,)
-    param_names = ("config",)
+    param_names = ("(threads, mpi_procs)",)
     timeout = 600
 
     configs: Tuple[Tuple[int, Optional[int]], ...] = _CONFIGS
@@ -246,6 +246,7 @@ class _PythonBenchmark(_BaseBenchmark):
     """Benchmark that runs arbitrary Python code as a subprocess."""
 
     params = (_PYTHON_DEFAULT_CONFIGS,)
+    param_names = ("(threads, mpi_procs)",)
 
     configs: Tuple[Tuple[int, Optional[int]], ...] = _PYTHON_DEFAULT_CONFIGS