Skip to content

Commit

Permalink
MueLu: gold file rebase and change of logic for issue trilinos#6269
Browse files Browse the repository at this point in the history 
This commits modifies ParameterListInterpeter to ignore non-deterministic output
 from the refactored uncoupled aggregation.
  • Loading branch information
@lucbv
lucbv committed Nov 21, 2019
1 parent ba34963 commit e3fcdc9
Show file tree
Hide file tree
Showing 173 changed files with 1,499 additions and 1,465 deletions.
34 changes: 34 additions & 0 deletions packages/muelu/test/interface/ParameterListInterpreter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,40 @@ int main_(Teuchos::CommandLineProcessor &clp, Xpetra::UnderlyingLib& lib, int ar
run_sed("'/RCP/ s/=0x0/=0/g'", baseFile);
#endif

// When using the kokkos refactor path, aggregation is non-deterministic
// This means that we need to remove most mentions of matrix sizes in the
// level smoothers and we also need to remove data from the summary
if(useKokkos) {
// Defining a couple helpful regex strings
const std::string floatRegex = "[0-9]\\{1,\\}.[0-9]\\{1,\\}";
const std::string integerRegex = "[0-9]\\{1,\\}";

// Catch lines of the MueLu summary (except the first one which is a bit different)
std::string stringToReplace = integerRegex + "\\s*"
+ integerRegex + "\\s*"
+ integerRegex + "\\s*"
+ floatRegex + "\\s*"
+ floatRegex + "\\s*[0-9]";
std::string replacementString = "<ignored>";
run_sed("'s/" + stringToReplace + "/" + replacementString + "/'", baseFile);

// Catch the first line of the MueLu summary
stringToReplace = integerRegex + "\\s*" + integerRegex + "\\s*"
+ integerRegex + "\\s*" + floatRegex + "\\s*[0-9]";
run_sed("'s/" + stringToReplace + "/" + replacementString + "/'", baseFile);

// Catch the matrix size related informations from Ifpack's output
stringToReplace = "Global matrix dimensions: [" + integerRegex + ",\\s*" + integerRegex
+ "], Global nnz: " + integerRegex;
replacementString = "Global matrix dimensions: <ignored>, Global nnz: <ignored>";
run_sed("'s/" + stringToReplace + "/" + replacementString + "/'", baseFile);

// Catch smoother complexity output from MueLu
stringToReplace = "Smoother complexity = " + floatRegex;
replacementString = "Smoother complexity = <ignored>";
run_sed("'s/" + stringToReplace + "/" + replacementString + "/'", baseFile);
}

// Run comparison (ignoring whitespaces)
cmd = "diff -u -w -I\"^\\s*$\" " + baseFile + ".gold_filtered " + baseFile + ".out_filtered";
int ret = system(cmd.c_str());
Expand Down
20 changes: 10 additions & 10 deletions packages/muelu/test/interface/kokkos-complex/Output/MLcoarse1_tpetra.gold
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ filtered matrix: reuse eigenvalue = 1 [default]
lightweight wrap = 1 [default]

BuildAggregates (Phase - (Dirichlet))
BuildAggregatesSerial (Phase 1 (main))
BuildAggregatesRandom (Phase 1 (main))
BuildAggregatesRandom (Phase 2a (secondary))
BuildAggregatesRandom (Phase 2b (expansion))
BuildAggregatesRandom (Phase 3 (cleanup))
aggregation: max agg size = -1 [default]
aggregation: min agg size = 1 [unused]
aggregation: max selected neighbors = 0 [unused]
aggregation: ordering = natural [unused]
aggregation: enable phase 1 = 1 [default]
aggregation: phase 1 algorithm = Serial [default]
aggregation: deterministic = 0 [default]
aggregation: coloring algorithm = default [default]
aggregation: enable phase 1 = 1 [default]
aggregation: enable phase 2a = 1 [default]
aggregation: enable phase 2b = 1 [default]
aggregation: enable phase 3 = 1 [default]
Expand Down Expand Up @@ -123,17 +123,17 @@ filtered matrix: reuse eigenvalue = 1 [default]
lightweight wrap = 1 [default]

BuildAggregates (Phase - (Dirichlet))
BuildAggregatesSerial (Phase 1 (main))
BuildAggregatesRandom (Phase 1 (main))
BuildAggregatesRandom (Phase 2a (secondary))
BuildAggregatesRandom (Phase 2b (expansion))
BuildAggregatesRandom (Phase 3 (cleanup))
aggregation: max agg size = -1 [default]
aggregation: min agg size = 1 [unused]
aggregation: max selected neighbors = 0 [unused]
aggregation: ordering = natural [unused]
aggregation: enable phase 1 = 1 [default]
aggregation: phase 1 algorithm = Serial [default]
aggregation: deterministic = 0 [default]
aggregation: coloring algorithm = default [default]
aggregation: enable phase 1 = 1 [default]
aggregation: enable phase 2a = 1 [default]
aggregation: enable phase 2b = 1 [default]
aggregation: enable phase 3 = 1 [default]
Expand Down Expand Up @@ -211,17 +211,17 @@ filtered matrix: reuse eigenvalue = 1 [default]
lightweight wrap = 1 [default]

BuildAggregates (Phase - (Dirichlet))
BuildAggregatesSerial (Phase 1 (main))
BuildAggregatesRandom (Phase 1 (main))
BuildAggregatesRandom (Phase 2a (secondary))
BuildAggregatesRandom (Phase 2b (expansion))
BuildAggregatesRandom (Phase 3 (cleanup))
aggregation: max agg size = -1 [default]
aggregation: min agg size = 1 [unused]
aggregation: max selected neighbors = 0 [unused]
aggregation: ordering = natural [unused]
aggregation: enable phase 1 = 1 [default]
aggregation: phase 1 algorithm = Serial [default]
aggregation: deterministic = 0 [default]
aggregation: coloring algorithm = default [default]
aggregation: enable phase 1 = 1 [default]
aggregation: enable phase 2a = 1 [default]
aggregation: enable phase 2b = 1 [default]
aggregation: enable phase 3 = 1 [default]
Expand Down Expand Up @@ -284,7 +284,7 @@ level rows nnz nnz/row c ratio procs
0 9999 29995 3.00 1
1 3333 9997 3.00 3.00 1
2 1111 3331 3.00 3.00 1
3 371 1111 2.99 2.99 1
3 369 1105 2.99 3.01 1

Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995}

Expand Down
40 changes: 20 additions & 20 deletions packages/muelu/test/interface/kokkos-complex/Output/MLcoarse2_tpetra.gold
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ filtered matrix: reuse eigenvalue = 1 [default]
lightweight wrap = 1 [default]

BuildAggregates (Phase - (Dirichlet))
BuildAggregatesSerial (Phase 1 (main))
BuildAggregatesRandom (Phase 1 (main))
BuildAggregatesRandom (Phase 2a (secondary))
BuildAggregatesRandom (Phase 2b (expansion))
BuildAggregatesRandom (Phase 3 (cleanup))
aggregation: max agg size = -1 [default]
aggregation: min agg size = 1 [unused]
aggregation: max selected neighbors = 0 [unused]
aggregation: ordering = natural [unused]
aggregation: enable phase 1 = 1 [default]
aggregation: phase 1 algorithm = Serial [default]
aggregation: deterministic = 0 [default]
aggregation: coloring algorithm = default [default]
aggregation: enable phase 1 = 1 [default]
aggregation: enable phase 2a = 1 [default]
aggregation: enable phase 2b = 1 [default]
aggregation: enable phase 3 = 1 [default]
Expand Down Expand Up @@ -123,17 +123,17 @@ filtered matrix: reuse eigenvalue = 1 [default]
lightweight wrap = 1 [default]

BuildAggregates (Phase - (Dirichlet))
BuildAggregatesSerial (Phase 1 (main))
BuildAggregatesRandom (Phase 1 (main))
BuildAggregatesRandom (Phase 2a (secondary))
BuildAggregatesRandom (Phase 2b (expansion))
BuildAggregatesRandom (Phase 3 (cleanup))
aggregation: max agg size = -1 [default]
aggregation: min agg size = 1 [unused]
aggregation: max selected neighbors = 0 [unused]
aggregation: ordering = natural [unused]
aggregation: enable phase 1 = 1 [default]
aggregation: phase 1 algorithm = Serial [default]
aggregation: deterministic = 0 [default]
aggregation: coloring algorithm = default [default]
aggregation: enable phase 1 = 1 [default]
aggregation: enable phase 2a = 1 [default]
aggregation: enable phase 2b = 1 [default]
aggregation: enable phase 3 = 1 [default]
Expand Down Expand Up @@ -211,17 +211,17 @@ filtered matrix: reuse eigenvalue = 1 [default]
lightweight wrap = 1 [default]

BuildAggregates (Phase - (Dirichlet))
BuildAggregatesSerial (Phase 1 (main))
BuildAggregatesRandom (Phase 1 (main))
BuildAggregatesRandom (Phase 2a (secondary))
BuildAggregatesRandom (Phase 2b (expansion))
BuildAggregatesRandom (Phase 3 (cleanup))
aggregation: max agg size = -1 [default]
aggregation: min agg size = 1 [unused]
aggregation: max selected neighbors = 0 [unused]
aggregation: ordering = natural [unused]
aggregation: enable phase 1 = 1 [default]
aggregation: phase 1 algorithm = Serial [default]
aggregation: deterministic = 0 [default]
aggregation: coloring algorithm = default [default]
aggregation: enable phase 1 = 1 [default]
aggregation: enable phase 2a = 1 [default]
aggregation: enable phase 2b = 1 [default]
aggregation: enable phase 3 = 1 [default]
Expand Down Expand Up @@ -299,17 +299,17 @@ filtered matrix: reuse eigenvalue = 1 [default]
lightweight wrap = 1 [default]

BuildAggregates (Phase - (Dirichlet))
BuildAggregatesSerial (Phase 1 (main))
BuildAggregatesRandom (Phase 1 (main))
BuildAggregatesRandom (Phase 2a (secondary))
BuildAggregatesRandom (Phase 2b (expansion))
BuildAggregatesRandom (Phase 3 (cleanup))
aggregation: max agg size = -1 [default]
aggregation: min agg size = 1 [unused]
aggregation: max selected neighbors = 0 [unused]
aggregation: ordering = natural [unused]
aggregation: enable phase 1 = 1 [default]
aggregation: phase 1 algorithm = Serial [default]
aggregation: deterministic = 0 [default]
aggregation: coloring algorithm = default [default]
aggregation: enable phase 1 = 1 [default]
aggregation: enable phase 2a = 1 [default]
aggregation: enable phase 2b = 1 [default]
aggregation: enable phase 3 = 1 [default]
Expand Down Expand Up @@ -387,17 +387,17 @@ filtered matrix: reuse eigenvalue = 1 [default]
lightweight wrap = 1 [default]

BuildAggregates (Phase - (Dirichlet))
BuildAggregatesSerial (Phase 1 (main))
BuildAggregatesRandom (Phase 1 (main))
BuildAggregatesRandom (Phase 2a (secondary))
BuildAggregatesRandom (Phase 2b (expansion))
BuildAggregatesRandom (Phase 3 (cleanup))
aggregation: max agg size = -1 [default]
aggregation: min agg size = 1 [unused]
aggregation: max selected neighbors = 0 [unused]
aggregation: ordering = natural [unused]
aggregation: enable phase 1 = 1 [default]
aggregation: phase 1 algorithm = Serial [default]
aggregation: deterministic = 0 [default]
aggregation: coloring algorithm = default [default]
aggregation: enable phase 1 = 1 [default]
aggregation: enable phase 2a = 1 [default]
aggregation: enable phase 2b = 1 [default]
aggregation: enable phase 3 = 1 [default]
Expand Down Expand Up @@ -460,19 +460,19 @@ level rows nnz nnz/row c ratio procs
0 9999 29995 3.00 1
1 3333 9997 3.00 3.00 1
2 1111 3331 3.00 3.00 1
3 371 1111 2.99 2.99 1
4 124 370 2.98 2.99 1
5 42 124 2.95 2.95 1
3 370 1108 2.99 3.00 1
4 122 364 2.98 3.03 1
5 33 97 2.94 3.70 1

Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995}

Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [3333, 3333], Global nnz: 9997}

Smoother (level 2) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [1111, 1111], Global nnz: 3331}

Smoother (level 3) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [371, 371], Global nnz: 1111}
Smoother (level 3) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [370, 370], Global nnz: 1108}

Smoother (level 4) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [124, 124], Global nnz: 370}
Smoother (level 4) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [122, 122], Global nnz: 364}

Smoother (level 5) pre : <Direct> solver interface
Smoother (level 5) post : no smoother
Expand Down
30 changes: 15 additions & 15 deletions packages/muelu/test/interface/kokkos-complex/Output/MLcoarse3_tpetra.gold
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ filtered matrix: reuse eigenvalue = 1 [default]
lightweight wrap = 1 [default]

BuildAggregates (Phase - (Dirichlet))
BuildAggregatesSerial (Phase 1 (main))
BuildAggregatesRandom (Phase 1 (main))
BuildAggregatesRandom (Phase 2a (secondary))
BuildAggregatesRandom (Phase 2b (expansion))
BuildAggregatesRandom (Phase 3 (cleanup))
aggregation: max agg size = -1 [default]
aggregation: min agg size = 1 [unused]
aggregation: max selected neighbors = 0 [unused]
aggregation: ordering = natural [unused]
aggregation: enable phase 1 = 1 [default]
aggregation: phase 1 algorithm = Serial [default]
aggregation: deterministic = 0 [default]
aggregation: coloring algorithm = default [default]
aggregation: enable phase 1 = 1 [default]
aggregation: enable phase 2a = 1 [default]
aggregation: enable phase 2b = 1 [default]
aggregation: enable phase 3 = 1 [default]
Expand Down Expand Up @@ -123,17 +123,17 @@ filtered matrix: reuse eigenvalue = 1 [default]
lightweight wrap = 1 [default]

BuildAggregates (Phase - (Dirichlet))
BuildAggregatesSerial (Phase 1 (main))
BuildAggregatesRandom (Phase 1 (main))
BuildAggregatesRandom (Phase 2a (secondary))
BuildAggregatesRandom (Phase 2b (expansion))
BuildAggregatesRandom (Phase 3 (cleanup))
aggregation: max agg size = -1 [default]
aggregation: min agg size = 1 [unused]
aggregation: max selected neighbors = 0 [unused]
aggregation: ordering = natural [unused]
aggregation: enable phase 1 = 1 [default]
aggregation: phase 1 algorithm = Serial [default]
aggregation: deterministic = 0 [default]
aggregation: coloring algorithm = default [default]
aggregation: enable phase 1 = 1 [default]
aggregation: enable phase 2a = 1 [default]
aggregation: enable phase 2b = 1 [default]
aggregation: enable phase 3 = 1 [default]
Expand Down Expand Up @@ -211,17 +211,17 @@ filtered matrix: reuse eigenvalue = 1 [default]
lightweight wrap = 1 [default]

BuildAggregates (Phase - (Dirichlet))
BuildAggregatesSerial (Phase 1 (main))
BuildAggregatesRandom (Phase 1 (main))
BuildAggregatesRandom (Phase 2a (secondary))
BuildAggregatesRandom (Phase 2b (expansion))
BuildAggregatesRandom (Phase 3 (cleanup))
aggregation: max agg size = -1 [default]
aggregation: min agg size = 1 [unused]
aggregation: max selected neighbors = 0 [unused]
aggregation: ordering = natural [unused]
aggregation: enable phase 1 = 1 [default]
aggregation: phase 1 algorithm = Serial [default]
aggregation: deterministic = 0 [default]
aggregation: coloring algorithm = default [default]
aggregation: enable phase 1 = 1 [default]
aggregation: enable phase 2a = 1 [default]
aggregation: enable phase 2b = 1 [default]
aggregation: enable phase 3 = 1 [default]
Expand Down Expand Up @@ -299,17 +299,17 @@ filtered matrix: reuse eigenvalue = 1 [default]
lightweight wrap = 1 [default]

BuildAggregates (Phase - (Dirichlet))
BuildAggregatesSerial (Phase 1 (main))
BuildAggregatesRandom (Phase 1 (main))
BuildAggregatesRandom (Phase 2a (secondary))
BuildAggregatesRandom (Phase 2b (expansion))
BuildAggregatesRandom (Phase 3 (cleanup))
aggregation: max agg size = -1 [default]
aggregation: min agg size = 1 [unused]
aggregation: max selected neighbors = 0 [unused]
aggregation: ordering = natural [unused]
aggregation: enable phase 1 = 1 [default]
aggregation: phase 1 algorithm = Serial [default]
aggregation: deterministic = 0 [default]
aggregation: coloring algorithm = default [default]
aggregation: enable phase 1 = 1 [default]
aggregation: enable phase 2a = 1 [default]
aggregation: enable phase 2b = 1 [default]
aggregation: enable phase 3 = 1 [default]
Expand Down Expand Up @@ -372,16 +372,16 @@ level rows nnz nnz/row c ratio procs
0 9999 29995 3.00 1
1 3333 9997 3.00 3.00 1
2 1111 3331 3.00 3.00 1
3 371 1111 2.99 2.99 1
4 124 370 2.98 2.99 1
3 370 1108 2.99 3.00 1
4 121 361 2.98 3.06 1

Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995}

Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [3333, 3333], Global nnz: 9997}

Smoother (level 2) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [1111, 1111], Global nnz: 3331}

Smoother (level 3) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [371, 371], Global nnz: 1111}
Smoother (level 3) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [370, 370], Global nnz: 1108}

Smoother (level 4) pre : <Direct> solver interface
Smoother (level 4) post : no smoother
Expand Down
12 changes: 6 additions & 6 deletions packages/muelu/test/interface/kokkos-complex/Output/MLcoarse5_tpetra.gold
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ filtered matrix: reuse eigenvalue = 1 [default]
lightweight wrap = 1 [default]

BuildAggregates (Phase - (Dirichlet))
BuildAggregatesSerial (Phase 1 (main))
BuildAggregatesRandom (Phase 1 (main))
BuildAggregatesRandom (Phase 2a (secondary))
BuildAggregatesRandom (Phase 2b (expansion))
BuildAggregatesRandom (Phase 3 (cleanup))
aggregation: max agg size = -1 [default]
aggregation: min agg size = 1 [unused]
aggregation: max selected neighbors = 0 [unused]
aggregation: ordering = natural [unused]
aggregation: enable phase 1 = 1 [default]
aggregation: phase 1 algorithm = Serial [default]
aggregation: deterministic = 0 [default]
aggregation: coloring algorithm = default [default]
aggregation: enable phase 1 = 1 [default]
aggregation: enable phase 2a = 1 [default]
aggregation: enable phase 2b = 1 [default]
aggregation: enable phase 3 = 1 [default]
Expand Down Expand Up @@ -123,17 +123,17 @@ filtered matrix: reuse eigenvalue = 1 [default]
lightweight wrap = 1 [default]

BuildAggregates (Phase - (Dirichlet))
BuildAggregatesSerial (Phase 1 (main))
BuildAggregatesRandom (Phase 1 (main))
BuildAggregatesRandom (Phase 2a (secondary))
BuildAggregatesRandom (Phase 2b (expansion))
BuildAggregatesRandom (Phase 3 (cleanup))
aggregation: max agg size = -1 [default]
aggregation: min agg size = 1 [unused]
aggregation: max selected neighbors = 0 [unused]
aggregation: ordering = natural [unused]
aggregation: enable phase 1 = 1 [default]
aggregation: phase 1 algorithm = Serial [default]
aggregation: deterministic = 0 [default]
aggregation: coloring algorithm = default [default]
aggregation: enable phase 1 = 1 [default]
aggregation: enable phase 2a = 1 [default]
aggregation: enable phase 2b = 1 [default]
aggregation: enable phase 3 = 1 [default]
Expand Down
Loading

0 comments on commit e3fcdc9

Please sign in to comment.