diff --git a/python/dune/perftool/error.py b/python/dune/perftool/error.py index 1bacb9514fd2ffee0964c7e3c3a93a1a8dedcd7a..4d428b41b516845c3eb18803539edbf293f44cf1 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 85080483c61297415b3b5eb47271baaeb0828a3a..be2efcff1b534c45d70ad264e1512a9342eaef97 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 e84930cd34c03fb2576409d005db68d5dc7873b7..da1926783b994a77d65b579dab05eca7a389ad26 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