Merge pull request #228 from IntelPython/fix/npbench_configs

Fix npbench configurations

Author: ZzEeKkAa

dpbench/config/reader.py

@@ -109,9 +109,6 @@ def read_configs(
             postfixes=postfixes_tmp,
         )
 
-    if with_npbench:
-        fix_npbench_configs(config.benchmarks)
-
     return config
 
 
@@ -232,6 +229,8 @@ def setup_init(config: Benchmark, modules: list[str]) -> None:
     init_module = None
     if config.module_name in modules:
         init_module = config.module_name
+    elif config.short_name in modules:
+        init_module = config.short_name
     elif config.module_name + "_initialize" in modules:
         init_module = config.module_name + "_initialize"
 
@@ -251,6 +250,34 @@ def setup_init(config: Benchmark, modules: list[str]) -> None:
             )
 
 
+def discover_module_name_and_postfix(module: str, config: Config):
+    """Discover real module name and postfix for the implementation.
+
+    Args:
+        module: Name of the root python module (either python file or top level
+            folder for sycl).
+        config: Module config.
+
+    Returns: (module_name, postfix).
+    """
+    postfix = ""
+    module_name = ""
+
+    if module.endswith("sycl_native_ext"):
+        module_name = (
+            f"{module}.{config.module_name}_sycl._{config.module_name}_sycl"
+        )
+        postfix = "sycl"
+    else:
+        module_name = module
+        if module.startswith(config.module_name):
+            postfix = module[len(config.module_name) + 1 :]
+        elif module.startswith(config.short_name):
+            postfix = module[len(config.short_name) + 1 :]
+
+    return module_name, postfix
+
+
 def read_benchmark_implementations(
     config: Benchmark,
     known_implementations: list[Implementation],
@@ -289,17 +316,7 @@ def read_benchmark_implementations(
     setup_init(config, modules)
 
     for module in modules:
-        postfix = ""
-        module_name = ""
-
-        if module.endswith("sycl_native_ext"):
-            module_name = (
-                f"{module}.{config.module_name}_sycl._{config.module_name}_sycl"
-            )
-            postfix = "sycl"
-        else:
-            module_name = module
-            postfix = module[len(config.module_name) + 1 :]
+        module_name, postfix = discover_module_name_and_postfix(module, config)
 
         if postfixes and postfix not in postfixes:
             continue
@@ -318,6 +335,8 @@ def read_benchmark_implementations(
             impl_mod = importlib.import_module(package_path)
 
             for func in [
+                module,
+                f"{module}_{postfix}",
                 config.module_name,
                 f"{config.module_name}_{postfix}",
                 "kernel",
@@ -349,72 +368,3 @@ def get_benchmark_index(configs: list[Benchmark], module_name: str) -> int:
         ),
         None,
     )
-
-
-def fix_npbench_configs(configs: list[Benchmark]):
-    """Applies configuration fixes for some npbench benchmarks.
-
-    Fixes required due to the difference in framework implementations.
-    """
-    index = get_benchmark_index(configs, "mandelbrot1")
-    if index is not None:
-        configs[index] = modify_args(
-            configs[index], modifier=lambda s: s.lower()
-        )
-
-    index = get_benchmark_index(configs, "mandelbrot2")
-    if index is not None:
-        configs[index] = modify_args(
-            configs[index],
-            modifier=lambda s: "itermax" if s == "maxiter" else s.lower(),
-        )
-
-    index = get_benchmark_index(configs, "conv2d")
-    if index is not None:
-        config = configs[index]
-
-        config.module_name = "conv2d_bias"
-        configs[index] = config
-
-        for impl in config.implementations:
-            impl.func_name = "conv2d_bias"
-
-    index = get_benchmark_index(configs, "nbody")
-    if index is not None:
-        configs[index].output_args.append("pos")
-        configs[index].output_args.append("vel")
-
-    index = get_benchmark_index(configs, "scattering_self_energies")
-    if index is not None:
-        configs[index].output_args.append("Sigma")
-
-    index = get_benchmark_index(configs, "correlation")
-    if index is not None:
-        configs[index].output_args.append("data")
-
-    index = get_benchmark_index(configs, "doitgen")
-    if index is not None:
-        configs[index].output_args.append("A")
-
-
-def modify_args(config: Benchmark, modifier: Callable[[str], str]) -> Benchmark:
-    """Applies modifier to function argument names.
-
-    Current implementation applies modifier to
-      - all presets keys, not preset names;
-      - all input_args;
-      - all array_args;
-      - all output_args.
-    """
-    config.parameters = Presets(
-        {
-            preset: {modifier(k): v for k, v in parameters.items()}
-            for preset, parameters in config.parameters.items()
-        }
-    )
-
-    config.input_args = [modifier(arg) for arg in config.input_args]
-    config.array_args = [modifier(arg) for arg in config.array_args]
-    config.output_args = [modifier(arg) for arg in config.output_args]
-
-    return config

dpbench/configs/bench_info/npbench/conv2d_bias.toml

@@ -7,7 +7,7 @@
 name = "Conv2D with Bias"
 short_name = "conv2d"
 relative_path = "deep_learning/conv2d_bias"
-module_name = "conv2d"
+module_name = "conv2d_bias"
 func_name = "conv2d_bias"
 kind = "microbench"
 domain = "Learning"

dpbench/configs/bench_info/npbench/mandelbrot1.toml

@@ -18,8 +18,8 @@ input_args = [
     "xmax",
     "ymin",
     "ymax",
-    "XN",
-    "YN",
+    "xn",
+    "yn",
     "maxiter",
     "horizon",
 ]
@@ -30,39 +30,39 @@ norm_error = 0.001
 [benchmark.parameters.S]
 xmin = -1.75
 xmax = 0.25
-XN = 125
+xn = 125
 ymin = -1.0
 ymax = 1.0
-YN = 125
+yn = 125
 maxiter = 60
 horizon = 2.0
 
 [benchmark.parameters.M]
 xmin = -1.75
 xmax = 0.25
-XN = 250
+xn = 250
 ymin = -1.0
 ymax = 1.0
-YN = 250
+yn = 250
 maxiter = 150
 horizon = 2.0
 
 [benchmark.parameters.L]
 xmin = -2.0
 xmax = 0.5
-XN = 833
+xn = 833
 ymin = -1.25
 ymax = 1.25
-YN = 833
+yn = 833
 maxiter = 200
 horizon = 2.0
 
 [benchmark.parameters.paper]
 xmin = -2.25
 xmax = 0.75
-XN = 1000
+xn = 1000
 ymin = -1.25
 ymax = 1.25
-YN = 1000
+yn = 1000
 maxiter = 200
 horizon = 2.0

dpbench/configs/bench_info/npbench/mandelbrot2.toml

@@ -18,9 +18,9 @@ input_args = [
     "xmax",
     "ymin",
     "ymax",
-    "XN",
-    "YN",
-    "maxiter",
+    "xn",
+    "yn",
+    "itermax",
     "horizon",
 ]
 array_args = []
@@ -30,39 +30,39 @@ norm_error = 0.001
 [benchmark.parameters.S]
 xmin = -2.0
 xmax = 0.5
-XN = 200
+xn = 200
 ymin = -1.25
 ymax = 1.25
-YN = 200
-maxiter = 40
+yn = 200
+itermax = 40
 horizon = 2.0
 
 [benchmark.parameters.M]
 xmin = -2.0
 xmax = 0.5
-XN = 500
+xn = 500
 ymin = -1.25
 ymax = 1.25
-YN = 500
-maxiter = 80
+yn = 500
+itermax = 80
 horizon = 2.0
 
 [benchmark.parameters.L]
 xmin = -2.25
 xmax = 0.75
-XN = 1000
+xn = 1000
 ymin = -1.5
 ymax = 1.5
-YN = 1000
-maxiter = 100
+yn = 1000
+itermax = 100
 horizon = 2.0
 
 [benchmark.parameters.paper]
 xmin = -2.25
 xmax = 0.75
-XN = 1000
+xn = 1000
 ymin = -1.25
 ymax = 1.25
-YN = 1000
-maxiter = 200
+yn = 1000
+itermax = 200
 horizon = 2.0

dpbench/configs/bench_info/npbench/nbody.toml

@@ -28,7 +28,10 @@ array_args = [
     "pos",
     "vel",
 ]
-output_args = []
+output_args = [
+    "pos",
+    "vel",
+]
 norm_error = 0.1
 
 [benchmark.parameters.S]

dpbench/configs/bench_info/npbench/scattering_self_energies.toml

@@ -26,7 +26,9 @@ array_args = [
     "D",
     "Sigma",
 ]
-output_args = []
+output_args = [
+    "Sigma",
+]
 
 [benchmark.parameters.S]
 Nkz = 2

dpbench/configs/bench_info/polybench/datamining/correlation.toml

@@ -21,7 +21,9 @@ input_args = [
 array_args = [
     "data",
 ]
-output_args = []
+output_args = [
+    "data",
+]
 
 [benchmark.parameters.S]
 M = 500

dpbench/configs/bench_info/polybench/linear-algebra/kernels/doitgen.toml

@@ -24,7 +24,9 @@ array_args = [
     "A",
     "C4",
 ]
-output_args = []
+output_args = [
+    "A",
+]
 
 [benchmark.parameters.S]
 NR = 60