make test scalapack_10_b shorter

diff --git a/tests/scalapack/scalapack_10_b.cc b/tests/scalapack/scalapack_10_b.cc
index 3e09b515bb3bf1b8f8c061b8f64ce71b49271bf6..0ead9cfa931bb21d71dad31c2fe712afc662987f 100644 (file)
--- a/tests/scalapack/scalapack_10_b.cc
+++ b/tests/scalapack/scalapack_10_b.cc
@@ -60,7 +60,8 @@ void test(const std::pair<unsigned int,unsigned int> &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<std::pair<unsigned int,unsigned int>> 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<unsigned int> block_sizes = {{1,16,32}};
+  const std::vector<unsigned int> block_sizes = {{32,64}};
 
   std::vector<std::pair<unsigned int,unsigned int>> 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.size(); ++i)
@@ -93,4 +91,5 @@ int main (int argc,char **argv)
     for (unsigned int j=0; j<block_sizes.size(); ++j)
       for (unsigned int k=0; k<chunk_sizes.size(); ++k)
         test<float>(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 ec9538e8acd60d3f76e71b25b32551050e241453..9e873497480aa4e52787048d95c7c6ba1832125e 100644 (file)
--- 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 ec9538e8acd60d3f76e71b25b32551050e241453..b2e5ceac50c4c45578f5d0695daf75ffef75f301 100644 (file)
--- 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 ec9538e8acd60d3f76e71b25b32551050e241453..0843e990d9e84c30f3ac0b409cf42b15aab2d69c 100644 (file)
--- 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 ec9538e8acd60d3f76e71b25b32551050e241453..0843e990d9e84c30f3ac0b409cf42b15aab2d69c 100644 (file)
--- 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