Add sequential distributed test

Author: ericneiva

test/dev/distributed_aggregation.jl

@@ -15,10 +15,6 @@ using MPI
 using Test
 using BenchmarkTools
 
-if ! MPI.Initialized()
-  MPI.Init()
-end
-
 function asymmetric_kettlebell(ranks, parts, nc, ng)
   L = 1
   p0 = Point(0.0,0.0)
@@ -259,11 +255,11 @@ function run_benchmark_test(distribute,
 
 end
 
-function run_new_distributed_agfem(distribute,
-                                   parts,
-                                   ncells_x_dir,
-                                   nghost_layers,
-                                   problem)
+function run_distributed_agfem(distribute,
+                               parts,
+                               ncells_x_dir,
+                               nghost_layers,
+                               problem)
 
   ranks = distribute(LinearIndices((prod(parts),)))
   bgmodel, geo = problem(ranks, parts, ncells_x_dir, nghost_layers)
@@ -368,52 +364,4 @@ function run_new_distributed_agfem(distribute,
 
 end
 
-problem = symmetric_kettlebell
-
-if MPI.Comm_size(MPI.COMM_WORLD) == 3
-  with_mpi() do distribute
-    run_benchmark_test(distribute,(3,1),9,2,problem)
-    for ncells_x_dir in (9,18,36,72), nghost_layers in (2,3,4)
-      run_benchmark_test(distribute,
-                         (3,1),
-                         ncells_x_dir,
-                         nghost_layers,
-                         problem)
-    end
-  end
-elseif MPI.Comm_size(MPI.COMM_WORLD) == 4
-  with_mpi() do distribute
-    run_benchmark_test(distribute,(2,2),8,2,problem)
-    for ncells_x_dir in (8,16,32,64), nghost_layers in (2,3,4)
-      run_benchmark_test(distribute,
-                         (2,2),
-                         ncells_x_dir,
-                         nghost_layers,
-                         problem)
-    end
-  end
-elseif MPI.Comm_size(MPI.COMM_WORLD) == 8
-  with_mpi() do distribute
-    run_benchmark_test(distribute,(4,2),8,2,problem)
-    for ncells_x_dir in (16,32,64,128), nghost_layers in (2,3,4,5)
-      run_benchmark_test(distribute,
-                         (4,2),
-                         ncells_x_dir,
-                         nghost_layers,
-                         problem)
-    end
-  end
-elseif MPI.Comm_size(MPI.COMM_WORLD) == 12
-  with_mpi() do distribute
-    run_benchmark_test(distribute,(4,3),12,2,problem)
-    for ncells_x_dir in (24,48,96,192), nghost_layers in (2,3,4,5)
-      run_benchmark_test(distribute,
-                         (4,3),
-                         ncells_x_dir,
-                         nghost_layers,
-                         problem)
-    end
-  end
-end
-
 end

test/dev/runtests.jl renamed to test/dev/mpi/runtests.jl

@@ -4,7 +4,7 @@ using Test
 using MPI
 
 mpidir = @__DIR__
-testdir = mpidir
+testdir = joinpath(mpidir,"..")
 repodir = joinpath(testdir,"..","..")
 
 function run_test(procs,file)
@@ -13,9 +13,9 @@ function run_test(procs,file)
   end
 end
 
-run_test( 3,"distributed_aggregation.jl")
-run_test( 4,"distributed_aggregation.jl")
-run_test( 8,"distributed_aggregation.jl")
-run_test(12,"distributed_aggregation.jl")
+run_test( 3,"runtests_body.jl")
+# run_test( 4,"runtests_body.jl")
+# run_test( 8,"runtests_body.jl")
+# run_test(12,"runtests_body.jl")
 
 end # module

test/dev/mpi/runtests_body.jl

@@ -0,0 +1,63 @@
+module DistributedAggregationMPI
+
+using PartitionedArrays
+const PArrays = PartitionedArrays
+using MPI
+
+include("../distributed_aggregation.jl")
+
+const DA = DistributedAggregation
+
+if ! MPI.Initialized()
+  MPI.Init()
+end
+
+problem = DA.symmetric_kettlebell
+
+if MPI.Comm_size(MPI.COMM_WORLD) == 3
+  with_mpi() do distribute
+    DA.run_benchmark_test(distribute,(3,1),9,2,problem)
+    for ncells_x_dir in (9,18,36,72), nghost_layers in (2,3,4)
+      DA.run_benchmark_test(distribute,
+                         (3,1),
+                         ncells_x_dir,
+                         nghost_layers,
+                         problem)
+    end
+  end
+elseif MPI.Comm_size(MPI.COMM_WORLD) == 4
+  with_mpi() do distribute
+    DA.run_benchmark_test(distribute,(2,2),8,2,problem)
+    for ncells_x_dir in (8,16,32,64), nghost_layers in (2,3,4)
+      DA.run_benchmark_test(distribute,
+                         (2,2),
+                         ncells_x_dir,
+                         nghost_layers,
+                         problem)
+    end
+  end
+elseif MPI.Comm_size(MPI.COMM_WORLD) == 8
+  with_mpi() do distribute
+    DA.run_benchmark_test(distribute,(4,2),8,2,problem)
+    for ncells_x_dir in (16,32,64,128), nghost_layers in (2,3,4,5)
+      DA.run_benchmark_test(distribute,
+                         (4,2),
+                         ncells_x_dir,
+                         nghost_layers,
+                         problem)
+    end
+  end
+elseif MPI.Comm_size(MPI.COMM_WORLD) == 12
+  with_mpi() do distribute
+    DA.run_benchmark_test(distribute,(4,3),12,2,problem)
+    for ncells_x_dir in (24,48,96,192), nghost_layers in (2,3,4,5)
+      DA.run_benchmark_test(distribute,
+                         (4,3),
+                         ncells_x_dir,
+                         nghost_layers,
+                         problem)
+    end
+  end
+end
+
+end # module

test/dev/sequential/runtests.jl

@@ -0,0 +1,9 @@
+module DistributedAggregationSeqTests
+using PartitionedArrays
+include("../distributed_aggregation.jl")
+const DA = DistributedAggregation
+problem = DA.symmetric_kettlebell
+with_debug() do distribute
+  DA.run_distributed_agfem(distribute,(3,1),9,2,problem)
+end
+end # module