From 4087fab384b9c4384feabb5c2cffd894acaa6990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20He=C3=9F?= <rene.hess@iwr.uni-heidelberg.de>
Date: Mon, 5 Dec 2016 17:18:06 +0100
Subject: [PATCH] Fix some small bugs
---
python/dune/perftool/loopy/target.py | 3 +--
python/dune/perftool/pdelab/localoperator.py | 2 +-
test/sumfact/poisson/CMakeLists.txt | 6 ++++++
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/python/dune/perftool/loopy/target.py b/python/dune/perftool/loopy/target.py
index 50796ef9..e10eefc1 100644
--- a/python/dune/perftool/loopy/target.py
+++ b/python/dune/perftool/loopy/target.py
@@ -8,7 +8,7 @@ from dune.perftool.loopy.vcl import VCLTypeRegistry
from dune.perftool.generation import (include_file,
retrieve_cache_functions,
)
-
+from dune.perftool.options import get_option
from loopy.target import (TargetBase,
ASTBuilderBase,
DummyHostASTBuilder,
@@ -29,7 +29,6 @@ def _type_to_op_counter_type(type):
def numpy_to_cpp_dtype(key):
- from dune.perftool.options import get_option
_registry = {'float32': 'float',
'int32': 'int',
'float64': 'double',
diff --git a/python/dune/perftool/pdelab/localoperator.py b/python/dune/perftool/pdelab/localoperator.py
index b53eefb5..98232579 100644
--- a/python/dune/perftool/pdelab/localoperator.py
+++ b/python/dune/perftool/pdelab/localoperator.py
@@ -351,7 +351,7 @@ def boundary_predicates(expr, measure, subdomain_id):
from ufl.checks import is_cellwise_constant
cellwise_constant = is_cellwise_constant(expr)
from dune.perftool.pdelab.parameter import intersection_parameter_function
- intersection_parameter_function(name, subdomain_data, cellwise_constant, t='int')
+ intersection_parameter_function(name, subdomain_data, cellwise_constant, t='int32')
predicates = predicates.union(['{} == {}'.format(name, subdomain_id)])
diff --git a/test/sumfact/poisson/CMakeLists.txt b/test/sumfact/poisson/CMakeLists.txt
index 35200593..813c264d 100644
--- a/test/sumfact/poisson/CMakeLists.txt
+++ b/test/sumfact/poisson/CMakeLists.txt
@@ -22,6 +22,12 @@ dune_add_formcompiler_system_test(UFLFILE poisson_3d_order2.ufl
)
+# Operator counting test
+dune_add_formcompiler_system_test(UFLFILE opcount_poisson_2d_order2.ufl
+ BASENAME opcount_sumfact_poisson_2d_order2
+ INIFILE opcount_poisson_2d_order2.mini
+ )
+
# # 2. Poisson Test Case: DG, f + pure dirichlet
# dune_add_formcompiler_system_test(UFLFILE poisson_dg.ufl
# BASENAME sumfact_poisson_dg
--
GitLab