From 20ac79b0ce48a0035e56f973ae8e21d80f5e2d58 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Fri, 7 Nov 2014 14:03:50 +0100 Subject: [PATCH] Adjust Intel compiler results for new vectorized accumulation --- tests/bits/step-51p.cc | 8 +-- tests/bits/step-51p.output | 68 ++++++++----------- ...ction_01.compiler=Intel=yes.release.output | 6 +- ...tab_large.compiler=Intel=no.release.output | 9 --- ...ab_large.compiler=Intel=yes.release.output | 9 --- ...nalize_01.compiler=Intel=no.release.output | 26 ------- ...alize_01.compiler=Intel=yes.release.output | 26 ------- 7 files changed, 37 insertions(+), 115 deletions(-) delete mode 100644 tests/lac/bicgstab_large.compiler=Intel=no.release.output delete mode 100644 tests/lac/bicgstab_large.compiler=Intel=yes.release.output delete mode 100644 tests/lac/gmres_reorthogonalize_01.compiler=Intel=no.release.output delete mode 100644 tests/lac/gmres_reorthogonalize_01.compiler=Intel=yes.release.output diff --git a/tests/bits/step-51p.cc b/tests/bits/step-51p.cc index 28d80377df..8794e50b04 100644 --- a/tests/bits/step-51p.cc +++ b/tests/bits/step-51p.cc @@ -937,7 +937,7 @@ namespace Step51 template void HDG::run () { - for (unsigned int cycle=0; cycle<12-3*dim; ++cycle) + for (unsigned int cycle=0; cycle<11-3*dim; ++cycle) { refine_grid (cycle); setup_system (); @@ -947,11 +947,11 @@ namespace Step51 output_results (cycle); } - convergence_table.set_precision("val L2", 3); + convergence_table.set_precision("val L2", 2); convergence_table.set_scientific("val L2", true); - convergence_table.set_precision("grad L2", 3); + convergence_table.set_precision("grad L2", 2); convergence_table.set_scientific("grad L2", true); - convergence_table.set_precision("val L2-post", 3); + convergence_table.set_precision("val L2-post", 2); convergence_table.set_scientific("val L2-post", true); convergence_table diff --git a/tests/bits/step-51p.output b/tests/bits/step-51p.output index 3f99e007d7..0f7c2480b5 100644 --- a/tests/bits/step-51p.output +++ b/tests/bits/step-51p.output @@ -7,17 +7,16 @@ +cells dofs val L2 grad L2 val L2-post +8 9 4.08e-01 - 1.72e+00 - 3.36e-01 - +12 13 1.66e-01 2.22 8.77e-01 1.67 2.15e-02 6.78 +16 17 8.00e-02 2.54 4.53e-01 2.29 1.12e-02 2.25 +24 25 3.70e-02 1.90 2.03e-01 1.98 3.37e-03 2.97 +32 33 2.12e-02 1.93 1.14e-01 2.00 1.43e-03 2.98 +48 49 9.61e-03 1.96 5.05e-02 2.01 4.24e-04 3.00 +64 65 5.45e-03 1.97 2.83e-02 2.01 1.79e-04 3.00 +96 97 2.44e-03 1.98 1.25e-02 2.01 5.28e-05 3.01 -cells dofs val L2 grad L2 val L2-post -8 9 4.080e-01 - 1.722e+00 - 3.362e-01 - -12 13 1.659e-01 2.22 8.766e-01 1.67 2.151e-02 6.78 -16 17 7.996e-02 2.54 4.531e-01 2.29 1.125e-02 2.25 -24 25 3.705e-02 1.90 2.028e-01 1.98 3.372e-03 2.97 -32 33 2.125e-02 1.93 1.140e-01 2.00 1.430e-03 2.98 -48 49 9.610e-03 1.96 5.048e-02 2.01 4.242e-04 3.00 -64 65 5.449e-03 1.97 2.831e-02 2.01 1.787e-04 3.00 -96 97 2.440e-03 1.98 1.253e-02 2.01 5.281e-05 3.01 -128 129 1.377e-03 1.99 7.035e-03 2.01 2.224e-05 3.01 @@ -25,41 +24,34 @@ cells dofs val L2 grad L2 val L2-post +cells dofs val L2 grad L2 val L2-post +8 9 2.14e-02 - 1.40e-01 - 3.49e-03 - +12 13 6.70e-03 2.87 3.81e-02 3.21 4.98e-04 4.80 +16 17 1.69e-03 4.78 1.00e-02 4.65 1.09e-04 5.29 +24 25 3.50e-04 3.89 2.01e-03 3.96 1.44e-05 4.98 +32 33 1.13e-04 3.94 6.37e-04 3.99 3.41e-06 5.01 +48 49 2.26e-05 3.97 1.26e-04 4.00 4.47e-07 5.01 +64 65 7.18e-06 3.98 3.98e-05 4.00 1.06e-07 5.01 +96 97 1.43e-06 3.99 7.85e-06 4.00 1.39e-08 5.01 -cells dofs val L2 grad L2 val L2-post -8 9 2.141e-02 - 1.398e-01 - 3.487e-03 - -12 13 6.701e-03 2.87 3.811e-02 3.21 4.976e-04 4.80 -16 17 1.693e-03 4.78 9.999e-03 4.65 1.085e-04 5.29 -24 25 3.501e-04 3.89 2.009e-03 3.96 1.440e-05 4.98 -32 33 1.126e-04 3.94 6.373e-04 3.99 3.412e-06 5.01 -48 49 2.256e-05 3.97 1.259e-04 4.00 4.472e-07 5.01 -64 65 7.179e-06 3.98 3.980e-05 4.00 1.057e-07 5.01 -96 97 1.425e-06 3.99 7.848e-06 4.00 1.386e-08 5.01 -128 129 4.519e-07 3.99 2.481e-06 4.00 3.285e-09 5.01 +cells dofs val L2 grad L2 val L2-post +16 80 1.04e+01 - 1.62e+01 - 1.03e+01 - +36 168 3.70e+00 2.56 8.08e+00 1.71 3.64e+00 2.58 +64 288 8.02e-01 5.31 4.67e+00 1.91 4.62e-01 7.17 +144 624 2.95e-01 2.47 2.26e+00 1.80 6.40e-02 4.88 +256 1088 1.64e-01 2.04 1.34e+00 1.80 2.94e-02 2.71 -cells dofs val L2 grad L2 val L2-post -16 80 1.043e+01 - 1.616e+01 - 1.034e+01 - -36 168 3.699e+00 2.56 8.081e+00 1.71 3.637e+00 2.58 -64 288 8.022e-01 5.31 4.671e+00 1.91 4.622e-01 7.17 -144 624 2.947e-01 2.47 2.255e+00 1.80 6.403e-02 4.88 -256 1088 1.638e-01 2.04 1.343e+00 1.80 2.937e-02 2.71 -576 2400 7.616e-02 1.89 6.522e-01 1.78 9.203e-03 2.86 - - - - -cells dofs val L2 grad L2 val L2-post -16 120 8.296e-01 - 6.543e+00 - 4.572e-01 - -36 252 5.045e-01 1.23 3.062e+00 1.87 3.570e-01 0.61 -64 432 1.736e-01 3.71 1.503e+00 2.47 6.468e-02 5.94 -144 936 5.584e-02 2.80 5.042e-01 2.69 1.006e-02 4.59 -256 1632 2.731e-02 2.49 2.274e-01 2.77 3.120e-03 4.07 -576 3600 8.582e-03 2.85 7.254e-02 2.82 6.213e-04 3.98 +cells dofs val L2 grad L2 val L2-post +16 120 8.30e-01 - 6.54e+00 - 4.57e-01 - +36 252 5.05e-01 1.23 3.06e+00 1.87 3.57e-01 0.61 +64 432 1.74e-01 3.71 1.50e+00 2.47 6.47e-02 5.94 +144 936 5.58e-02 2.80 5.04e-01 2.69 1.01e-02 4.59 +256 1632 2.73e-02 2.49 2.27e-01 2.77 3.12e-03 4.07 diff --git a/tests/fe/abf_projection_01.compiler=Intel=yes.release.output b/tests/fe/abf_projection_01.compiler=Intel=yes.release.output index 866c03135b..f1c6e5e54d 100644 --- a/tests/fe/abf_projection_01.compiler=Intel=yes.release.output +++ b/tests/fe/abf_projection_01.compiler=Intel=yes.release.output @@ -4,7 +4,7 @@ DEAL::Dofs total 6 DEAL::MM created DEAL::RHS created DEAL:cg::Starting value 1.99 -DEAL:cg::Convergence step 9 value 0 +DEAL:cg::Convergence step 8 value 0 # This file was generated by the deal.II library. @@ -51,7 +51,7 @@ DEAL::Dofs total 6 DEAL::MM created DEAL::RHS created DEAL:cg::Starting value 1.19 -DEAL:cg::Convergence step 8 value 0 +DEAL:cg::Convergence step 9 value 0 # This file was generated by the deal.II library. @@ -98,7 +98,7 @@ DEAL::Dofs total 6 DEAL::MM created DEAL::RHS created DEAL:cg::Starting value 1.99 -DEAL:cg::Convergence step 10 value 0 +DEAL:cg::Convergence step 8 value 0 # This file was generated by the deal.II library. diff --git a/tests/lac/bicgstab_large.compiler=Intel=no.release.output b/tests/lac/bicgstab_large.compiler=Intel=no.release.output deleted file mode 100644 index abf5725509..0000000000 --- a/tests/lac/bicgstab_large.compiler=Intel=no.release.output +++ /dev/null @@ -1,9 +0,0 @@ - -DEAL:Bicgstab::Starting value 2.000 -DEAL:Bicgstab::Convergence step 4 value 0 -DEAL::1.000 0.1000 0.09091 0.02381 -DEAL::residual=0 -DEAL:Bicgstab::Starting value 2.000e+10 -DEAL:Bicgstab::Convergence step 4 value 0.001939 -DEAL::1.000 0.1000 0.09091 0.02381 -DEAL::residual=0.001937 diff --git a/tests/lac/bicgstab_large.compiler=Intel=yes.release.output b/tests/lac/bicgstab_large.compiler=Intel=yes.release.output deleted file mode 100644 index e8298eef89..0000000000 --- a/tests/lac/bicgstab_large.compiler=Intel=yes.release.output +++ /dev/null @@ -1,9 +0,0 @@ - -DEAL:Bicgstab::Starting value 2.000 -DEAL:Bicgstab::Convergence step 4 value 0 -DEAL::1.000 0.1000 0.09091 0.02381 -DEAL::residual=0 -DEAL:Bicgstab::Starting value 2.000e+10 -DEAL:Bicgstab::Convergence step 4 value 0.001373 -DEAL::1.000 0.1000 0.09091 0.02381 -DEAL::residual=0.001372 diff --git a/tests/lac/gmres_reorthogonalize_01.compiler=Intel=no.release.output b/tests/lac/gmres_reorthogonalize_01.compiler=Intel=no.release.output deleted file mode 100644 index f1e7ab9648..0000000000 --- a/tests/lac/gmres_reorthogonalize_01.compiler=Intel=no.release.output +++ /dev/null @@ -1,26 +0,0 @@ - -DEAL:double:0:GMRES::Starting value 8.00 -DEAL:double:0:GMRES::Convergence step 57 value 0 -DEAL:double:1:GMRES::Starting value 8.00 -DEAL:double:1:GMRES::Re-orthogonalization enabled at step 65 -DEAL:double:1:GMRES::Convergence step 65 value 0 -DEAL:double:2:GMRES::Starting value 8.00 -DEAL:double:2:GMRES::Convergence step 57 value 0 -DEAL:double:3:GMRES::Starting value 8.00 -DEAL:double:3:GMRES::Re-orthogonalization enabled at step 65 -DEAL:double:3:GMRES::Convergence step 65 value 0 -DEAL:double:4:GMRES::Starting value 8.00 -DEAL:double:4:GMRES::Convergence step 57 value 0 -DEAL:double:5:GMRES::Starting value 8.00 -DEAL:double:5:GMRES::Re-orthogonalization enabled at step 65 -DEAL:double:5:GMRES::Convergence step 65 value 0 -DEAL:float:0:GMRES::Starting value 8.00 -DEAL:float:0:GMRES::Convergence step 37 value 0 -DEAL:float:1:GMRES::Starting value 8.00 -DEAL:float:1:GMRES::Re-orthogonalization enabled at step 65 -DEAL:float:1:GMRES::Convergence step 65 value 0 -DEAL:float:2:GMRES::Starting value 8.00 -DEAL:float:2:GMRES::Convergence step 37 value 0 -DEAL:float:3:GMRES::Starting value 8.00 -DEAL:float:3:GMRES::Re-orthogonalization enabled at step 65 -DEAL:float:3:GMRES::Convergence step 66 value 0 diff --git a/tests/lac/gmres_reorthogonalize_01.compiler=Intel=yes.release.output b/tests/lac/gmres_reorthogonalize_01.compiler=Intel=yes.release.output deleted file mode 100644 index 467b36635f..0000000000 --- a/tests/lac/gmres_reorthogonalize_01.compiler=Intel=yes.release.output +++ /dev/null @@ -1,26 +0,0 @@ - -DEAL:double:0:GMRES::Starting value 8.00 -DEAL:double:0:GMRES::Convergence step 57 value 0 -DEAL:double:1:GMRES::Starting value 8.00 -DEAL:double:1:GMRES::Re-orthogonalization enabled at step 65 -DEAL:double:1:GMRES::Convergence step 65 value 0 -DEAL:double:2:GMRES::Starting value 8.00 -DEAL:double:2:GMRES::Convergence step 57 value 0 -DEAL:double:3:GMRES::Starting value 8.00 -DEAL:double:3:GMRES::Re-orthogonalization enabled at step 65 -DEAL:double:3:GMRES::Convergence step 65 value 0 -DEAL:double:4:GMRES::Starting value 8.00 -DEAL:double:4:GMRES::Convergence step 57 value 0 -DEAL:double:5:GMRES::Starting value 8.00 -DEAL:double:5:GMRES::Re-orthogonalization enabled at step 65 -DEAL:double:5:GMRES::Convergence step 65 value 0 -DEAL:float:0:GMRES::Starting value 8.00 -DEAL:float:0:GMRES::Convergence step 37 value 0 -DEAL:float:1:GMRES::Starting value 8.00 -DEAL:float:1:GMRES::Re-orthogonalization enabled at step 65 -DEAL:float:1:GMRES::Convergence step 66 value 0 -DEAL:float:2:GMRES::Starting value 8.00 -DEAL:float:2:GMRES::Convergence step 37 value 0 -DEAL:float:3:GMRES::Starting value 8.00 -DEAL:float:3:GMRES::Re-orthogonalization enabled at step 65 -DEAL:float:3:GMRES::Convergence step 66 value 0 -- 2.39.5