From 133049094094996cebc8a47678cc20a6927769b1 Mon Sep 17 00:00:00 2001
From: Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de>
Date: Thu, 25 Jan 2018 11:19:56 +0100
Subject: [PATCH] Small fixes
---
python/dune/perftool/error.py | 2 +-
python/dune/perftool/options.py | 1 -
python/dune/perftool/sumfact/vectorization.py | 3 +--
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/python/dune/perftool/error.py b/python/dune/perftool/error.py
index 1bacb951..4d428b41 100644
--- a/python/dune/perftool/error.py
+++ b/python/dune/perftool/error.py
@@ -18,4 +18,4 @@ class PerftoolLoopyError(PerftoolError):
class PerftoolVectorizationError(PerftoolCodegenError):
- pass
\ No newline at end of file
+ pass
diff --git a/python/dune/perftool/options.py b/python/dune/perftool/options.py
index 85080483..be2efcff 100644
--- a/python/dune/perftool/options.py
+++ b/python/dune/perftool/options.py
@@ -61,7 +61,6 @@ class PerftoolOptionsArray(ImmutableRecord):
vectorization_padding = PerftoolOption(default=None, helpstr="an explicit value for the allowed padding in vectorization")
vectorization_allow_quadrature_changes = PerftoolOption(default=False, helpstr="whether the vectorization strategy is allowed to alter quadrature point numbers")
vectorization_list_index = PerftoolOption(default=None, helpstr="Which vectorization to pick from a list (only valid with vectorization_strategy=fromlist).")
- vectorization_divide_and_conquer = PerftoolOption(default=True, helpstr="Whether to find cost model optima in subsets, only turn off when you know exactly what you are doing")
turn_off_diagonal_jacobian = PerftoolOption(default=False, helpstr="Do not use diagonal_jacobian transformation on the ufl tree and cast result of jacobianInverseTransposed into a FieldMatrix.")
architecture = PerftoolOption(default="haswell", helpstr="The architecture to optimize for. Possible values: haswell|knl")
grid_offset = PerftoolOption(default=False, helpstr="Set to true if you want a yasp grid where the lower left corner is not in the origin.")
diff --git a/python/dune/perftool/sumfact/vectorization.py b/python/dune/perftool/sumfact/vectorization.py
index e84930cd..da192678 100644
--- a/python/dune/perftool/sumfact/vectorization.py
+++ b/python/dune/perftool/sumfact/vectorization.py
@@ -170,7 +170,6 @@ def decide_vectorization_strategy():
# Optimize over all the possible quadrature point tuples
#
quad_points = [quadrature_points_per_direction()]
-
if get_option("vectorization_allow_quadrature_changes"):
sf = next(iter(active_sumfacts))
depth = 1
@@ -206,7 +205,7 @@ def decide_vectorization_strategy():
for key in keys:
key_sumfacts = frozenset(sf for sf in active_sumfacts if sf.input_key == key)
minimum = min(fixed_quad_vectorization_opportunity_generator(key_sumfacts, width, qp),
- key=strategy_cost)
+ key=strategy_cost)
sfdict = add_to_frozendict(sfdict, minimum)
else:
# Find the minimum cost strategy between all the quadrature point tuples
--
GitLab