From 866645c2f30ee8c7c0b5f5a68e2ebdf5293083fb Mon Sep 17 00:00:00 2001 From: Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de> Date: Wed, 6 Dec 2017 14:13:27 +0100 Subject: [PATCH] Adapt mini files to new options --- applications/knl/poisson_dg/knl_poisson_dg.mini | 2 +- applications/knl/poisson_dg/verify.mini | 2 +- applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini | 2 +- applications/knl/poisson_dg_tensor/verify.mini | 2 +- applications/poisson_dg/poisson_dg.mini | 2 +- applications/poisson_dg/verify.mini | 4 ++-- applications/poisson_dg_tensor/poisson_dg_tensor.mini | 2 +- applications/poisson_dg_tensor/sliced/sliced.mini | 2 +- applications/poisson_dg_tensor/verify.mini | 4 ++-- applications/stokes_dg/stokes_dg.mini | 2 +- test/sumfact/mass/mass.mini | 2 +- test/sumfact/mass/mass_3d.mini | 2 +- test/sumfact/poisson/diagonal.mini | 3 +-- test/sumfact/poisson/poisson_2d.mini | 2 +- test/sumfact/poisson/poisson_3d.mini | 4 ++-- test/sumfact/poisson/poisson_dg_2d.mini | 4 ++-- test/sumfact/poisson/poisson_dg_3d.mini | 4 ++-- test/sumfact/poisson/poisson_dg_tensor.mini | 4 ++-- test/sumfact/poisson/poisson_fastdg_2d.mini | 4 ++-- test/sumfact/poisson/poisson_fastdg_3d.mini | 4 ++-- test/sumfact/poisson/sliced.mini | 3 +-- test/sumfact/stokes/stokes.mini | 2 +- 22 files changed, 30 insertions(+), 32 deletions(-) diff --git a/applications/knl/poisson_dg/knl_poisson_dg.mini b/applications/knl/poisson_dg/knl_poisson_dg.mini index c21fac66..0d8380d8 100644 --- a/applications/knl/poisson_dg/knl_poisson_dg.mini +++ b/applications/knl/poisson_dg/knl_poisson_dg.mini @@ -38,7 +38,7 @@ extension = vtu [formcompiler] fastdg = 1 sumfact = 1 -vectorize_quad = 1 +vectorization_quadloop = 1 vectorize_diagonal = 1 instrumentation_level = 2, 3, 4 | expand opcounter = 1, 0 | expand opcount diff --git a/applications/knl/poisson_dg/verify.mini b/applications/knl/poisson_dg/verify.mini index bae219fc..07c5074b 100644 --- a/applications/knl/poisson_dg/verify.mini +++ b/applications/knl/poisson_dg/verify.mini @@ -11,7 +11,7 @@ extension = vtu [formcompiler] fastdg = 1 sumfact = 1 -vectorize_quad = 1 +vectorization_quadloop = 1 vectorize_diagonal = 1 quadrature_order = 6 architecture = knl diff --git a/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini b/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini index 667615fb..95c6368f 100644 --- a/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini +++ b/applications/knl/poisson_dg_tensor/knl_poisson_dg_tensor.mini @@ -38,7 +38,7 @@ extension = vtu [formcompiler] fastdg = 1 sumfact = 1 -vectorize_quad = 1 +vectorization_quadloop = 1 vectorize_diagonal = 1 instrumentation_level = 2, 3, 4 | expand opcounter = 1, 0 | expand opcount diff --git a/applications/knl/poisson_dg_tensor/verify.mini b/applications/knl/poisson_dg_tensor/verify.mini index 2f0d7170..029acbe5 100644 --- a/applications/knl/poisson_dg_tensor/verify.mini +++ b/applications/knl/poisson_dg_tensor/verify.mini @@ -11,7 +11,7 @@ extension = vtu [formcompiler] fastdg = 1 sumfact = 1 -vectorize_quad = 1 +vectorization_quadloop = 1 vectorize_diagonal = 1 quadrature_order = 6 architecture = knl diff --git a/applications/poisson_dg/poisson_dg.mini b/applications/poisson_dg/poisson_dg.mini index 1c5a57f3..2ba1c2cd 100644 --- a/applications/poisson_dg/poisson_dg.mini +++ b/applications/poisson_dg/poisson_dg.mini @@ -38,7 +38,7 @@ extension = vtu [formcompiler] fastdg = 1 sumfact = 1 -vectorize_quad = 1 +vectorization_quadloop = 1 vectorize_greedy = 1 instrumentation_level = 2, 3, 4 | expand opcounter = 1, 0 | expand opcount diff --git a/applications/poisson_dg/verify.mini b/applications/poisson_dg/verify.mini index 90c5885e..a2eed153 100644 --- a/applications/poisson_dg/verify.mini +++ b/applications/poisson_dg/verify.mini @@ -11,8 +11,8 @@ extension = vtu [formcompiler] fastdg = 1 sumfact = 1 -vectorize_quad = 1 -vectorize_grads = 1 +vectorization_quadloop = 1 +vectorization_strategy = explicit exact_solution_expression = g compare_l2errorsquared = 1e-6 diff --git a/applications/poisson_dg_tensor/poisson_dg_tensor.mini b/applications/poisson_dg_tensor/poisson_dg_tensor.mini index 853653a1..d0c7251a 100644 --- a/applications/poisson_dg_tensor/poisson_dg_tensor.mini +++ b/applications/poisson_dg_tensor/poisson_dg_tensor.mini @@ -38,7 +38,7 @@ extension = vtu [formcompiler] fastdg = 1 sumfact = 1 -vectorize_quad = 1 +vectorization_quadloop = 1 vectorize_greedy = 1 instrumentation_level = 2, 3, 4 | expand opcounter = 1, 0 | expand opcount diff --git a/applications/poisson_dg_tensor/sliced/sliced.mini b/applications/poisson_dg_tensor/sliced/sliced.mini index dee4de55..7522320a 100644 --- a/applications/poisson_dg_tensor/sliced/sliced.mini +++ b/applications/poisson_dg_tensor/sliced/sliced.mini @@ -37,7 +37,7 @@ extension = vtu [formcompiler] fastdg = 1 sumfact = 1 -vectorize_quad = 1 +vectorization_quadloop = 1 vectorize_slice = 1 instrumentation_level = 2, 3, 4 | expand opcounter = 1, 0 | expand opcount diff --git a/applications/poisson_dg_tensor/verify.mini b/applications/poisson_dg_tensor/verify.mini index b1f4672e..774b5e1b 100644 --- a/applications/poisson_dg_tensor/verify.mini +++ b/applications/poisson_dg_tensor/verify.mini @@ -11,8 +11,8 @@ extension = vtu [formcompiler] fastdg = 1 sumfact = 1 -vectorize_quad = 1 -vectorize_grads = 1 +vectorization_quadloop = 1 +vectorization_strategy = explicit compare_l2errorsquared = 1e-6 [formcompiler.ufl_variants] diff --git a/applications/stokes_dg/stokes_dg.mini b/applications/stokes_dg/stokes_dg.mini index 2e7dc52a..2727253b 100644 --- a/applications/stokes_dg/stokes_dg.mini +++ b/applications/stokes_dg/stokes_dg.mini @@ -39,7 +39,7 @@ extension = vtu [formcompiler] fastdg = 1 sumfact = 1 -vectorize_quad = 1 +vectorization_quadloop = 1 vectorize_greedy = 1 instrumentation_level = 2, 3, 4 | expand opcounter = 1, 0 | expand opcount diff --git a/test/sumfact/mass/mass.mini b/test/sumfact/mass/mass.mini index 86b00301..44870439 100644 --- a/test/sumfact/mass/mass.mini +++ b/test/sumfact/mass/mass.mini @@ -14,5 +14,5 @@ extension = vtu [formcompiler] numerical_jacobian = 1, 0 | expand num -vectorize_quad = 1, 0 | expand vec +vectorization_quadloop = 1, 0 | expand vec sumfact = 1 diff --git a/test/sumfact/mass/mass_3d.mini b/test/sumfact/mass/mass_3d.mini index 77626456..aba93533 100644 --- a/test/sumfact/mass/mass_3d.mini +++ b/test/sumfact/mass/mass_3d.mini @@ -15,7 +15,7 @@ extension = vtu [formcompiler] numerical_jacobian = 1, 0 | expand num -vectorize_quad = 1, 0 | expand vec +vectorization_quadloop = 1, 0 | expand vec sumfact = 1 [formcompiler.ufl_variants] diff --git a/test/sumfact/poisson/diagonal.mini b/test/sumfact/poisson/diagonal.mini index bcbab188..d2687d64 100644 --- a/test/sumfact/poisson/diagonal.mini +++ b/test/sumfact/poisson/diagonal.mini @@ -10,8 +10,7 @@ extension = vtu [formcompiler] sumfact = 1 compare_l2errorsquared = 1e-5 -vectorize_quad = 1 -vectorize_grads = 0 +vectorization_quadloop = 1 vectorize_diagonal = 1 quadrature_order = 6, 6, 6 fastdg = 1 diff --git a/test/sumfact/poisson/poisson_2d.mini b/test/sumfact/poisson/poisson_2d.mini index 129c2ff3..9fab490c 100644 --- a/test/sumfact/poisson/poisson_2d.mini +++ b/test/sumfact/poisson/poisson_2d.mini @@ -17,7 +17,7 @@ extension = vtu numerical_jacobian = 1, 0 | expand num compare_l2errorsquared = 4e-5, 4e-9 | expand deg sumfact = 1 -vectorize_grads = 1, 0 | expand grad +vectorization_strategy = explicit, none | expand grad quadrature_order = 2, 4 [formcompiler.ufl_variants] diff --git a/test/sumfact/poisson/poisson_3d.mini b/test/sumfact/poisson/poisson_3d.mini index a8b2a96b..2ddbd626 100644 --- a/test/sumfact/poisson/poisson_3d.mini +++ b/test/sumfact/poisson/poisson_3d.mini @@ -18,8 +18,8 @@ extension = vtu numerical_jacobian = 1, 0 | expand num compare_l2errorsquared = 1e-4, 1e-8 | expand deg sumfact = 1 -vectorize_quad = 1, 0 | expand quad -vectorize_grads = 1, 0 | expand grad +vectorization_quadloop = 1, 0 | expand quad +vectorization_strategy = explicit, none | expand grad [formcompiler.ufl_variants] degree = 1, 2 | expand deg diff --git a/test/sumfact/poisson/poisson_dg_2d.mini b/test/sumfact/poisson/poisson_dg_2d.mini index facaf327..99adc0e3 100644 --- a/test/sumfact/poisson/poisson_dg_2d.mini +++ b/test/sumfact/poisson/poisson_dg_2d.mini @@ -17,8 +17,8 @@ extension = vtu numerical_jacobian = 1, 0 | expand num sumfact = 1 compare_l2errorsquared = 5e-5, 5e-7 | expand deg -vectorize_quad = 1, 0 | expand quad -vectorize_grads = 1, 0 | expand grad +vectorization_quadloop = 1, 0 | expand quad +vectorization_strategy = explicit, none | expand grad [formcompiler.ufl_variants] degree = 1, 2 | expand deg diff --git a/test/sumfact/poisson/poisson_dg_3d.mini b/test/sumfact/poisson/poisson_dg_3d.mini index ee766a8d..b23fda0e 100644 --- a/test/sumfact/poisson/poisson_dg_3d.mini +++ b/test/sumfact/poisson/poisson_dg_3d.mini @@ -17,8 +17,8 @@ extension = vtu numerical_jacobian = 1, 0 | expand num sumfact = 1 compare_l2errorsquared = 1e-4, 5e-6 | expand deg -vectorize_quad = 1, 0 | expand quad -vectorize_grads = 1, 0 | expand grad +vectorization_quadloop = 1, 0 | expand quad +vectorization_strategy = explicit, none | expand grad [formcompiler.ufl_variants] degree = 1, 2 | expand deg diff --git a/test/sumfact/poisson/poisson_dg_tensor.mini b/test/sumfact/poisson/poisson_dg_tensor.mini index fcf3d2a6..4a45e4a1 100644 --- a/test/sumfact/poisson/poisson_dg_tensor.mini +++ b/test/sumfact/poisson/poisson_dg_tensor.mini @@ -14,8 +14,8 @@ extension = vtu [formcompiler] sumfact = 1 compare_l2errorsquared = 3e-4 -vectorize_quad = 1, 0 | expand quad -vectorize_grads = 1, 0 | expand grad +vectorization_quadloop = 1, 0 | expand quad +vectorization_strategy = explicit, none | expand grad [formcompiler.ufl_variants] degree = 2 diff --git a/test/sumfact/poisson/poisson_fastdg_2d.mini b/test/sumfact/poisson/poisson_fastdg_2d.mini index 2fcc2c4e..541de871 100644 --- a/test/sumfact/poisson/poisson_fastdg_2d.mini +++ b/test/sumfact/poisson/poisson_fastdg_2d.mini @@ -15,8 +15,8 @@ extension = vtu numerical_jacobian = 0 sumfact = 1 compare_l2errorsquared = 1e-4 -vectorize_quad = 1, 0 | expand quadvec -vectorize_grads = 1, 0 | expand gradvec +vectorization_quadloop = 1, 0 | expand quadvec +vectorization_strategy = explicit, none | expand gradvec fastdg = 1 [formcompiler.ufl_variants] diff --git a/test/sumfact/poisson/poisson_fastdg_3d.mini b/test/sumfact/poisson/poisson_fastdg_3d.mini index 78e7f891..b5974a4f 100644 --- a/test/sumfact/poisson/poisson_fastdg_3d.mini +++ b/test/sumfact/poisson/poisson_fastdg_3d.mini @@ -15,8 +15,8 @@ extension = vtu numerical_jacobian = 0 sumfact = 1 compare_l2errorsquared = 1e-4 -vectorize_quad = 1, 0 | expand quadvec -vectorize_grads = 1, 0 | expand gradvec +vectorization_quadloop = 1, 0 | expand quadvec +vectorization_strategy = explicit, none | expand gradvec fastdg = 1 [formcompiler.ufl_variants] diff --git a/test/sumfact/poisson/sliced.mini b/test/sumfact/poisson/sliced.mini index 9240f97b..39e9e915 100644 --- a/test/sumfact/poisson/sliced.mini +++ b/test/sumfact/poisson/sliced.mini @@ -10,8 +10,7 @@ extension = vtu [formcompiler] sumfact = 1 compare_l2errorsquared = 1e-5 -vectorize_quad = 1 -vectorize_grads = 0 +vectorization_quadloop = 1 vectorize_slice = 1 quadrature_order = 6 diff --git a/test/sumfact/stokes/stokes.mini b/test/sumfact/stokes/stokes.mini index 9260bae2..10dca547 100644 --- a/test/sumfact/stokes/stokes.mini +++ b/test/sumfact/stokes/stokes.mini @@ -13,6 +13,6 @@ extension = vtu [formcompiler] numerical_jacobian = 1, 0 | expand num -vectorize_quad = 1, 0 | expand quad +vectorization_quadloop = 1, 0 | expand quad compare_l2errorsquared = 1e-12 sumfact = 1 -- GitLab