From aca52276dda559bc4afb6d810145d0b212b32d0a Mon Sep 17 00:00:00 2001 From: Benjamin Brands Date: Wed, 28 Feb 2018 15:14:21 +0100 Subject: [PATCH] make test scalapack_10_b shorter --- tests/scalapack/scalapack_10_b.cc | 13 ++- ...calapack_10_b.with_hdf5=on.mpirun=1.output | 84 +++---------------- ...alapack_10_b.with_hdf5=on.mpirun=11.output | 84 +++---------------- ...calapack_10_b.with_hdf5=on.mpirun=4.output | 84 +++---------------- ...calapack_10_b.with_hdf5=on.mpirun=5.output | 84 +++---------------- 5 files changed, 54 insertions(+), 295 deletions(-) diff --git a/tests/scalapack/scalapack_10_b.cc b/tests/scalapack/scalapack_10_b.cc index 3e09b515bb..0ead9cfa93 100644 --- a/tests/scalapack/scalapack_10_b.cc +++ b/tests/scalapack/scalapack_10_b.cc @@ -60,7 +60,8 @@ void test(const std::pair &size, const unsigned int b pcout << size.first << "x" << size.second << " & " << block_size << " & " - << chunk_size.first << "x" << chunk_size.second << std::endl; + << chunk_size.first << "x" << chunk_size.second << " & " + << grid->get_process_grid_rows() << "x" << grid->get_process_grid_columns() << std::endl; AssertThrow(copy.frobenius_norm()<1e-12,ExcInternalError()); std::remove(filename.c_str()); } @@ -72,16 +73,13 @@ int main (int argc,char **argv) Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, numbers::invalid_unsigned_int); std::vector> sizes; - sizes.push_back(std::make_pair(100,75)); - sizes.push_back(std::make_pair(200,225)); sizes.push_back(std::make_pair(300,250)); - const std::vector block_sizes = {{1,16,32}}; + const std::vector block_sizes = {{32,64}}; std::vector> chunk_sizes; - chunk_sizes.push_back(std::make_pair(1,1)); - chunk_sizes.push_back(std::make_pair(10,10)); - chunk_sizes.push_back(std::make_pair(50,50)); + chunk_sizes.push_back(std::make_pair(25,25)); + chunk_sizes.push_back(std::make_pair(75,50)); chunk_sizes.push_back(std::make_pair(100,75)); for (unsigned int i=0; i(sizes[i],block_sizes[j],chunk_sizes[k]); + } diff --git a/tests/scalapack/scalapack_10_b.with_hdf5=on.mpirun=1.output b/tests/scalapack/scalapack_10_b.with_hdf5=on.mpirun=1.output index ec9538e8ac..9e87349748 100644 --- a/tests/scalapack/scalapack_10_b.with_hdf5=on.mpirun=1.output +++ b/tests/scalapack/scalapack_10_b.with_hdf5=on.mpirun=1.output @@ -1,72 +1,12 @@ -100x75 & 1 & 1x1 -100x75 & 1 & 10x10 -100x75 & 1 & 50x50 -100x75 & 1 & 100x75 -100x75 & 16 & 1x1 -100x75 & 16 & 10x10 -100x75 & 16 & 50x50 -100x75 & 16 & 100x75 -100x75 & 32 & 1x1 -100x75 & 32 & 10x10 -100x75 & 32 & 50x50 -100x75 & 32 & 100x75 -200x225 & 1 & 1x1 -200x225 & 1 & 10x10 -200x225 & 1 & 50x50 -200x225 & 1 & 100x75 -200x225 & 16 & 1x1 -200x225 & 16 & 10x10 -200x225 & 16 & 50x50 -200x225 & 16 & 100x75 -200x225 & 32 & 1x1 -200x225 & 32 & 10x10 -200x225 & 32 & 50x50 -200x225 & 32 & 100x75 -300x250 & 1 & 1x1 -300x250 & 1 & 10x10 -300x250 & 1 & 50x50 -300x250 & 1 & 100x75 -300x250 & 16 & 1x1 -300x250 & 16 & 10x10 -300x250 & 16 & 50x50 -300x250 & 16 & 100x75 -300x250 & 32 & 1x1 -300x250 & 32 & 10x10 -300x250 & 32 & 50x50 -300x250 & 32 & 100x75 -100x75 & 1 & 1x1 -100x75 & 1 & 10x10 -100x75 & 1 & 50x50 -100x75 & 1 & 100x75 -100x75 & 16 & 1x1 -100x75 & 16 & 10x10 -100x75 & 16 & 50x50 -100x75 & 16 & 100x75 -100x75 & 32 & 1x1 -100x75 & 32 & 10x10 -100x75 & 32 & 50x50 -100x75 & 32 & 100x75 -200x225 & 1 & 1x1 -200x225 & 1 & 10x10 -200x225 & 1 & 50x50 -200x225 & 1 & 100x75 -200x225 & 16 & 1x1 -200x225 & 16 & 10x10 -200x225 & 16 & 50x50 -200x225 & 16 & 100x75 -200x225 & 32 & 1x1 -200x225 & 32 & 10x10 -200x225 & 32 & 50x50 -200x225 & 32 & 100x75 -300x250 & 1 & 1x1 -300x250 & 1 & 10x10 -300x250 & 1 & 50x50 -300x250 & 1 & 100x75 -300x250 & 16 & 1x1 -300x250 & 16 & 10x10 -300x250 & 16 & 50x50 -300x250 & 16 & 100x75 -300x250 & 32 & 1x1 -300x250 & 32 & 10x10 -300x250 & 32 & 50x50 -300x250 & 32 & 100x75 +300x250 & 32 & 25x25 & 1x1 +300x250 & 32 & 75x50 & 1x1 +300x250 & 32 & 100x75 & 1x1 +300x250 & 64 & 25x25 & 1x1 +300x250 & 64 & 75x50 & 1x1 +300x250 & 64 & 100x75 & 1x1 +300x250 & 32 & 25x25 & 1x1 +300x250 & 32 & 75x50 & 1x1 +300x250 & 32 & 100x75 & 1x1 +300x250 & 64 & 25x25 & 1x1 +300x250 & 64 & 75x50 & 1x1 +300x250 & 64 & 100x75 & 1x1 diff --git a/tests/scalapack/scalapack_10_b.with_hdf5=on.mpirun=11.output b/tests/scalapack/scalapack_10_b.with_hdf5=on.mpirun=11.output index ec9538e8ac..b2e5ceac50 100644 --- a/tests/scalapack/scalapack_10_b.with_hdf5=on.mpirun=11.output +++ b/tests/scalapack/scalapack_10_b.with_hdf5=on.mpirun=11.output @@ -1,72 +1,12 @@ -100x75 & 1 & 1x1 -100x75 & 1 & 10x10 -100x75 & 1 & 50x50 -100x75 & 1 & 100x75 -100x75 & 16 & 1x1 -100x75 & 16 & 10x10 -100x75 & 16 & 50x50 -100x75 & 16 & 100x75 -100x75 & 32 & 1x1 -100x75 & 32 & 10x10 -100x75 & 32 & 50x50 -100x75 & 32 & 100x75 -200x225 & 1 & 1x1 -200x225 & 1 & 10x10 -200x225 & 1 & 50x50 -200x225 & 1 & 100x75 -200x225 & 16 & 1x1 -200x225 & 16 & 10x10 -200x225 & 16 & 50x50 -200x225 & 16 & 100x75 -200x225 & 32 & 1x1 -200x225 & 32 & 10x10 -200x225 & 32 & 50x50 -200x225 & 32 & 100x75 -300x250 & 1 & 1x1 -300x250 & 1 & 10x10 -300x250 & 1 & 50x50 -300x250 & 1 & 100x75 -300x250 & 16 & 1x1 -300x250 & 16 & 10x10 -300x250 & 16 & 50x50 -300x250 & 16 & 100x75 -300x250 & 32 & 1x1 -300x250 & 32 & 10x10 -300x250 & 32 & 50x50 -300x250 & 32 & 100x75 -100x75 & 1 & 1x1 -100x75 & 1 & 10x10 -100x75 & 1 & 50x50 -100x75 & 1 & 100x75 -100x75 & 16 & 1x1 -100x75 & 16 & 10x10 -100x75 & 16 & 50x50 -100x75 & 16 & 100x75 -100x75 & 32 & 1x1 -100x75 & 32 & 10x10 -100x75 & 32 & 50x50 -100x75 & 32 & 100x75 -200x225 & 1 & 1x1 -200x225 & 1 & 10x10 -200x225 & 1 & 50x50 -200x225 & 1 & 100x75 -200x225 & 16 & 1x1 -200x225 & 16 & 10x10 -200x225 & 16 & 50x50 -200x225 & 16 & 100x75 -200x225 & 32 & 1x1 -200x225 & 32 & 10x10 -200x225 & 32 & 50x50 -200x225 & 32 & 100x75 -300x250 & 1 & 1x1 -300x250 & 1 & 10x10 -300x250 & 1 & 50x50 -300x250 & 1 & 100x75 -300x250 & 16 & 1x1 -300x250 & 16 & 10x10 -300x250 & 16 & 50x50 -300x250 & 16 & 100x75 -300x250 & 32 & 1x1 -300x250 & 32 & 10x10 -300x250 & 32 & 50x50 -300x250 & 32 & 100x75 +300x250 & 32 & 25x25 & 3x3 +300x250 & 32 & 75x50 & 3x3 +300x250 & 32 & 100x75 & 3x3 +300x250 & 64 & 25x25 & 3x3 +300x250 & 64 & 75x50 & 3x3 +300x250 & 64 & 100x75 & 3x3 +300x250 & 32 & 25x25 & 3x3 +300x250 & 32 & 75x50 & 3x3 +300x250 & 32 & 100x75 & 3x3 +300x250 & 64 & 25x25 & 3x3 +300x250 & 64 & 75x50 & 3x3 +300x250 & 64 & 100x75 & 3x3 diff --git a/tests/scalapack/scalapack_10_b.with_hdf5=on.mpirun=4.output b/tests/scalapack/scalapack_10_b.with_hdf5=on.mpirun=4.output index ec9538e8ac..0843e990d9 100644 --- a/tests/scalapack/scalapack_10_b.with_hdf5=on.mpirun=4.output +++ b/tests/scalapack/scalapack_10_b.with_hdf5=on.mpirun=4.output @@ -1,72 +1,12 @@ -100x75 & 1 & 1x1 -100x75 & 1 & 10x10 -100x75 & 1 & 50x50 -100x75 & 1 & 100x75 -100x75 & 16 & 1x1 -100x75 & 16 & 10x10 -100x75 & 16 & 50x50 -100x75 & 16 & 100x75 -100x75 & 32 & 1x1 -100x75 & 32 & 10x10 -100x75 & 32 & 50x50 -100x75 & 32 & 100x75 -200x225 & 1 & 1x1 -200x225 & 1 & 10x10 -200x225 & 1 & 50x50 -200x225 & 1 & 100x75 -200x225 & 16 & 1x1 -200x225 & 16 & 10x10 -200x225 & 16 & 50x50 -200x225 & 16 & 100x75 -200x225 & 32 & 1x1 -200x225 & 32 & 10x10 -200x225 & 32 & 50x50 -200x225 & 32 & 100x75 -300x250 & 1 & 1x1 -300x250 & 1 & 10x10 -300x250 & 1 & 50x50 -300x250 & 1 & 100x75 -300x250 & 16 & 1x1 -300x250 & 16 & 10x10 -300x250 & 16 & 50x50 -300x250 & 16 & 100x75 -300x250 & 32 & 1x1 -300x250 & 32 & 10x10 -300x250 & 32 & 50x50 -300x250 & 32 & 100x75 -100x75 & 1 & 1x1 -100x75 & 1 & 10x10 -100x75 & 1 & 50x50 -100x75 & 1 & 100x75 -100x75 & 16 & 1x1 -100x75 & 16 & 10x10 -100x75 & 16 & 50x50 -100x75 & 16 & 100x75 -100x75 & 32 & 1x1 -100x75 & 32 & 10x10 -100x75 & 32 & 50x50 -100x75 & 32 & 100x75 -200x225 & 1 & 1x1 -200x225 & 1 & 10x10 -200x225 & 1 & 50x50 -200x225 & 1 & 100x75 -200x225 & 16 & 1x1 -200x225 & 16 & 10x10 -200x225 & 16 & 50x50 -200x225 & 16 & 100x75 -200x225 & 32 & 1x1 -200x225 & 32 & 10x10 -200x225 & 32 & 50x50 -200x225 & 32 & 100x75 -300x250 & 1 & 1x1 -300x250 & 1 & 10x10 -300x250 & 1 & 50x50 -300x250 & 1 & 100x75 -300x250 & 16 & 1x1 -300x250 & 16 & 10x10 -300x250 & 16 & 50x50 -300x250 & 16 & 100x75 -300x250 & 32 & 1x1 -300x250 & 32 & 10x10 -300x250 & 32 & 50x50 -300x250 & 32 & 100x75 +300x250 & 32 & 25x25 & 2x2 +300x250 & 32 & 75x50 & 2x2 +300x250 & 32 & 100x75 & 2x2 +300x250 & 64 & 25x25 & 2x2 +300x250 & 64 & 75x50 & 2x2 +300x250 & 64 & 100x75 & 2x2 +300x250 & 32 & 25x25 & 2x2 +300x250 & 32 & 75x50 & 2x2 +300x250 & 32 & 100x75 & 2x2 +300x250 & 64 & 25x25 & 2x2 +300x250 & 64 & 75x50 & 2x2 +300x250 & 64 & 100x75 & 2x2 diff --git a/tests/scalapack/scalapack_10_b.with_hdf5=on.mpirun=5.output b/tests/scalapack/scalapack_10_b.with_hdf5=on.mpirun=5.output index ec9538e8ac..0843e990d9 100644 --- a/tests/scalapack/scalapack_10_b.with_hdf5=on.mpirun=5.output +++ b/tests/scalapack/scalapack_10_b.with_hdf5=on.mpirun=5.output @@ -1,72 +1,12 @@ -100x75 & 1 & 1x1 -100x75 & 1 & 10x10 -100x75 & 1 & 50x50 -100x75 & 1 & 100x75 -100x75 & 16 & 1x1 -100x75 & 16 & 10x10 -100x75 & 16 & 50x50 -100x75 & 16 & 100x75 -100x75 & 32 & 1x1 -100x75 & 32 & 10x10 -100x75 & 32 & 50x50 -100x75 & 32 & 100x75 -200x225 & 1 & 1x1 -200x225 & 1 & 10x10 -200x225 & 1 & 50x50 -200x225 & 1 & 100x75 -200x225 & 16 & 1x1 -200x225 & 16 & 10x10 -200x225 & 16 & 50x50 -200x225 & 16 & 100x75 -200x225 & 32 & 1x1 -200x225 & 32 & 10x10 -200x225 & 32 & 50x50 -200x225 & 32 & 100x75 -300x250 & 1 & 1x1 -300x250 & 1 & 10x10 -300x250 & 1 & 50x50 -300x250 & 1 & 100x75 -300x250 & 16 & 1x1 -300x250 & 16 & 10x10 -300x250 & 16 & 50x50 -300x250 & 16 & 100x75 -300x250 & 32 & 1x1 -300x250 & 32 & 10x10 -300x250 & 32 & 50x50 -300x250 & 32 & 100x75 -100x75 & 1 & 1x1 -100x75 & 1 & 10x10 -100x75 & 1 & 50x50 -100x75 & 1 & 100x75 -100x75 & 16 & 1x1 -100x75 & 16 & 10x10 -100x75 & 16 & 50x50 -100x75 & 16 & 100x75 -100x75 & 32 & 1x1 -100x75 & 32 & 10x10 -100x75 & 32 & 50x50 -100x75 & 32 & 100x75 -200x225 & 1 & 1x1 -200x225 & 1 & 10x10 -200x225 & 1 & 50x50 -200x225 & 1 & 100x75 -200x225 & 16 & 1x1 -200x225 & 16 & 10x10 -200x225 & 16 & 50x50 -200x225 & 16 & 100x75 -200x225 & 32 & 1x1 -200x225 & 32 & 10x10 -200x225 & 32 & 50x50 -200x225 & 32 & 100x75 -300x250 & 1 & 1x1 -300x250 & 1 & 10x10 -300x250 & 1 & 50x50 -300x250 & 1 & 100x75 -300x250 & 16 & 1x1 -300x250 & 16 & 10x10 -300x250 & 16 & 50x50 -300x250 & 16 & 100x75 -300x250 & 32 & 1x1 -300x250 & 32 & 10x10 -300x250 & 32 & 50x50 -300x250 & 32 & 100x75 +300x250 & 32 & 25x25 & 2x2 +300x250 & 32 & 75x50 & 2x2 +300x250 & 32 & 100x75 & 2x2 +300x250 & 64 & 25x25 & 2x2 +300x250 & 64 & 75x50 & 2x2 +300x250 & 64 & 100x75 & 2x2 +300x250 & 32 & 25x25 & 2x2 +300x250 & 32 & 75x50 & 2x2 +300x250 & 32 & 100x75 & 2x2 +300x250 & 64 & 25x25 & 2x2 +300x250 & 64 & 75x50 & 2x2 +300x250 & 64 & 100x75 & 2x2 -- 2.39.5