From df9f1f8e86f2be3112dcdf7d8b86f10cd000d53a Mon Sep 17 00:00:00 2001 From: Martin Bauer <martin.bauer@fau.de> Date: Sun, 27 Oct 2019 09:51:36 +0100 Subject: [PATCH] UniformGridGenerated: fixes --- .../UniformGridGenerated.py | 2 +- .../benchmarks/UniformGridGenerated/params.py | 22 +++++++++---------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.py b/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.py index 72f0ce0c..c67bb0a0 100644 --- a/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.py +++ b/apps/benchmarks/UniformGridGenerated/UniformGridGenerated.py @@ -93,7 +93,7 @@ with CodeGeneration() as ctx: 'aa_odd_split': True, 'aa_odd_nt_stores': False, - 'compiled_in_boundaries': True, + 'compiled_in_boundaries': False, } config_name = ctx.config noopt = False diff --git a/apps/benchmarks/UniformGridGenerated/params.py b/apps/benchmarks/UniformGridGenerated/params.py index 90af64f5..724238f4 100644 --- a/apps/benchmarks/UniformGridGenerated/params.py +++ b/apps/benchmarks/UniformGridGenerated/params.py @@ -64,7 +64,7 @@ class BenchmarkScenario: @wlb.member_callback def config(self, **kwargs): - time_steps_for_128_cubed = 50 + time_steps_for_128_cubed = 10 time_steps = int(128**3 / prod(self.block_size) * time_steps_for_128_cubed) time_steps = max(10, time_steps) cfg = { @@ -73,8 +73,8 @@ class BenchmarkScenario: }, 'Parameters': { 'timesteps': time_steps, - 'warmupSteps': 6, - 'outerIterations': 3, + 'warmupSteps': 2, + 'outerIterations': 4, 'vtkWriteFrequency': 0, 'remainingTimeLoggerFrequency': 0, 'omega': 1.6, @@ -136,14 +136,13 @@ def single_node_benchmark(): if not block_size_ok(sc): continue scenarios.add(sc) - - else: - sc = BenchmarkScenario(block_size=block_size, direct_comm=direct_comm, - domain_decomposition_func=domain_decomposition_func_z, - time_step_mode=time_step_mode) - if not block_size_ok(sc): - continue - scenarios.add(sc) + else: + sc = BenchmarkScenario(block_size=block_size, direct_comm=direct_comm, + domain_decomposition_func=domain_decomposition_func_z, + time_step_mode=time_step_mode) + if not block_size_ok(sc): + continue + scenarios.add(sc) def single_node_benchmark_small(): @@ -169,5 +168,4 @@ def weak_scaling(): continue scenarios.add(sc) - single_node_benchmark() -- GitLab