From 1169bdfaefca07370fafae4b8eece37be242e0db Mon Sep 17 00:00:00 2001
From: Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de>
Date: Thu, 24 Nov 2016 11:32:21 +0100
Subject: [PATCH] fixup
---
python/dune/perftool/generation/__init__.py | 1 -
python/dune/perftool/generation/loopy.py | 8 ++++----
python/dune/perftool/sumfact/amatrix.py | 1 -
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/python/dune/perftool/generation/__init__.py b/python/dune/perftool/generation/__init__.py
index c141e95d..72fad902 100644
--- a/python/dune/perftool/generation/__init__.py
+++ b/python/dune/perftool/generation/__init__.py
@@ -18,7 +18,6 @@ from dune.perftool.generation.cache import (cached,
from dune.perftool.generation.cpp import (base_class,
class_basename,
class_member,
- constructor_block,
constructor_parameter,
dump_accumulate_timer,
include_file,
diff --git a/python/dune/perftool/generation/loopy.py b/python/dune/perftool/generation/loopy.py
index b0e7264b..c61fec6a 100644
--- a/python/dune/perftool/generation/loopy.py
+++ b/python/dune/perftool/generation/loopy.py
@@ -17,17 +17,17 @@ silenced_warning = generator_factory(item_tags=("silenced_warning",), no_deco=Tr
kernel_cached = generator_factory(item_tags=("default_cached",), context_tags="kernel")
-class DuneGlobalArg(loopy.GlobalArg):
- allowed_extra_kwargs = loopy.GlobalArg.allowed_extra_kwargs + ["managed"]
+class DuneGlobalArg(lp.GlobalArg):
+ allowed_extra_kwargs = lp.GlobalArg.allowed_extra_kwargs + ["managed"]
@generator_factory(item_tags=("argument", "globalarg"),
context_tags="kernel",
cache_key_generator=lambda n, **kw: n)
-def globalarg(name, shape=loopy.auto, managed=True, **kw):
+def globalarg(name, shape=lp.auto, managed=True, **kw):
if isinstance(shape, str):
shape = (shape,)
- dtype = kw.pop("dtype", numpy.float64)
+ dtype = kw.pop("dtype", np.float64)
return DuneGlobalArg(name, dtype=dtype, shape=shape, managed=managed, **kw)
diff --git a/python/dune/perftool/sumfact/amatrix.py b/python/dune/perftool/sumfact/amatrix.py
index 0d41c26b..5e717f16 100644
--- a/python/dune/perftool/sumfact/amatrix.py
+++ b/python/dune/perftool/sumfact/amatrix.py
@@ -5,7 +5,6 @@ from dune.perftool.options import get_option
from dune.perftool.pdelab.argument import name_coefficientcontainer
from dune.perftool.generation import (class_member,
- constructor_block,
domain,
function_mangler,
get_global_context_value,
--
GitLab