From cbdf9989e5e2882b3f74666335882438d65ee758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Mon, 11 Dec 2023 12:01:41 +0000 Subject: [PATCH] [sombrero] Distinguish lattice volume; set `num_tasks_per_node` where needed --- benchmarks/apps/sombrero/sombrero.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/benchmarks/apps/sombrero/sombrero.py b/benchmarks/apps/sombrero/sombrero.py index ee45ce46..e9d1142c 100644 --- a/benchmarks/apps/sombrero/sombrero.py +++ b/benchmarks/apps/sombrero/sombrero.py @@ -11,7 +11,8 @@ from benchmarks.modules.utils import SpackTest # Fixed lattice volume in ITT benchmarks -LATTICE_VOLUME = 32 * 24 * 24 * 24 +LATTICE_VOLUME_SMALL = 32 * 24 ** 3 +LATTICE_VOLUME_MEDIUM = 48 ** 3 * 64 # Helper function to find maximum number of tasks we can use for benchmarks @@ -122,10 +123,9 @@ def set_up_from_parameters(self): def setup_num_tasks(self): self.num_tasks = max_num_tasks( self.current_partition.processor.num_cores, - LATTICE_VOLUME, + LATTICE_VOLUME_SMALL, ) - @rfm.simple_test class SombreroITT64n(SombreroBenchmarkBase): valid_systems = ['-gpu'] @@ -137,7 +137,8 @@ def set_up_from_parameters(self): @run_after('setup') def setup_num_tasks(self): - self.num_tasks = max_num_tasks( - self.current_partition.processor.num_cores * 64, - LATTICE_VOLUME, + self.num_tasks_per_node = max_num_tasks( + self.current_partition.processor.num_cores, + LATTICE_VOLUME_MEDIUM, ) + self.num_tasks = self.num_tasks_per_node * 64