From fe7608600a8cbe70896d778bd25682fe60799c06 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Mon, 30 Apr 2018 10:55:54 +0200 Subject: [PATCH] Test fixes with AVX-512. --- tests/base/point_03.cc | 2 +- tests/grid/mesh_3d_12.output.avx512 | 37 +++++++++++++ tests/vector_tools/integrate_difference_04.cc | 1 + ...linos=true.with_metis=true.mpirun=1.output | 18 +++---- ...linos=true.with_metis=true.mpirun=3.output | 54 +++++++++---------- .../integrate_difference_04_hp.cc | 1 + ...linos=true.with_metis=true.mpirun=1.output | 18 +++---- ...linos=true.with_metis=true.mpirun=3.output | 54 +++++++++---------- 8 files changed, 112 insertions(+), 73 deletions(-) create mode 100644 tests/grid/mesh_3d_12.output.avx512 diff --git a/tests/base/point_03.cc b/tests/base/point_03.cc index dc49868eaf..fa010f93f2 100644 --- a/tests/base/point_03.cc +++ b/tests/base/point_03.cc @@ -49,7 +49,7 @@ void check () for (unsigned int v = 0; v < VectorizedArray::n_array_elements; ++v) diff += std::abs(distance_vec[v]); - AssertThrow(diff < 1e-10, + AssertThrow(diff < 100 * std::numeric_limits::epsilon(), ExcMessage("diff is " + std::to_string(diff))); deallog << "Ok" << std::endl; diff --git a/tests/grid/mesh_3d_12.output.avx512 b/tests/grid/mesh_3d_12.output.avx512 new file mode 100644 index 0000000000..f15c1809ba --- /dev/null +++ b/tests/grid/mesh_3d_12.output.avx512 @@ -0,0 +1,37 @@ + +DEAL::Initial check +DEAL:: 1.9315019 +DEAL:: 0.67828900 +DEAL:: 0.40296373 +DEAL::Check 0 +DEAL:: 3.7791467 +DEAL:: 0.57283717 +DEAL:: 0.17926981 +DEAL::Check 1 +DEAL:: 5.8691144 +DEAL:: 0.32966048 +DEAL:: 0.041127313 +DEAL::Initial check +DEAL:: 2.5256710 +DEAL:: 0.83883584 +DEAL:: 0.40296373 +DEAL::Check 0 +DEAL:: 5.2830458 +DEAL:: 0.75835019 +DEAL:: 0.17926981 +DEAL::Check 1 +DEAL:: 8.2635603 +DEAL:: 0.44008148 +DEAL:: 0.041127313 +DEAL::Initial check +DEAL:: 6.6319904 +DEAL:: 2.1860509 +DEAL:: 0.97117168 +DEAL::Check 0 +DEAL:: 7.2476568 +DEAL:: 0.92145747 +DEAL:: 0.18452407 +DEAL::Check 1 +DEAL:: 9.0423508 +DEAL:: 0.42106193 +DEAL:: 0.040002011 diff --git a/tests/vector_tools/integrate_difference_04.cc b/tests/vector_tools/integrate_difference_04.cc index c0d51ebf35..d7dcc56f2b 100644 --- a/tests/vector_tools/integrate_difference_04.cc +++ b/tests/vector_tools/integrate_difference_04.cc @@ -156,5 +156,6 @@ int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); MPILogInitAll log; + deallog << std::setprecision(10); test<3>(); } diff --git a/tests/vector_tools/integrate_difference_04.with_trilinos=true.with_metis=true.mpirun=1.output b/tests/vector_tools/integrate_difference_04.with_trilinos=true.with_metis=true.mpirun=1.output index d207d6bd50..fcb9d1eb90 100644 --- a/tests/vector_tools/integrate_difference_04.with_trilinos=true.with_metis=true.mpirun=1.output +++ b/tests/vector_tools/integrate_difference_04.with_trilinos=true.with_metis=true.mpirun=1.output @@ -1,20 +1,20 @@ DEAL:0::Hdiv_seminorm: -DEAL:0::computed: 3.05512 expected: 3.05505 difference: 6.81923e-05 +DEAL:0::computed: 3.055118656 expected: 3.055050463 difference: 6.819232963e-05 DEAL:0::L2_norm: -DEAL:0::computed: 1.95390 expected: 1.95363 difference: 0.000266581 +DEAL:0::computed: 1.953895683 expected: 1.953629102 difference: 0.0002665813359 DEAL:0::H1_seminorm: -DEAL:0::computed: 2.70821 expected: 2.70801 difference: 0.000192324 +DEAL:0::computed: 2.708205125 expected: 2.708012802 difference: 0.0001923236252 DEAL:0::H1_norm: -DEAL:0::computed: 3.33947 expected: 3.33916 difference: 0.000311941 +DEAL:0::computed: 3.339473512 expected: 3.339161571 difference: 0.0003119409606 DEAL:0::L1_norm: -DEAL:0::computed: 2.91688 expected: 2.91667 difference: 0.000208333 +DEAL:0::computed: 2.916875000 expected: 2.916666667 difference: 0.0002083333333 DEAL:0::Linfty_norm: -DEAL:0::computed: 3.00000 expected: 3.00000 difference: 0.00000 +DEAL:0::computed: 3.000000000 expected: 3.000000000 difference: 0.000000000 DEAL:0::mean: -DEAL:0::computed: -2.91688 expected: -2.91667 difference: 0.000208333 +DEAL:0::computed: -2.916875000 expected: -2.916666667 difference: 0.0002083333333 DEAL:0::Lp_norm: -DEAL:0::computed: 1.80879 expected: 1.80849 difference: 0.000304641 +DEAL:0::computed: 1.808791411 expected: 1.808486770 difference: 0.0003046405497 DEAL:0::W1p_seminorm: -DEAL:0::computed: 2.31582 expected: 2.31560 difference: 0.000216381 +DEAL:0::computed: 2.315816381 expected: 2.315600000 difference: 0.0002163806800 DEAL:0::OK diff --git a/tests/vector_tools/integrate_difference_04.with_trilinos=true.with_metis=true.mpirun=3.output b/tests/vector_tools/integrate_difference_04.with_trilinos=true.with_metis=true.mpirun=3.output index 0039dfb2b8..21fc28d184 100644 --- a/tests/vector_tools/integrate_difference_04.with_trilinos=true.with_metis=true.mpirun=3.output +++ b/tests/vector_tools/integrate_difference_04.with_trilinos=true.with_metis=true.mpirun=3.output @@ -1,62 +1,62 @@ DEAL:0::Hdiv_seminorm: -DEAL:0::computed: 3.05512 expected: 3.05505 difference: 6.81923e-05 +DEAL:0::computed: 3.055118656 expected: 3.055050463 difference: 6.819232963e-05 DEAL:0::L2_norm: -DEAL:0::computed: 1.95390 expected: 1.95363 difference: 0.000266581 +DEAL:0::computed: 1.953895683 expected: 1.953629102 difference: 0.0002665813359 DEAL:0::H1_seminorm: -DEAL:0::computed: 2.70821 expected: 2.70801 difference: 0.000192324 +DEAL:0::computed: 2.708205125 expected: 2.708012802 difference: 0.0001923236252 DEAL:0::H1_norm: -DEAL:0::computed: 3.33947 expected: 3.33916 difference: 0.000311941 +DEAL:0::computed: 3.339473512 expected: 3.339161571 difference: 0.0003119409606 DEAL:0::L1_norm: -DEAL:0::computed: 2.91688 expected: 2.91667 difference: 0.000208333 +DEAL:0::computed: 2.916875000 expected: 2.916666667 difference: 0.0002083333333 DEAL:0::Linfty_norm: -DEAL:0::computed: 3.00000 expected: 3.00000 difference: 0.00000 +DEAL:0::computed: 3.000000000 expected: 3.000000000 difference: 0.000000000 DEAL:0::mean: -DEAL:0::computed: -2.91688 expected: -2.91667 difference: 0.000208333 +DEAL:0::computed: -2.916875000 expected: -2.916666667 difference: 0.0002083333333 DEAL:0::Lp_norm: -DEAL:0::computed: 1.80879 expected: 1.80849 difference: 0.000304641 +DEAL:0::computed: 1.808791411 expected: 1.808486770 difference: 0.0003046405497 DEAL:0::W1p_seminorm: -DEAL:0::computed: 2.31582 expected: 2.31560 difference: 0.000216381 +DEAL:0::computed: 2.315816381 expected: 2.315600000 difference: 0.0002163806800 DEAL:0::OK DEAL:1::Hdiv_seminorm: -DEAL:1::computed: 3.05512 expected: 3.05505 difference: 6.81923e-05 +DEAL:1::computed: 3.055118656 expected: 3.055050463 difference: 6.819232963e-05 DEAL:1::L2_norm: -DEAL:1::computed: 1.95390 expected: 1.95363 difference: 0.000266581 +DEAL:1::computed: 1.953895683 expected: 1.953629102 difference: 0.0002665813359 DEAL:1::H1_seminorm: -DEAL:1::computed: 2.70821 expected: 2.70801 difference: 0.000192324 +DEAL:1::computed: 2.708205125 expected: 2.708012802 difference: 0.0001923236252 DEAL:1::H1_norm: -DEAL:1::computed: 3.33947 expected: 3.33916 difference: 0.000311941 +DEAL:1::computed: 3.339473512 expected: 3.339161571 difference: 0.0003119409606 DEAL:1::L1_norm: -DEAL:1::computed: 2.91688 expected: 2.91667 difference: 0.000208333 +DEAL:1::computed: 2.916875000 expected: 2.916666667 difference: 0.0002083333333 DEAL:1::Linfty_norm: -DEAL:1::computed: 3.00000 expected: 3.00000 difference: 0.00000 +DEAL:1::computed: 3.000000000 expected: 3.000000000 difference: 0.000000000 DEAL:1::mean: -DEAL:1::computed: -2.91688 expected: -2.91667 difference: 0.000208333 +DEAL:1::computed: -2.916875000 expected: -2.916666667 difference: 0.0002083333333 DEAL:1::Lp_norm: -DEAL:1::computed: 1.80879 expected: 1.80849 difference: 0.000304641 +DEAL:1::computed: 1.808791411 expected: 1.808486770 difference: 0.0003046405497 DEAL:1::W1p_seminorm: -DEAL:1::computed: 2.31582 expected: 2.31560 difference: 0.000216381 +DEAL:1::computed: 2.315816381 expected: 2.315600000 difference: 0.0002163806800 DEAL:1::OK DEAL:2::Hdiv_seminorm: -DEAL:2::computed: 3.05512 expected: 3.05505 difference: 6.81923e-05 +DEAL:2::computed: 3.055118656 expected: 3.055050463 difference: 6.819232963e-05 DEAL:2::L2_norm: -DEAL:2::computed: 1.95390 expected: 1.95363 difference: 0.000266581 +DEAL:2::computed: 1.953895683 expected: 1.953629102 difference: 0.0002665813359 DEAL:2::H1_seminorm: -DEAL:2::computed: 2.70821 expected: 2.70801 difference: 0.000192324 +DEAL:2::computed: 2.708205125 expected: 2.708012802 difference: 0.0001923236252 DEAL:2::H1_norm: -DEAL:2::computed: 3.33947 expected: 3.33916 difference: 0.000311941 +DEAL:2::computed: 3.339473512 expected: 3.339161571 difference: 0.0003119409606 DEAL:2::L1_norm: -DEAL:2::computed: 2.91688 expected: 2.91667 difference: 0.000208333 +DEAL:2::computed: 2.916875000 expected: 2.916666667 difference: 0.0002083333333 DEAL:2::Linfty_norm: -DEAL:2::computed: 3.00000 expected: 3.00000 difference: 0.00000 +DEAL:2::computed: 3.000000000 expected: 3.000000000 difference: 0.000000000 DEAL:2::mean: -DEAL:2::computed: -2.91688 expected: -2.91667 difference: 0.000208333 +DEAL:2::computed: -2.916875000 expected: -2.916666667 difference: 0.0002083333333 DEAL:2::Lp_norm: -DEAL:2::computed: 1.80879 expected: 1.80849 difference: 0.000304641 +DEAL:2::computed: 1.808791411 expected: 1.808486770 difference: 0.0003046405497 DEAL:2::W1p_seminorm: -DEAL:2::computed: 2.31582 expected: 2.31560 difference: 0.000216381 +DEAL:2::computed: 2.315816381 expected: 2.315600000 difference: 0.0002163806800 DEAL:2::OK diff --git a/tests/vector_tools/integrate_difference_04_hp.cc b/tests/vector_tools/integrate_difference_04_hp.cc index 7f4baf5dde..059f218e01 100644 --- a/tests/vector_tools/integrate_difference_04_hp.cc +++ b/tests/vector_tools/integrate_difference_04_hp.cc @@ -163,5 +163,6 @@ int main (int argc, char **argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv, 1); MPILogInitAll log; + deallog << std::setprecision(10); test<3>(); } diff --git a/tests/vector_tools/integrate_difference_04_hp.with_trilinos=true.with_metis=true.mpirun=1.output b/tests/vector_tools/integrate_difference_04_hp.with_trilinos=true.with_metis=true.mpirun=1.output index d207d6bd50..fcb9d1eb90 100644 --- a/tests/vector_tools/integrate_difference_04_hp.with_trilinos=true.with_metis=true.mpirun=1.output +++ b/tests/vector_tools/integrate_difference_04_hp.with_trilinos=true.with_metis=true.mpirun=1.output @@ -1,20 +1,20 @@ DEAL:0::Hdiv_seminorm: -DEAL:0::computed: 3.05512 expected: 3.05505 difference: 6.81923e-05 +DEAL:0::computed: 3.055118656 expected: 3.055050463 difference: 6.819232963e-05 DEAL:0::L2_norm: -DEAL:0::computed: 1.95390 expected: 1.95363 difference: 0.000266581 +DEAL:0::computed: 1.953895683 expected: 1.953629102 difference: 0.0002665813359 DEAL:0::H1_seminorm: -DEAL:0::computed: 2.70821 expected: 2.70801 difference: 0.000192324 +DEAL:0::computed: 2.708205125 expected: 2.708012802 difference: 0.0001923236252 DEAL:0::H1_norm: -DEAL:0::computed: 3.33947 expected: 3.33916 difference: 0.000311941 +DEAL:0::computed: 3.339473512 expected: 3.339161571 difference: 0.0003119409606 DEAL:0::L1_norm: -DEAL:0::computed: 2.91688 expected: 2.91667 difference: 0.000208333 +DEAL:0::computed: 2.916875000 expected: 2.916666667 difference: 0.0002083333333 DEAL:0::Linfty_norm: -DEAL:0::computed: 3.00000 expected: 3.00000 difference: 0.00000 +DEAL:0::computed: 3.000000000 expected: 3.000000000 difference: 0.000000000 DEAL:0::mean: -DEAL:0::computed: -2.91688 expected: -2.91667 difference: 0.000208333 +DEAL:0::computed: -2.916875000 expected: -2.916666667 difference: 0.0002083333333 DEAL:0::Lp_norm: -DEAL:0::computed: 1.80879 expected: 1.80849 difference: 0.000304641 +DEAL:0::computed: 1.808791411 expected: 1.808486770 difference: 0.0003046405497 DEAL:0::W1p_seminorm: -DEAL:0::computed: 2.31582 expected: 2.31560 difference: 0.000216381 +DEAL:0::computed: 2.315816381 expected: 2.315600000 difference: 0.0002163806800 DEAL:0::OK diff --git a/tests/vector_tools/integrate_difference_04_hp.with_trilinos=true.with_metis=true.mpirun=3.output b/tests/vector_tools/integrate_difference_04_hp.with_trilinos=true.with_metis=true.mpirun=3.output index 0039dfb2b8..21fc28d184 100644 --- a/tests/vector_tools/integrate_difference_04_hp.with_trilinos=true.with_metis=true.mpirun=3.output +++ b/tests/vector_tools/integrate_difference_04_hp.with_trilinos=true.with_metis=true.mpirun=3.output @@ -1,62 +1,62 @@ DEAL:0::Hdiv_seminorm: -DEAL:0::computed: 3.05512 expected: 3.05505 difference: 6.81923e-05 +DEAL:0::computed: 3.055118656 expected: 3.055050463 difference: 6.819232963e-05 DEAL:0::L2_norm: -DEAL:0::computed: 1.95390 expected: 1.95363 difference: 0.000266581 +DEAL:0::computed: 1.953895683 expected: 1.953629102 difference: 0.0002665813359 DEAL:0::H1_seminorm: -DEAL:0::computed: 2.70821 expected: 2.70801 difference: 0.000192324 +DEAL:0::computed: 2.708205125 expected: 2.708012802 difference: 0.0001923236252 DEAL:0::H1_norm: -DEAL:0::computed: 3.33947 expected: 3.33916 difference: 0.000311941 +DEAL:0::computed: 3.339473512 expected: 3.339161571 difference: 0.0003119409606 DEAL:0::L1_norm: -DEAL:0::computed: 2.91688 expected: 2.91667 difference: 0.000208333 +DEAL:0::computed: 2.916875000 expected: 2.916666667 difference: 0.0002083333333 DEAL:0::Linfty_norm: -DEAL:0::computed: 3.00000 expected: 3.00000 difference: 0.00000 +DEAL:0::computed: 3.000000000 expected: 3.000000000 difference: 0.000000000 DEAL:0::mean: -DEAL:0::computed: -2.91688 expected: -2.91667 difference: 0.000208333 +DEAL:0::computed: -2.916875000 expected: -2.916666667 difference: 0.0002083333333 DEAL:0::Lp_norm: -DEAL:0::computed: 1.80879 expected: 1.80849 difference: 0.000304641 +DEAL:0::computed: 1.808791411 expected: 1.808486770 difference: 0.0003046405497 DEAL:0::W1p_seminorm: -DEAL:0::computed: 2.31582 expected: 2.31560 difference: 0.000216381 +DEAL:0::computed: 2.315816381 expected: 2.315600000 difference: 0.0002163806800 DEAL:0::OK DEAL:1::Hdiv_seminorm: -DEAL:1::computed: 3.05512 expected: 3.05505 difference: 6.81923e-05 +DEAL:1::computed: 3.055118656 expected: 3.055050463 difference: 6.819232963e-05 DEAL:1::L2_norm: -DEAL:1::computed: 1.95390 expected: 1.95363 difference: 0.000266581 +DEAL:1::computed: 1.953895683 expected: 1.953629102 difference: 0.0002665813359 DEAL:1::H1_seminorm: -DEAL:1::computed: 2.70821 expected: 2.70801 difference: 0.000192324 +DEAL:1::computed: 2.708205125 expected: 2.708012802 difference: 0.0001923236252 DEAL:1::H1_norm: -DEAL:1::computed: 3.33947 expected: 3.33916 difference: 0.000311941 +DEAL:1::computed: 3.339473512 expected: 3.339161571 difference: 0.0003119409606 DEAL:1::L1_norm: -DEAL:1::computed: 2.91688 expected: 2.91667 difference: 0.000208333 +DEAL:1::computed: 2.916875000 expected: 2.916666667 difference: 0.0002083333333 DEAL:1::Linfty_norm: -DEAL:1::computed: 3.00000 expected: 3.00000 difference: 0.00000 +DEAL:1::computed: 3.000000000 expected: 3.000000000 difference: 0.000000000 DEAL:1::mean: -DEAL:1::computed: -2.91688 expected: -2.91667 difference: 0.000208333 +DEAL:1::computed: -2.916875000 expected: -2.916666667 difference: 0.0002083333333 DEAL:1::Lp_norm: -DEAL:1::computed: 1.80879 expected: 1.80849 difference: 0.000304641 +DEAL:1::computed: 1.808791411 expected: 1.808486770 difference: 0.0003046405497 DEAL:1::W1p_seminorm: -DEAL:1::computed: 2.31582 expected: 2.31560 difference: 0.000216381 +DEAL:1::computed: 2.315816381 expected: 2.315600000 difference: 0.0002163806800 DEAL:1::OK DEAL:2::Hdiv_seminorm: -DEAL:2::computed: 3.05512 expected: 3.05505 difference: 6.81923e-05 +DEAL:2::computed: 3.055118656 expected: 3.055050463 difference: 6.819232963e-05 DEAL:2::L2_norm: -DEAL:2::computed: 1.95390 expected: 1.95363 difference: 0.000266581 +DEAL:2::computed: 1.953895683 expected: 1.953629102 difference: 0.0002665813359 DEAL:2::H1_seminorm: -DEAL:2::computed: 2.70821 expected: 2.70801 difference: 0.000192324 +DEAL:2::computed: 2.708205125 expected: 2.708012802 difference: 0.0001923236252 DEAL:2::H1_norm: -DEAL:2::computed: 3.33947 expected: 3.33916 difference: 0.000311941 +DEAL:2::computed: 3.339473512 expected: 3.339161571 difference: 0.0003119409606 DEAL:2::L1_norm: -DEAL:2::computed: 2.91688 expected: 2.91667 difference: 0.000208333 +DEAL:2::computed: 2.916875000 expected: 2.916666667 difference: 0.0002083333333 DEAL:2::Linfty_norm: -DEAL:2::computed: 3.00000 expected: 3.00000 difference: 0.00000 +DEAL:2::computed: 3.000000000 expected: 3.000000000 difference: 0.000000000 DEAL:2::mean: -DEAL:2::computed: -2.91688 expected: -2.91667 difference: 0.000208333 +DEAL:2::computed: -2.916875000 expected: -2.916666667 difference: 0.0002083333333 DEAL:2::Lp_norm: -DEAL:2::computed: 1.80879 expected: 1.80849 difference: 0.000304641 +DEAL:2::computed: 1.808791411 expected: 1.808486770 difference: 0.0003046405497 DEAL:2::W1p_seminorm: -DEAL:2::computed: 2.31582 expected: 2.31560 difference: 0.000216381 +DEAL:2::computed: 2.315816381 expected: 2.315600000 difference: 0.0002163806800 DEAL:2::OK -- 2.39.5