diff --git a/python/dune/perftool/generation/cpp.py b/python/dune/perftool/generation/cpp.py index 9bed7f138e0bf4ae60dd37941c87c2a6d39b5c19..539a5a60d840e6a6a4c99ad73f74514ba793aedb 100644 --- a/python/dune/perftool/generation/cpp.py +++ b/python/dune/perftool/generation/cpp.py @@ -48,7 +48,6 @@ def constructor_parameter(_type, name, classtag=None, constructortag=None): assert constructortag from cgen import Value - gen = generator_factory(item_tags=(classtag, constructortag, "constructor_param"), counted=True, no_deco=True) return gen(Value(_type, name)) diff --git a/python/dune/perftool/generation/loopy.py b/python/dune/perftool/generation/loopy.py index a42f1f30dad96dc37b793b0058455604dfc106ad..ee43debc921e87f79357f391b832256955ad3960 100644 --- a/python/dune/perftool/generation/loopy.py +++ b/python/dune/perftool/generation/loopy.py @@ -50,7 +50,7 @@ def default_declaration(name, shape, shape_impl): t = _temporary_type(shape_impl, shape) if len(shape_impl) == 0: # This is a scalar, just return it! - return '{} {}(0.0);'.format(t, name); + return '{} {}(0.0);'.format(t, name) if shape_impl[0] == 'arr': return '{} {}{};'.format(t, name, ''.join('[{}]'.format(s) for s in shape)) if shape_impl[0] == 'vec': @@ -66,7 +66,7 @@ def temporary_variable(name, **kwargs): decl_method = kwargs.pop('decl_method', default_declaration) shape = kwargs.get('shape', ()) - shape_impl = kwargs.pop('shape_impl', ('arr',)*len(shape)) + shape_impl = kwargs.pop('shape_impl', ('arr',) * len(shape)) decl_method(name, shape, shape_impl) diff --git a/python/dune/perftool/pdelab/geometry.py b/python/dune/perftool/pdelab/geometry.py index 355a4d6a97e21ba40cdf88ef4ff454f8d7fd7c87..a5e24dd015bf05468c26000724052eff61334967 100644 --- a/python/dune/perftool/pdelab/geometry.py +++ b/python/dune/perftool/pdelab/geometry.py @@ -6,6 +6,7 @@ from dune.perftool.pdelab.quadrature import (name_quadrature_position, quadrature_preamble, ) + @preamble def define_geometry(name): return "auto {} = eg.geometry();".format(name) @@ -38,8 +39,8 @@ def name_dimension(): def define_jacobian_inverse_transposed_temporary(name, shape, shape_impl): geo = name_geometry() return "auto {} = {}.jacobianInverseTransposed({{{{ 0.0 }}}});".format(name, - geo, - ) + geo, + ) def define_jacobian_inverse_transposed(name): @@ -53,6 +54,7 @@ def define_jacobian_inverse_transposed(name): ) ) + @symbol def name_jacobian_inverse_transposed(): define_jacobian_inverse_transposed("J") diff --git a/python/dune/perftool/pdelab/localoperator.py b/python/dune/perftool/pdelab/localoperator.py index 4671eba26dc42664b6103d3c5b04784cd74f993a..d3c61f83d5261ce69ce2a29004d51d2bc9e353b2 100644 --- a/python/dune/perftool/pdelab/localoperator.py +++ b/python/dune/perftool/pdelab/localoperator.py @@ -80,6 +80,7 @@ def class_type_from_cache(classtag): return basename, basename + tparam_str + @memoize def measure_specific_details(measure): # The return dictionary that this memoized method will grant direct access to.