diff --git a/applications/convection_diffusion/conv_diff_dg.mini b/applications/convection_diffusion/conv_diff_dg.mini index 904f1e6eb909f23e144fa1181fbc9dcac8af6e5c..712fab482bb569712727015a1b13decdc235bd1c 100644 --- a/applications/convection_diffusion/conv_diff_dg.mini +++ b/applications/convection_diffusion/conv_diff_dg.mini @@ -2,6 +2,7 @@ __name = app_conv_diff_{__exec_suffix} __exec_suffix = deg{formcompiler.ufl_variants.degree}_{opcount_suffix}_level{formcompiler.instrumentation_level} opcount_suffix = opcount, nonopcount | expand opcount +{opcount_suffix} == opcount and {formcompiler.instrumentation_level} != 2 | exclude # Calculate the size of the grid to equlibritate it to 100 MB/rank # Input parameters diff --git a/applications/poisson_dg/poisson_dg.mini b/applications/poisson_dg/poisson_dg.mini index 14426746f57cb42ab2c32be6089b42618ffc2802..bea38c8f297efc530405290ce822e91eed21e691 100644 --- a/applications/poisson_dg/poisson_dg.mini +++ b/applications/poisson_dg/poisson_dg.mini @@ -2,6 +2,7 @@ __name = app_poisson_dg_{__exec_suffix} __exec_suffix = deg{formcompiler.ufl_variants.degree}_{opcount_suffix}_level{formcompiler.instrumentation_level} opcount_suffix = opcount, nonopcount | expand opcount +{opcount_suffix} == opcount and {formcompiler.instrumentation_level} != 2 | exclude # Calculate the size of the grid to equlibritate it to 100 MB/rank # Input parameters diff --git a/python/dune/perftool/generation/cpp.py b/python/dune/perftool/generation/cpp.py index f3dba1d4aa907ff52e934372476889f5397d9ba1..57dd91c850779284f875df204cfc21414f9ae592 100644 --- a/python/dune/perftool/generation/cpp.py +++ b/python/dune/perftool/generation/cpp.py @@ -42,9 +42,7 @@ def constructor_parameter(_type, name): @generator_factory(item_tags=("dump_timers",)) def dump_accumulate_timer(name): - from dune.perftool.pdelab.localoperator import (name_time_dumper_os, - name_time_dumper_reset, - name_time_dumper_exec,) + from dune.perftool.pdelab.localoperator import name_time_dumper_os os = name_time_dumper_os() # reset = name_time_dumper_reset() reset = 'false' diff --git a/python/dune/perftool/pdelab/driver.py b/python/dune/perftool/pdelab/driver.py index 34eb37d2a28fb922cd3c230116ec065f516bfa3d..58e55ce48876c7646a3c95936f50897ec0b68acc 100644 --- a/python/dune/perftool/pdelab/driver.py +++ b/python/dune/perftool/pdelab/driver.py @@ -1427,7 +1427,7 @@ def setup_timer(): @preamble def define_timing_identifier(name): ini = name_initree() - return "auto {} = {}.get<std::string>(\"identifier\", argv[0]);".format(name, ini) + return "auto {} = {}.get<char*>(\"identifier\", argv[0]);".format(name, ini) def name_timing_identifier(): diff --git a/python/dune/perftool/pdelab/localoperator.py b/python/dune/perftool/pdelab/localoperator.py index f6ffbec814cd02ef5053ffc2659209535b3d61bc..039dc3a22409e4ea01976b13544fdc7b08667041 100644 --- a/python/dune/perftool/pdelab/localoperator.py +++ b/python/dune/perftool/pdelab/localoperator.py @@ -530,8 +530,8 @@ def name_time_dumper_reset(): return "reset" -def name_time_dumper_exec(): - return "exec" +def name_time_dumper_ident(): + return "ident" @generator_factory(item_tags=("cached",), cache_key_generator=lambda **kw: None) @@ -543,12 +543,12 @@ class TimerMethod(ClassMember): def __init__(self): os = name_time_dumper_os() reset = name_time_dumper_reset() - ex = name_time_dumper_exec() + ident = name_time_dumper_ident() knl = name_example_kernel() assert(knl is not None) content = ["template <typename Stream>", - "void dump_timers(Stream& {}, char* {}, bool {})".format(os, ex, reset), + "void dump_timers(Stream& {}, char* {}, bool {})".format(os, ident, reset), "{"] dump_timers = [i for i in retrieve_cache_items(condition='dump_timers')] content.extend(map(lambda x: ' ' + x, dump_timers))