From 007bdd500e559352c54d1cd5d8b5ccb4f57bf7da Mon Sep 17 00:00:00 2001
From: Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de>
Date: Thu, 25 Jan 2018 10:46:30 +0100
Subject: [PATCH] Fix more non-deterministicness (now also py3)
---
python/dune/perftool/sumfact/basis.py | 5 ++++-
python/dune/perftool/sumfact/vectorization.py | 5 -----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/python/dune/perftool/sumfact/basis.py b/python/dune/perftool/sumfact/basis.py
index 46563ee1..19278ef7 100644
--- a/python/dune/perftool/sumfact/basis.py
+++ b/python/dune/perftool/sumfact/basis.py
@@ -64,9 +64,12 @@ class LFSSumfactKernelInput(SumfactKernelInputBase, ImmutableRecord):
restriction=restriction,
)
- def __str__(self):
+ def __repr__(self):
return "{}_{}".format(self.coeff_func(self.restriction), self.element_index)
+ def __str__(self):
+ return repr(self)
+
def realize(self, sf, index, insn_dep):
lfs = name_lfs(self.element, self.restriction, self.element_index)
basisiname = sumfact_iname(name_lfs_bound(lfs), "basis")
diff --git a/python/dune/perftool/sumfact/vectorization.py b/python/dune/perftool/sumfact/vectorization.py
index 05a69b36..3702e770 100644
--- a/python/dune/perftool/sumfact/vectorization.py
+++ b/python/dune/perftool/sumfact/vectorization.py
@@ -185,11 +185,6 @@ def decide_vectorization_strategy():
if get_option("vectorization_strategy") == "fromlist":
# This is a bit special and does not follow the minimization procedure at all
- # Check that we are using python2
- import sys
- if not sys.version_info[0] == 2:
- raise PerftoolVectorizationError("fromlist vectorization relies on iteration order and therefore needs python2. Yes, I know this is broken design. It is only used for one plot in the paper though.")
-
def _choose_strategy_from_list(stage1_sumfacts):
strategy = 0
for qp in quad_points:
--
GitLab