Merge branch 'feature/fix-operator-method-order' into feature/new-vectorization-features

python/dune/perftool/cgen/clazz.py

@@ -34,9 +34,10 @@ class BaseClass(Generable):
 
 
 class ClassMember(Generable):
-    def __init__(self, member, access=AccessModifier.PUBLIC):
+    def __init__(self, member, access=AccessModifier.PUBLIC, name=None):
         self.member = member
         self.access = access
+        self.name = name
 
         if isinstance(member, str):
             from cgen import Line

python/dune/perftool/pdelab/localoperator.py

@@ -613,8 +613,6 @@ class TimerMethod(ClassMember):
 
 class LoopyKernelMethod(ClassMember):
     def __init__(self, signature, kernel, add_timings=True, initializer_list=[]):
-        self.name = kernel.name
-
         from loopy import generate_body
         from cgen import LiteralLines, Block
         content = signature
@@ -655,7 +653,7 @@ class LoopyKernelMethod(ClassMember):
                 content.append('  ' + 'HP_TIMER_STOP({});'.format(timer_name))
 
         content.append('}')
-        ClassMember.__init__(self, content)
+        ClassMember.__init__(self, content, name=kernel.name)
 
 
 def cgen_class_from_cache(tag, members=[]):