From 993df110a473526ff8f81c318a4c6033aabb21a8 Mon Sep 17 00:00:00 2001 From: Luc Berger-Vergiat Date: Wed, 20 Nov 2019 13:53:12 -0700 Subject: [PATCH] MueLu: gold file rebase and change of logic for issue #6269 This commits modifies ParameterListInterpeter to ignore non-deterministic output from the refactored uncoupled aggregation. --- .../interface/ParameterListInterpreter.cpp | 34 ++++++++++++++ .../Output/MLcoarse1_tpetra.gold | 20 ++++----- .../Output/MLcoarse2_tpetra.gold | 40 ++++++++--------- .../Output/MLcoarse3_tpetra.gold | 30 ++++++------- .../Output/MLcoarse5_tpetra.gold | 12 ++--- .../Output/MLpgamg1_tpetra.gold | 30 ++++++------- .../Output/MLsmoother1_tpetra.gold | 32 +++++++------- .../Output/MLsmoother2_tpetra.gold | 32 +++++++------- .../Output/MLsmoother3_tpetra.gold | 30 ++++++------- .../Output/MLsmoother4_tpetra.gold | 30 ++++++------- .../Output/MLunsmoothed1_tpetra.gold | 32 +++++++------- .../Output/aggregation1_tpetra.gold | 12 ++--- .../Output/aggregation3_tpetra.gold | 12 ++--- .../Output/aggregation4_tpetra.gold | 12 ++--- .../kokkos-complex/Output/coarse1_tpetra.gold | 20 ++++----- .../kokkos-complex/Output/coarse2_tpetra.gold | 40 ++++++++--------- .../kokkos-complex/Output/coarse3_tpetra.gold | 12 ++--- .../Output/default_e3d_tpetra.gold | 12 ++--- .../Output/default_mhd_np4_tpetra.gold | 12 ++--- .../Output/default_mhd_tpetra.gold | 12 ++--- .../Output/default_p2d_tpetra.gold | 12 ++--- .../Output/default_p3d_tpetra.gold | 12 ++--- .../Output/default_pg_np4_tpetra.gold | 14 +++--- .../Output/default_pg_tpetra.gold | 12 ++--- .../Output/driver_drekar1_np4_tpetra.gold | 12 ++--- .../Output/driver_drekar1_tpetra.gold | 20 ++++----- .../Output/driver_drekar2_np4_tpetra.gold | 12 ++--- .../Output/driver_drekar2_tpetra.gold | 20 ++++----- .../kokkos-complex/Output/emin1_tpetra.gold | 12 ++--- .../kokkos-complex/Output/emin2_tpetra.gold | 12 ++--- .../kokkos-complex/Output/emin3_tpetra.gold | 12 ++--- .../kokkos-complex/Output/empty_tpetra.gold | 12 ++--- .../Output/operator_solve_1_np1_tpetra.gold | 18 ++++---- .../Output/operator_solve_1_np4_tpetra.gold | 18 ++++---- .../Output/operator_solve_5_np1_tpetra.gold | 18 ++++---- .../Output/operator_solve_5_np4_tpetra.gold | 18 ++++---- .../Output/operator_solve_6_np1_tpetra.gold | 18 ++++---- .../Output/operator_solve_6_np4_tpetra.gold | 18 ++++---- .../Output/operator_solve_7_np1_tpetra.gold | 6 +-- .../Output/operator_solve_7_np4_tpetra.gold | 6 +-- .../kokkos-complex/Output/pg1_tpetra.gold | 12 ++--- .../kokkos-complex/Output/pg2_tpetra.gold | 12 ++--- .../Output/repartition1_np4_tpetra.gold | 14 +++--- .../Output/repartition1_tpetra.gold | 12 ++--- .../Output/repartition3_np4_tpetra.gold | 14 +++--- .../Output/repartition3_tpetra.gold | 12 ++--- .../Output/repartition4_np4_tpetra.gold | 14 +++--- .../Output/repartition4_tpetra.gold | 12 ++--- .../Output/reuse-RAP-1_np4_tpetra.gold | 16 +++---- .../Output/reuse-RAP-1_tpetra.gold | 12 ++--- .../Output/reuse-RAP-2_np4_tpetra.gold | 16 +++---- .../Output/reuse-RAP-2_tpetra.gold | 12 ++--- .../Output/reuse-RP-2_np4_tpetra.gold | 16 +++---- .../Output/reuse-RP-2_tpetra.gold | 12 ++--- .../Output/reuse-S-1_np4_tpetra.gold | 28 ++++++------ .../Output/reuse-S-1_tpetra.gold | 24 +++++----- .../Output/reuse-full-1_np4_tpetra.gold | 16 +++---- .../Output/reuse-full-1_tpetra.gold | 12 ++--- .../Output/reuse-none_np4_tpetra.gold | 28 ++++++------ .../Output/reuse-none_tpetra.gold | 24 +++++----- .../Output/reuse-tP-1_np4_tpetra.gold | 16 +++---- .../Output/reuse-tP-1_tpetra.gold | 12 ++--- .../Output/reuse-tP-2_np4_tpetra.gold | 22 +++++----- .../Output/reuse-tP-2_tpetra.gold | 18 ++++---- .../Output/reuse-tP-3_np4_tpetra.gold | 22 +++++----- .../Output/reuse-tP-3_tpetra.gold | 18 ++++---- .../Output/smoother10_tpetra.gold | 12 ++--- .../Output/smoother11_tpetra.gold | 12 ++--- .../Output/smoother12_tpetra.gold | 40 ++++++++--------- .../Output/smoother13_tpetra.gold | 12 ++--- .../Output/smoother1_tpetra.gold | 12 ++--- .../Output/smoother2_tpetra.gold | 12 ++--- .../Output/smoother3_tpetra.gold | 12 ++--- .../Output/smoother4_tpetra.gold | 12 ++--- .../Output/smoother5_tpetra.gold | 12 ++--- .../Output/smoother6_tpetra.gold | 12 ++--- .../Output/smoother9_tpetra.gold | 12 ++--- .../kokkos-complex/Output/sync1_tpetra.gold | 12 ++--- .../Output/transpose1_tpetra.gold | 12 ++--- .../Output/transpose2_np4_tpetra.gold | 14 +++--- .../Output/transpose2_tpetra.gold | 12 ++--- .../Output/transpose3_np4_tpetra.gold | 14 +++--- .../Output/transpose3_tpetra.gold | 12 ++--- .../Output/unsmoothed1_tpetra.gold | 12 ++--- .../interface/kokkos/Output/MLaux_tpetra.gold | 6 +-- .../kokkos/Output/MLcoarse1_tpetra.gold | 20 ++++----- .../kokkos/Output/MLcoarse2_tpetra.gold | 40 ++++++++--------- .../kokkos/Output/MLcoarse3_tpetra.gold | 30 ++++++------- .../kokkos/Output/MLcoarse4_tpetra.gold | 32 +++++++------- .../kokkos/Output/MLcoarse5_tpetra.gold | 12 ++--- .../kokkos/Output/MLpgamg1_tpetra.gold | 32 +++++++------- .../Output/MLrepartitioning1_tpetra.gold | 40 ++++++++--------- .../Output/MLrepartitioning2_tpetra.gold | 30 ++++++------- .../Output/MLrepartitioning3_tpetra.gold | 30 ++++++------- .../kokkos/Output/MLsmoother1_tpetra.gold | 30 ++++++------- .../kokkos/Output/MLsmoother2_tpetra.gold | 32 +++++++------- .../kokkos/Output/MLsmoother3_tpetra.gold | 30 ++++++------- .../kokkos/Output/MLsmoother4_tpetra.gold | 30 ++++++------- .../kokkos/Output/MLunsmoothed1_tpetra.gold | 32 +++++++------- .../kokkos/Output/aggregation1_tpetra.gold | 12 ++--- .../kokkos/Output/aggregation3_tpetra.gold | 12 ++--- .../kokkos/Output/aggregation4_tpetra.gold | 12 ++--- .../kokkos/Output/coarse1_tpetra.gold | 20 ++++----- .../kokkos/Output/coarse2_tpetra.gold | 40 ++++++++--------- .../kokkos/Output/coarse3_tpetra.gold | 12 ++--- .../kokkos/Output/default_e3d_tpetra.gold | 12 ++--- .../kokkos/Output/default_mhd_np4_tpetra.gold | 12 ++--- .../kokkos/Output/default_mhd_tpetra.gold | 12 ++--- .../kokkos/Output/default_p2d_tpetra.gold | 12 ++--- .../kokkos/Output/default_p3d_tpetra.gold | 12 ++--- .../kokkos/Output/default_pg_np4_tpetra.gold | 14 +++--- .../kokkos/Output/default_pg_tpetra.gold | 12 ++--- .../Output/driver_drekar1_np4_tpetra.gold | 12 ++--- .../kokkos/Output/driver_drekar1_tpetra.gold | 20 ++++----- .../Output/driver_drekar2_np4_tpetra.gold | 12 ++--- .../kokkos/Output/driver_drekar2_tpetra.gold | 20 ++++----- .../interface/kokkos/Output/emin1_tpetra.gold | 12 ++--- .../interface/kokkos/Output/emin2_tpetra.gold | 12 ++--- .../interface/kokkos/Output/emin3_tpetra.gold | 12 ++--- .../interface/kokkos/Output/empty_tpetra.gold | 12 ++--- .../Output/operator_solve_1_np1_tpetra.gold | 18 ++++---- .../Output/operator_solve_1_np4_tpetra.gold | 18 ++++---- .../Output/operator_solve_5_np1_tpetra.gold | 18 ++++---- .../Output/operator_solve_5_np4_tpetra.gold | 18 ++++---- .../Output/operator_solve_6_np1_tpetra.gold | 18 ++++---- .../Output/operator_solve_6_np4_tpetra.gold | 18 ++++---- .../Output/operator_solve_7_np1_tpetra.gold | 6 +-- .../Output/operator_solve_7_np4_tpetra.gold | 6 +-- .../interface/kokkos/Output/pg1_tpetra.gold | 12 ++--- .../interface/kokkos/Output/pg2_tpetra.gold | 12 ++--- .../Output/repartition1_np4_tpetra.gold | 14 +++--- .../kokkos/Output/repartition1_tpetra.gold | 12 ++--- .../Output/repartition3_np4_tpetra.gold | 14 +++--- .../kokkos/Output/repartition3_tpetra.gold | 12 ++--- .../Output/repartition4_np4_tpetra.gold | 14 +++--- .../kokkos/Output/repartition4_tpetra.gold | 12 ++--- .../kokkos/Output/reuse-RAP-1_np4_tpetra.gold | 16 +++---- .../kokkos/Output/reuse-RAP-1_tpetra.gold | 12 ++--- .../kokkos/Output/reuse-RAP-2_np4_tpetra.gold | 16 +++---- .../kokkos/Output/reuse-RAP-2_tpetra.gold | 12 ++--- .../kokkos/Output/reuse-RP-2_np4_tpetra.gold | 16 +++---- .../kokkos/Output/reuse-RP-2_tpetra.gold | 12 ++--- .../kokkos/Output/reuse-S-1_np4_tpetra.gold | 28 ++++++------ .../kokkos/Output/reuse-S-1_tpetra.gold | 24 +++++----- .../Output/reuse-full-1_np4_tpetra.gold | 16 +++---- .../kokkos/Output/reuse-full-1_tpetra.gold | 12 ++--- .../kokkos/Output/reuse-none_np4_tpetra.gold | 28 ++++++------ .../kokkos/Output/reuse-none_tpetra.gold | 24 +++++----- .../kokkos/Output/reuse-tP-1_np4_tpetra.gold | 16 +++---- .../kokkos/Output/reuse-tP-1_tpetra.gold | 12 ++--- .../kokkos/Output/reuse-tP-2_np4_tpetra.gold | 22 +++++----- .../kokkos/Output/reuse-tP-2_tpetra.gold | 18 ++++---- .../kokkos/Output/reuse-tP-3_np4_tpetra.gold | 22 +++++----- .../kokkos/Output/reuse-tP-3_tpetra.gold | 18 ++++---- .../kokkos/Output/smoother10_tpetra.gold | 12 ++--- .../kokkos/Output/smoother11_tpetra.gold | 12 ++--- .../kokkos/Output/smoother12_tpetra.gold | 44 +++++++++---------- .../kokkos/Output/smoother13_tpetra.gold | 12 ++--- .../kokkos/Output/smoother1_tpetra.gold | 12 ++--- .../kokkos/Output/smoother2_tpetra.gold | 12 ++--- .../kokkos/Output/smoother3_tpetra.gold | 12 ++--- .../kokkos/Output/smoother4_tpetra.gold | 12 ++--- .../kokkos/Output/smoother5_tpetra.gold | 12 ++--- .../kokkos/Output/smoother6_tpetra.gold | 12 ++--- .../kokkos/Output/smoother9_tpetra.gold | 12 ++--- .../interface/kokkos/Output/sync1_tpetra.gold | 12 ++--- .../kokkos/Output/transpose1_tpetra.gold | 12 ++--- .../kokkos/Output/transpose2_np4_tpetra.gold | 14 +++--- .../kokkos/Output/transpose2_tpetra.gold | 12 ++--- .../kokkos/Output/transpose3_np4_tpetra.gold | 14 +++--- .../kokkos/Output/transpose3_tpetra.gold | 12 ++--- .../kokkos/Output/unsmoothed1_tpetra.gold | 12 ++--- .../kokkos/Output/unsmoothed2_tpetra.gold | 12 ++--- 173 files changed, 1499 insertions(+), 1465 deletions(-) diff --git a/packages/muelu/test/interface/ParameterListInterpreter.cpp b/packages/muelu/test/interface/ParameterListInterpreter.cpp index bef2a65a91c9..e7ad61ba3ed8 100644 --- a/packages/muelu/test/interface/ParameterListInterpreter.cpp +++ b/packages/muelu/test/interface/ParameterListInterpreter.cpp @@ -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 = ""; + 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: , Global nnz: "; + run_sed("'s/" + stringToReplace + "/" + replacementString + "/'", baseFile); + + // Catch smoother complexity output from MueLu + stringToReplace = "Smoother complexity = " + floatRegex; + replacementString = "Smoother complexity = "; + 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()); diff --git a/packages/muelu/test/interface/kokkos-complex/Output/MLcoarse1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/MLcoarse1_tpetra.gold index c037455726e4..d9e99b51ee9c 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/MLcoarse1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/MLcoarse1_tpetra.gold @@ -38,7 +38,7 @@ 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)) @@ -46,9 +46,9 @@ 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] @@ -123,7 +123,7 @@ 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)) @@ -131,9 +131,9 @@ 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] @@ -211,7 +211,7 @@ 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)) @@ -219,9 +219,9 @@ 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] @@ -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} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/MLcoarse2_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/MLcoarse2_tpetra.gold index 115137ddb8b5..532c1d481476 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/MLcoarse2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/MLcoarse2_tpetra.gold @@ -38,7 +38,7 @@ 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)) @@ -46,9 +46,9 @@ 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] @@ -123,7 +123,7 @@ 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)) @@ -131,9 +131,9 @@ 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] @@ -211,7 +211,7 @@ 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)) @@ -219,9 +219,9 @@ 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] @@ -299,7 +299,7 @@ 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)) @@ -307,9 +307,9 @@ 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] @@ -387,7 +387,7 @@ 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)) @@ -395,9 +395,9 @@ 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] @@ -460,9 +460,9 @@ 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} @@ -470,9 +470,9 @@ Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: t 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 : solver interface Smoother (level 5) post : no smoother diff --git a/packages/muelu/test/interface/kokkos-complex/Output/MLcoarse3_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/MLcoarse3_tpetra.gold index 6af61d306953..a42e8c373282 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/MLcoarse3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/MLcoarse3_tpetra.gold @@ -38,7 +38,7 @@ 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)) @@ -46,9 +46,9 @@ 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] @@ -123,7 +123,7 @@ 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)) @@ -131,9 +131,9 @@ 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] @@ -211,7 +211,7 @@ 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)) @@ -219,9 +219,9 @@ 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] @@ -299,7 +299,7 @@ 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)) @@ -307,9 +307,9 @@ 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] @@ -372,8 +372,8 @@ 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} @@ -381,7 +381,7 @@ Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: t 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 : solver interface Smoother (level 4) post : no smoother diff --git a/packages/muelu/test/interface/kokkos-complex/Output/MLcoarse5_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/MLcoarse5_tpetra.gold index c1c745091a80..ac064077e172 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/MLcoarse5_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/MLcoarse5_tpetra.gold @@ -38,7 +38,7 @@ 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)) @@ -46,9 +46,9 @@ 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] @@ -123,7 +123,7 @@ 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)) @@ -131,9 +131,9 @@ 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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/MLpgamg1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/MLpgamg1_tpetra.gold index 74651a07c9c5..f229003b692b 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/MLpgamg1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/MLpgamg1_tpetra.gold @@ -38,7 +38,7 @@ 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)) @@ -46,9 +46,9 @@ 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] @@ -125,7 +125,7 @@ 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)) @@ -133,9 +133,9 @@ 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] @@ -215,7 +215,7 @@ 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)) @@ -223,9 +223,9 @@ 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] @@ -305,7 +305,7 @@ 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)) @@ -313,9 +313,9 @@ 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] @@ -380,8 +380,8 @@ 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} @@ -389,7 +389,7 @@ Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: t 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 : solver interface Smoother (level 4) post : no smoother diff --git a/packages/muelu/test/interface/kokkos-complex/Output/MLsmoother1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/MLsmoother1_tpetra.gold index 6af61d306953..ad4ace334ffd 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/MLsmoother1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/MLsmoother1_tpetra.gold @@ -38,7 +38,7 @@ 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)) @@ -46,9 +46,9 @@ 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] @@ -123,7 +123,7 @@ 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)) @@ -131,9 +131,9 @@ 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] @@ -211,7 +211,7 @@ 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)) @@ -219,9 +219,9 @@ 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] @@ -299,7 +299,7 @@ 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)) @@ -307,9 +307,9 @@ 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] @@ -365,15 +365,15 @@ smoother -> -------------------------------------------------------------------------------- Number of levels = 5 Operator complexity = 1.49 -Smoother complexity = 1.98 +Smoother complexity = 1.97 Cycle type = V 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 369 1105 2.99 3.01 1 + 4 121 361 2.98 3.05 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} @@ -381,7 +381,7 @@ Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: t 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: [369, 369], Global nnz: 1105} Smoother (level 4) pre : solver interface Smoother (level 4) post : no smoother diff --git a/packages/muelu/test/interface/kokkos-complex/Output/MLsmoother2_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/MLsmoother2_tpetra.gold index 41e987ce5462..88b3f755e15e 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/MLsmoother2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/MLsmoother2_tpetra.gold @@ -38,7 +38,7 @@ 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)) @@ -46,9 +46,9 @@ 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] @@ -123,7 +123,7 @@ 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)) @@ -131,9 +131,9 @@ 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] @@ -211,7 +211,7 @@ 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)) @@ -219,9 +219,9 @@ 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] @@ -299,7 +299,7 @@ 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)) @@ -307,9 +307,9 @@ 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] @@ -365,15 +365,15 @@ smoother -> -------------------------------------------------------------------------------- Number of levels = 5 Operator complexity = 1.49 -Smoother complexity = 1.98 +Smoother complexity = 1.97 Cycle type = V 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 369 1105 2.99 3.01 1 + 4 122 364 2.98 3.02 1 Smoother (level 0) pre : "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 0) post : no smoother @@ -384,7 +384,7 @@ Smoother (level 1) post : no smoother Smoother (level 2) pre : "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 2) post : no smoother -Smoother (level 3) pre : "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) pre : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [369, 369], Global nnz: 1105} Smoother (level 3) post : no smoother Smoother (level 4) pre : solver interface diff --git a/packages/muelu/test/interface/kokkos-complex/Output/MLsmoother3_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/MLsmoother3_tpetra.gold index 00313beff161..fb97d83f0653 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/MLsmoother3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/MLsmoother3_tpetra.gold @@ -38,7 +38,7 @@ 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)) @@ -46,9 +46,9 @@ 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] @@ -123,7 +123,7 @@ 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)) @@ -131,9 +131,9 @@ 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] @@ -211,7 +211,7 @@ 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)) @@ -219,9 +219,9 @@ 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] @@ -299,7 +299,7 @@ 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)) @@ -307,9 +307,9 @@ 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] @@ -372,8 +372,8 @@ 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 122 364 2.98 3.03 1 Smoother (level 0) pre : no smoother Smoother (level 0) post : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -385,7 +385,7 @@ Smoother (level 2) pre : no smoother Smoother (level 2) post : "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) pre : no smoother -Smoother (level 3) post : "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) post : "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 : solver interface Smoother (level 4) post : no smoother diff --git a/packages/muelu/test/interface/kokkos-complex/Output/MLsmoother4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/MLsmoother4_tpetra.gold index 6af61d306953..a42e8c373282 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/MLsmoother4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/MLsmoother4_tpetra.gold @@ -38,7 +38,7 @@ 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)) @@ -46,9 +46,9 @@ 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] @@ -123,7 +123,7 @@ 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)) @@ -131,9 +131,9 @@ 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] @@ -211,7 +211,7 @@ 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)) @@ -219,9 +219,9 @@ 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] @@ -299,7 +299,7 @@ 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)) @@ -307,9 +307,9 @@ 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] @@ -372,8 +372,8 @@ 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} @@ -381,7 +381,7 @@ Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: t 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 : solver interface Smoother (level 4) post : no smoother diff --git a/packages/muelu/test/interface/kokkos-complex/Output/MLunsmoothed1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/MLunsmoothed1_tpetra.gold index a45d21752139..4ab174f68039 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/MLunsmoothed1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/MLunsmoothed1_tpetra.gold @@ -37,7 +37,7 @@ 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)) @@ -45,9 +45,9 @@ 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] @@ -115,7 +115,7 @@ 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)) @@ -123,9 +123,9 @@ 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] @@ -196,7 +196,7 @@ 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)) @@ -204,9 +204,9 @@ 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] @@ -277,7 +277,7 @@ 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)) @@ -285,9 +285,9 @@ 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] @@ -337,15 +337,15 @@ smoother -> -------------------------------------------------------------------------------- Number of levels = 5 Operator complexity = 1.49 -Smoother complexity = 1.98 +Smoother complexity = 1.97 Cycle type = V 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 369 1105 2.99 3.01 1 + 4 121 361 2.98 3.05 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} @@ -353,7 +353,7 @@ Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: t 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: [369, 369], Global nnz: 1105} Smoother (level 4) pre : solver interface Smoother (level 4) post : no smoother diff --git a/packages/muelu/test/interface/kokkos-complex/Output/aggregation1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/aggregation1_tpetra.gold index 7700f42859d4..b9d85fd3a6d3 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/aggregation1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/aggregation1_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/aggregation3_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/aggregation3_tpetra.gold index e7d7e3ae372d..643b9c534dd0 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/aggregation3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/aggregation3_tpetra.gold @@ -38,7 +38,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -46,9 +46,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -126,7 +126,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -134,9 +134,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/aggregation4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/aggregation4_tpetra.gold index e0e4d75e7ce9..8be7515ab73f 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/aggregation4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/aggregation4_tpetra.gold @@ -38,7 +38,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -46,9 +46,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -133,7 +133,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -141,9 +141,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/coarse1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/coarse1_tpetra.gold index a66e27859835..80f9937f9bdc 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/coarse1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/coarse1_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -211,7 +211,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -219,9 +219,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -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: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/coarse2_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/coarse2_tpetra.gold index 9874e5ed86ca..f688b772016f 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/coarse2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/coarse2_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -211,7 +211,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -219,9 +219,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -298,7 +298,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -306,9 +306,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -385,7 +385,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -393,9 +393,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -449,9 +449,9 @@ 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 121 361 2.98 3.06 1 + 5 37 109 2.95 3.27 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -459,9 +459,9 @@ Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: t Smoother (level 2) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, 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: 1, 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: 1, 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: 1, 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: 1, damping factor: 1, Global matrix dimensions: [121, 121], Global nnz: 361} Smoother (level 5) pre : no smoother Smoother (level 5) post : no smoother diff --git a/packages/muelu/test/interface/kokkos-complex/Output/coarse3_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/coarse3_tpetra.gold index 71d82f923dfb..8bb840d62544 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/coarse3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/coarse3_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/default_e3d_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/default_e3d_tpetra.gold index 2d92b652f75c..d93cb33e94d2 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/default_e3d_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/default_e3d_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/default_mhd_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/default_mhd_np4_tpetra.gold index 015229a16a45..f6bc2eeb39a8 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/default_mhd_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/default_mhd_np4_tpetra.gold @@ -32,7 +32,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -40,9 +40,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -104,7 +104,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -112,9 +112,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/default_mhd_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/default_mhd_tpetra.gold index f8cdc51106ae..dd08ab2108a2 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/default_mhd_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/default_mhd_tpetra.gold @@ -32,7 +32,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -40,9 +40,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -104,7 +104,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -112,9 +112,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/default_p2d_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/default_p2d_tpetra.gold index 6204b99f1ac3..28bb77f5c0b2 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/default_p2d_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/default_p2d_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/default_p3d_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/default_p3d_tpetra.gold index 6204b99f1ac3..28bb77f5c0b2 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/default_p3d_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/default_p3d_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/default_pg_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/default_pg_np4_tpetra.gold index 554fbb625147..86c74183bb14 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/default_pg_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/default_pg_np4_tpetra.gold @@ -37,7 +37,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -126,7 +126,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -134,9 +134,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -200,7 +200,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 4 + 2 1112 3346 3.01 3.00 4 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/default_pg_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/default_pg_tpetra.gold index ea26983d8065..e10002f9f1bd 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/default_pg_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/default_pg_tpetra.gold @@ -37,7 +37,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -126,7 +126,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -134,9 +134,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/driver_drekar1_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/driver_drekar1_np4_tpetra.gold index 3326b8d06e1e..609b1ee9b258 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/driver_drekar1_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/driver_drekar1_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -149,14 +149,14 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 1 - 2 1111 3331 3.00 3.00 1 - 3 371 1111 2.99 2.99 1 + 2 1109 3325 3.00 3.01 1 + 3 368 1102 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} Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [3335, 3335], Global nnz: 10015} -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 2) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [1109, 1109], Global nnz: 3325} Smoother (level 3) pre : solver interface Smoother (level 3) post : no smoother diff --git a/packages/muelu/test/interface/kokkos-complex/Output/driver_drekar1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/driver_drekar1_tpetra.gold index df6bae674df6..6ec29339920c 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/driver_drekar1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/driver_drekar1_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -312,7 +312,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -320,9 +320,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -431,7 +431,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 370 1108 2.99 3.00 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} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/driver_drekar2_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/driver_drekar2_np4_tpetra.gold index 1b53e893a2b1..b7b77b5bc4d8 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/driver_drekar2_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/driver_drekar2_np4_tpetra.gold @@ -41,7 +41,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -49,9 +49,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -150,14 +150,14 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 1 - 2 1111 3331 3.00 3.00 1 - 3 371 1111 2.99 2.99 1 + 2 1109 3325 3.00 3.01 1 + 3 368 1102 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} Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [3335, 3335], Global nnz: 10015} -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 2) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [1109, 1109], Global nnz: 3325} Smoother (level 3) pre : solver interface Smoother (level 3) post : no smoother diff --git a/packages/muelu/test/interface/kokkos-complex/Output/driver_drekar2_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/driver_drekar2_tpetra.gold index 3473dfc0d8e2..5e4bba16bb4b 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/driver_drekar2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/driver_drekar2_tpetra.gold @@ -41,7 +41,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -49,9 +49,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -178,7 +178,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -186,9 +186,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -315,7 +315,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -323,9 +323,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -434,7 +434,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 370 1108 2.99 3.00 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} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/emin1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/emin1_tpetra.gold index 7ecbe43e9d94..048d3d5192db 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/emin1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/emin1_tpetra.gold @@ -37,7 +37,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -134,7 +134,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -142,9 +142,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/emin2_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/emin2_tpetra.gold index f6a2f53cbe57..76655260782f 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/emin2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/emin2_tpetra.gold @@ -37,7 +37,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -134,7 +134,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -142,9 +142,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/emin3_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/emin3_tpetra.gold index f25ed9c5a259..82f8b780e027 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/emin3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/emin3_tpetra.gold @@ -37,7 +37,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -134,7 +134,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -142,9 +142,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/empty_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/empty_tpetra.gold index 7700f42859d4..b9d85fd3a6d3 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/empty_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/empty_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_1_np1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_1_np1_tpetra.gold index 20f68cb9c4eb..ead294f87e9b 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_1_np1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_1_np1_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -211,7 +211,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -219,9 +219,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_1_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_1_np4_tpetra.gold index 06f7330fcd96..2d6b350c8fc0 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_1_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_1_np4_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -211,7 +211,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -219,9 +219,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_5_np1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_5_np1_tpetra.gold index d9a648f67204..934d6cd4ae65 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_5_np1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_5_np1_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -208,7 +208,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -216,9 +216,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_5_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_5_np4_tpetra.gold index 5afd6852a376..b638f7c8bec2 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_5_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_5_np4_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -208,7 +208,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -216,9 +216,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_6_np1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_6_np1_tpetra.gold index f19941336bb3..4da27c45ddc9 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_6_np1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_6_np1_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -208,7 +208,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -216,9 +216,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_6_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_6_np4_tpetra.gold index 3c8a3358fe1c..4ffd5cdc913b 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_6_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_6_np4_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -208,7 +208,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -216,9 +216,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_7_np1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_7_np1_tpetra.gold index b6f08d3f32da..d44340395aa0 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_7_np1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_7_np1_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_7_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_7_np4_tpetra.gold index 29d186b523cc..467a4d8d697e 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_7_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/operator_solve_7_np4_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/pg1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/pg1_tpetra.gold index 7c5e0f92e821..4d828d342bfa 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/pg1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/pg1_tpetra.gold @@ -37,7 +37,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -126,7 +126,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -134,9 +134,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/pg2_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/pg2_tpetra.gold index 7c5e0f92e821..4d828d342bfa 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/pg2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/pg2_tpetra.gold @@ -37,7 +37,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -126,7 +126,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -134,9 +134,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/repartition1_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/repartition1_np4_tpetra.gold index a6f249e8fb18..c47d32e1bddb 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/repartition1_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/repartition1_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -285,7 +285,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/repartition1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/repartition1_tpetra.gold index 6e69d83b769f..17cfd1bcbafe 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/repartition1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/repartition1_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/repartition3_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/repartition3_np4_tpetra.gold index 9b8a8497cdf3..90a86a6d6a7e 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/repartition3_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/repartition3_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -295,7 +295,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/repartition3_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/repartition3_tpetra.gold index 29a82dfd1e4b..45c1862fe800 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/repartition3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/repartition3_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/repartition4_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/repartition4_np4_tpetra.gold index 3609331a0a65..b721c2cdfc2e 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/repartition4_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/repartition4_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -294,7 +294,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 4 + 2 1112 3346 3.01 3.00 4 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/repartition4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/repartition4_tpetra.gold index 4e2a3e5f2eeb..cf5b1cca0c4f 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/repartition4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/repartition4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/reuse-RAP-1_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/reuse-RAP-1_np4_tpetra.gold index c222dc6194a4..11c2d72caa87 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/reuse-RAP-1_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/reuse-RAP-1_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -283,7 +283,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -327,7 +327,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/reuse-RAP-1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/reuse-RAP-1_tpetra.gold index b00b61c957da..12248d63ccf7 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/reuse-RAP-1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/reuse-RAP-1_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/reuse-RAP-2_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/reuse-RAP-2_np4_tpetra.gold index 2b055cebc0f7..f6b78985e5f9 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/reuse-RAP-2_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/reuse-RAP-2_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -162,7 +162,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -170,9 +170,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -257,7 +257,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -301,7 +301,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/reuse-RAP-2_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/reuse-RAP-2_tpetra.gold index 72a7e51744c1..6e533dde78b1 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/reuse-RAP-2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/reuse-RAP-2_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -162,7 +162,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -170,9 +170,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/reuse-RP-2_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/reuse-RP-2_np4_tpetra.gold index 7415d2ff7c60..f5028d31e11b 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/reuse-RP-2_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/reuse-RP-2_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -162,7 +162,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -170,9 +170,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -257,7 +257,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -387,7 +387,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/reuse-RP-2_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/reuse-RP-2_tpetra.gold index 7edab5dd70ea..316c9364a9f4 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/reuse-RP-2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/reuse-RP-2_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -162,7 +162,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -170,9 +170,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/reuse-S-1_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/reuse-S-1_np4_tpetra.gold index 8c94cc12bfcd..43f77b391179 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/reuse-S-1_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/reuse-S-1_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -283,7 +283,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -334,7 +334,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -342,9 +342,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -470,7 +470,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -478,9 +478,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -577,7 +577,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/reuse-S-1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/reuse-S-1_tpetra.gold index 2204622fbc8a..3f311ecc547f 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/reuse-S-1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/reuse-S-1_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -345,7 +345,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -353,9 +353,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -481,7 +481,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -489,9 +489,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/reuse-full-1_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/reuse-full-1_np4_tpetra.gold index 241fab28d4d9..a38c7562e850 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/reuse-full-1_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/reuse-full-1_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -283,7 +283,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -308,7 +308,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/reuse-full-1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/reuse-full-1_tpetra.gold index f8240f7d2b36..181c0b497fdb 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/reuse-full-1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/reuse-full-1_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/reuse-none_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/reuse-none_np4_tpetra.gold index 82c8b23e9dde..df103205fe27 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/reuse-none_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/reuse-none_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -285,7 +285,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -336,7 +336,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -344,9 +344,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -472,7 +472,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -480,9 +480,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -581,7 +581,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/reuse-none_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/reuse-none_tpetra.gold index 45b6800b8499..1a1e294c5d26 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/reuse-none_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/reuse-none_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -345,7 +345,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -353,9 +353,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -481,7 +481,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -489,9 +489,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-1_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-1_np4_tpetra.gold index 6710e7b44baf..ae89b3aba95e 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-1_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-1_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -285,7 +285,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -483,7 +483,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-1_tpetra.gold index b6463572088e..d46263a1986e 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-1_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-2_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-2_np4_tpetra.gold index c1217b433a5d..91af4fb9044e 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-2_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-2_np4_tpetra.gold @@ -41,7 +41,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -49,9 +49,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -178,7 +178,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -186,9 +186,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -287,7 +287,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -425,7 +425,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -433,9 +433,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -534,7 +534,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-2_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-2_tpetra.gold index d0a200744e69..948089d7e0c4 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-2_tpetra.gold @@ -41,7 +41,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -49,9 +49,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -178,7 +178,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -186,9 +186,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -434,7 +434,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -442,9 +442,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-3_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-3_np4_tpetra.gold index 8fd9b7d222a3..76078f5ddeec 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-3_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-3_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -285,7 +285,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -423,7 +423,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -431,9 +431,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -532,7 +532,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-3_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-3_tpetra.gold index 6998c0daaec1..01c4db11e1dc 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/reuse-tP-3_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -432,7 +432,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -440,9 +440,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/smoother10_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/smoother10_tpetra.gold index 7ecaf32b845e..358824b63971 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/smoother10_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/smoother10_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/smoother11_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/smoother11_tpetra.gold index 4a348d927e22..214f41489c2a 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/smoother11_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/smoother11_tpetra.gold @@ -56,7 +56,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -64,9 +64,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -162,7 +162,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -170,9 +170,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/smoother12_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/smoother12_tpetra.gold index c4bf69926823..a040f223d695 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/smoother12_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/smoother12_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -211,7 +211,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -219,9 +219,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -298,7 +298,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -306,9 +306,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -385,7 +385,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -393,9 +393,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -458,9 +458,9 @@ 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 369 1105 2.99 3.01 1 + 4 120 358 2.98 3.08 1 + 5 36 106 2.94 3.33 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -468,9 +468,9 @@ Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: t Smoother (level 2) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, 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: 1, 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: 1, damping factor: 1, Global matrix dimensions: [369, 369], Global nnz: 1105} -Smoother (level 4) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, 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: 1, damping factor: 1, Global matrix dimensions: [120, 120], Global nnz: 358} Smoother (level 5) pre : solver interface Smoother (level 5) post : no smoother diff --git a/packages/muelu/test/interface/kokkos-complex/Output/smoother13_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/smoother13_tpetra.gold index 1f9fdb5f7635..4d0f95a31dea 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/smoother13_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/smoother13_tpetra.gold @@ -44,7 +44,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -52,9 +52,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -138,7 +138,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -146,9 +146,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/smoother1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/smoother1_tpetra.gold index 7700f42859d4..b9d85fd3a6d3 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/smoother1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/smoother1_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/smoother2_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/smoother2_tpetra.gold index 51caf4695c24..a67cab4ffbd6 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/smoother2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/smoother2_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/smoother3_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/smoother3_tpetra.gold index dd796fbdabad..8f3a7b0636bd 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/smoother3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/smoother3_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/smoother4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/smoother4_tpetra.gold index f5f426f6b623..4510989a7c73 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/smoother4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/smoother4_tpetra.gold @@ -18,7 +18,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -26,9 +26,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -86,7 +86,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -94,9 +94,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/smoother5_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/smoother5_tpetra.gold index 6204b99f1ac3..28bb77f5c0b2 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/smoother5_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/smoother5_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/smoother6_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/smoother6_tpetra.gold index 404a13da5738..ed140afb5165 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/smoother6_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/smoother6_tpetra.gold @@ -25,7 +25,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -33,9 +33,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -100,7 +100,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -108,9 +108,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/smoother9_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/smoother9_tpetra.gold index e10499df589a..b75c38a5ec7f 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/smoother9_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/smoother9_tpetra.gold @@ -44,7 +44,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -52,9 +52,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -138,7 +138,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -146,9 +146,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/sync1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/sync1_tpetra.gold index 7700f42859d4..b9d85fd3a6d3 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/sync1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/sync1_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/transpose1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/transpose1_tpetra.gold index 99b828f36504..3e957f860475 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/transpose1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/transpose1_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -120,7 +120,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -128,9 +128,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/transpose2_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/transpose2_np4_tpetra.gold index 7842282871db..947ecd9d84a1 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/transpose2_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/transpose2_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -162,7 +162,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -170,9 +170,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -257,7 +257,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/transpose2_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/transpose2_tpetra.gold index bc8b2deac930..5cc73d12dacb 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/transpose2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/transpose2_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -162,7 +162,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -170,9 +170,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/transpose3_np4_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/transpose3_np4_tpetra.gold index 0ea82721bb82..9c7d93557886 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/transpose3_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/transpose3_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -162,7 +162,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -170,9 +170,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -257,7 +257,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos-complex/Output/transpose3_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/transpose3_tpetra.gold index 7fb87ce3b349..2be8ce9b15b3 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/transpose3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/transpose3_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -162,7 +162,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -170,9 +170,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos-complex/Output/unsmoothed1_tpetra.gold b/packages/muelu/test/interface/kokkos-complex/Output/unsmoothed1_tpetra.gold index 6f9ce8a6a4a8..3e504ae003a4 100644 --- a/packages/muelu/test/interface/kokkos-complex/Output/unsmoothed1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos-complex/Output/unsmoothed1_tpetra.gold @@ -36,7 +36,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -44,9 +44,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -116,7 +116,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -124,9 +124,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/MLaux_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLaux_tpetra.gold index 33d90f2c343b..4c1814c05d3b 100644 --- a/packages/muelu/test/interface/kokkos/Output/MLaux_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/MLaux_tpetra.gold @@ -42,7 +42,7 @@ 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)) @@ -50,9 +50,9 @@ 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] diff --git a/packages/muelu/test/interface/kokkos/Output/MLcoarse1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLcoarse1_tpetra.gold index c037455726e4..d9e99b51ee9c 100644 --- a/packages/muelu/test/interface/kokkos/Output/MLcoarse1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/MLcoarse1_tpetra.gold @@ -38,7 +38,7 @@ 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)) @@ -46,9 +46,9 @@ 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] @@ -123,7 +123,7 @@ 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)) @@ -131,9 +131,9 @@ 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] @@ -211,7 +211,7 @@ 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)) @@ -219,9 +219,9 @@ 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] @@ -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} diff --git a/packages/muelu/test/interface/kokkos/Output/MLcoarse2_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLcoarse2_tpetra.gold index 115137ddb8b5..9ebb5aa87d8b 100644 --- a/packages/muelu/test/interface/kokkos/Output/MLcoarse2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/MLcoarse2_tpetra.gold @@ -38,7 +38,7 @@ 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)) @@ -46,9 +46,9 @@ 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] @@ -123,7 +123,7 @@ 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)) @@ -131,9 +131,9 @@ 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] @@ -211,7 +211,7 @@ 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)) @@ -219,9 +219,9 @@ 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] @@ -299,7 +299,7 @@ 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)) @@ -307,9 +307,9 @@ 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] @@ -387,7 +387,7 @@ 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)) @@ -395,9 +395,9 @@ 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] @@ -460,9 +460,9 @@ 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 121 361 2.98 3.06 1 + 5 36 106 2.94 3.36 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} @@ -470,9 +470,9 @@ Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: t 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: [121, 121], Global nnz: 361} Smoother (level 5) pre : solver interface Smoother (level 5) post : no smoother diff --git a/packages/muelu/test/interface/kokkos/Output/MLcoarse3_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLcoarse3_tpetra.gold index 6af61d306953..a42e8c373282 100644 --- a/packages/muelu/test/interface/kokkos/Output/MLcoarse3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/MLcoarse3_tpetra.gold @@ -38,7 +38,7 @@ 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)) @@ -46,9 +46,9 @@ 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] @@ -123,7 +123,7 @@ 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)) @@ -131,9 +131,9 @@ 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] @@ -211,7 +211,7 @@ 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)) @@ -219,9 +219,9 @@ 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] @@ -299,7 +299,7 @@ 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)) @@ -307,9 +307,9 @@ 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] @@ -372,8 +372,8 @@ 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} @@ -381,7 +381,7 @@ Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: t 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 : solver interface Smoother (level 4) post : no smoother diff --git a/packages/muelu/test/interface/kokkos/Output/MLcoarse4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLcoarse4_tpetra.gold index e26d42462ca4..1a358aec2970 100644 --- a/packages/muelu/test/interface/kokkos/Output/MLcoarse4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/MLcoarse4_tpetra.gold @@ -38,7 +38,7 @@ 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)) @@ -46,9 +46,9 @@ 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] @@ -123,7 +123,7 @@ 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)) @@ -131,9 +131,9 @@ 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] @@ -211,7 +211,7 @@ 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)) @@ -219,9 +219,9 @@ 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] @@ -299,7 +299,7 @@ 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)) @@ -307,9 +307,9 @@ 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] @@ -383,8 +383,8 @@ 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 369 1105 2.99 3.01 1 + 4 120 358 2.98 3.08 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} @@ -392,8 +392,8 @@ Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: t 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: [369, 369], Global nnz: 1105} -Smoother (level 4) pre : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Gauss-Seidel, sweeps: 25, damping factor: 0.6, Global matrix dimensions: [124, 124], Global nnz: 370} +Smoother (level 4) pre : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Gauss-Seidel, sweeps: 25, damping factor: 0.6, Global matrix dimensions: [120, 120], Global nnz: 358} Smoother (level 4) post : no smoother diff --git a/packages/muelu/test/interface/kokkos/Output/MLcoarse5_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLcoarse5_tpetra.gold index c1c745091a80..ac064077e172 100644 --- a/packages/muelu/test/interface/kokkos/Output/MLcoarse5_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/MLcoarse5_tpetra.gold @@ -38,7 +38,7 @@ 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)) @@ -46,9 +46,9 @@ 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] @@ -123,7 +123,7 @@ 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)) @@ -131,9 +131,9 @@ 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] diff --git a/packages/muelu/test/interface/kokkos/Output/MLpgamg1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLpgamg1_tpetra.gold index 74651a07c9c5..9f7ffaf456e5 100644 --- a/packages/muelu/test/interface/kokkos/Output/MLpgamg1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/MLpgamg1_tpetra.gold @@ -38,7 +38,7 @@ 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)) @@ -46,9 +46,9 @@ 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] @@ -125,7 +125,7 @@ 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)) @@ -133,9 +133,9 @@ 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] @@ -215,7 +215,7 @@ 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)) @@ -223,9 +223,9 @@ 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] @@ -305,7 +305,7 @@ 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)) @@ -313,9 +313,9 @@ 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] @@ -373,15 +373,15 @@ smoother -> -------------------------------------------------------------------------------- Number of levels = 5 Operator complexity = 1.49 -Smoother complexity = 1.98 +Smoother complexity = 1.97 Cycle type = V 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 369 1105 2.99 3.01 1 + 4 122 364 2.98 3.02 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} @@ -389,7 +389,7 @@ Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: t 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: [369, 369], Global nnz: 1105} Smoother (level 4) pre : solver interface Smoother (level 4) post : no smoother diff --git a/packages/muelu/test/interface/kokkos/Output/MLrepartitioning1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLrepartitioning1_tpetra.gold index c1fecf97bb22..fb269173061c 100644 --- a/packages/muelu/test/interface/kokkos/Output/MLrepartitioning1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/MLrepartitioning1_tpetra.gold @@ -41,7 +41,7 @@ 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)) @@ -49,9 +49,9 @@ 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] @@ -174,7 +174,7 @@ 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)) @@ -182,9 +182,9 @@ 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] @@ -307,7 +307,7 @@ 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)) @@ -315,9 +315,9 @@ 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] @@ -440,7 +440,7 @@ 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)) @@ -448,9 +448,9 @@ 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] @@ -573,7 +573,7 @@ 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)) @@ -581,9 +581,9 @@ 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] @@ -688,9 +688,9 @@ 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 369 1105 2.99 3.01 1 + 4 121 361 2.98 3.05 1 + 5 36 106 2.94 3.36 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} @@ -698,9 +698,9 @@ Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: t 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: [369, 369], Global nnz: 1105} -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: [121, 121], Global nnz: 361} Smoother (level 5) pre : solver interface Smoother (level 5) post : no smoother diff --git a/packages/muelu/test/interface/kokkos/Output/MLrepartitioning2_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLrepartitioning2_tpetra.gold index d7e80585d1e8..f15d24f35f25 100644 --- a/packages/muelu/test/interface/kokkos/Output/MLrepartitioning2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/MLrepartitioning2_tpetra.gold @@ -41,7 +41,7 @@ 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)) @@ -49,9 +49,9 @@ 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] @@ -174,7 +174,7 @@ 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)) @@ -182,9 +182,9 @@ 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] @@ -307,7 +307,7 @@ 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)) @@ -315,9 +315,9 @@ 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] @@ -440,7 +440,7 @@ 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)) @@ -448,9 +448,9 @@ 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] @@ -554,8 +554,8 @@ 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} @@ -563,7 +563,7 @@ Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: t 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 : solver interface Smoother (level 4) post : no smoother diff --git a/packages/muelu/test/interface/kokkos/Output/MLrepartitioning3_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLrepartitioning3_tpetra.gold index 9488d95bd685..92a2015e069f 100644 --- a/packages/muelu/test/interface/kokkos/Output/MLrepartitioning3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/MLrepartitioning3_tpetra.gold @@ -41,7 +41,7 @@ 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)) @@ -49,9 +49,9 @@ 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] @@ -174,7 +174,7 @@ 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)) @@ -182,9 +182,9 @@ 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] @@ -307,7 +307,7 @@ 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)) @@ -315,9 +315,9 @@ 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] @@ -440,7 +440,7 @@ 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)) @@ -448,9 +448,9 @@ 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] @@ -554,8 +554,8 @@ 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 122 364 2.98 3.03 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} @@ -563,7 +563,7 @@ Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: t 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 : solver interface Smoother (level 4) post : no smoother diff --git a/packages/muelu/test/interface/kokkos/Output/MLsmoother1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLsmoother1_tpetra.gold index 6af61d306953..482b48594809 100644 --- a/packages/muelu/test/interface/kokkos/Output/MLsmoother1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/MLsmoother1_tpetra.gold @@ -38,7 +38,7 @@ 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)) @@ -46,9 +46,9 @@ 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] @@ -123,7 +123,7 @@ 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)) @@ -131,9 +131,9 @@ 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] @@ -211,7 +211,7 @@ 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)) @@ -219,9 +219,9 @@ 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] @@ -299,7 +299,7 @@ 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)) @@ -307,9 +307,9 @@ 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] @@ -372,8 +372,8 @@ 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 122 364 2.98 3.03 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} @@ -381,7 +381,7 @@ Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: t 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 : solver interface Smoother (level 4) post : no smoother diff --git a/packages/muelu/test/interface/kokkos/Output/MLsmoother2_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLsmoother2_tpetra.gold index 41e987ce5462..9cf2b7d3974c 100644 --- a/packages/muelu/test/interface/kokkos/Output/MLsmoother2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/MLsmoother2_tpetra.gold @@ -38,7 +38,7 @@ 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)) @@ -46,9 +46,9 @@ 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] @@ -123,7 +123,7 @@ 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)) @@ -131,9 +131,9 @@ 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] @@ -211,7 +211,7 @@ 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)) @@ -219,9 +219,9 @@ 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] @@ -299,7 +299,7 @@ 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)) @@ -307,9 +307,9 @@ 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] @@ -365,15 +365,15 @@ smoother -> -------------------------------------------------------------------------------- Number of levels = 5 Operator complexity = 1.49 -Smoother complexity = 1.98 +Smoother complexity = 1.97 Cycle type = V 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 369 1105 2.99 3.01 1 + 4 121 361 2.98 3.05 1 Smoother (level 0) pre : "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 0) post : no smoother @@ -384,7 +384,7 @@ Smoother (level 1) post : no smoother Smoother (level 2) pre : "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 2) post : no smoother -Smoother (level 3) pre : "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) pre : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [369, 369], Global nnz: 1105} Smoother (level 3) post : no smoother Smoother (level 4) pre : solver interface diff --git a/packages/muelu/test/interface/kokkos/Output/MLsmoother3_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLsmoother3_tpetra.gold index 00313beff161..6fe698989d3f 100644 --- a/packages/muelu/test/interface/kokkos/Output/MLsmoother3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/MLsmoother3_tpetra.gold @@ -38,7 +38,7 @@ 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)) @@ -46,9 +46,9 @@ 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] @@ -123,7 +123,7 @@ 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)) @@ -131,9 +131,9 @@ 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] @@ -211,7 +211,7 @@ 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)) @@ -219,9 +219,9 @@ 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] @@ -299,7 +299,7 @@ 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)) @@ -307,9 +307,9 @@ 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] @@ -372,8 +372,8 @@ 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 369 1105 2.99 3.01 1 + 4 122 364 2.98 3.02 1 Smoother (level 0) pre : no smoother Smoother (level 0) post : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -385,7 +385,7 @@ Smoother (level 2) pre : no smoother Smoother (level 2) post : "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) pre : no smoother -Smoother (level 3) post : "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) post : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 2, damping factor: 1, Global matrix dimensions: [369, 369], Global nnz: 1105} Smoother (level 4) pre : solver interface Smoother (level 4) post : no smoother diff --git a/packages/muelu/test/interface/kokkos/Output/MLsmoother4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLsmoother4_tpetra.gold index 6a49d9c8c304..be63c5c14118 100644 --- a/packages/muelu/test/interface/kokkos/Output/MLsmoother4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/MLsmoother4_tpetra.gold @@ -32,7 +32,7 @@ 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)) @@ -40,9 +40,9 @@ 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] @@ -111,7 +111,7 @@ 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)) @@ -119,9 +119,9 @@ 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] @@ -193,7 +193,7 @@ 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)) @@ -201,9 +201,9 @@ 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] @@ -275,7 +275,7 @@ 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)) @@ -283,9 +283,9 @@ 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] @@ -348,8 +348,8 @@ 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 122 364 2.98 3.03 1 Smoother (level 0) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 2, lambdaMax = , alpha: 20, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -357,7 +357,7 @@ Smoother (level 1) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: tr Smoother (level 2) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 2, lambdaMax = , alpha: 20, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [1111, 1111], Global nnz: 3331} -Smoother (level 3) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 2, lambdaMax = , alpha: 20, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [371, 371], Global nnz: 1111} +Smoother (level 3) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 2, lambdaMax = , alpha: 20, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [370, 370], Global nnz: 1108} Smoother (level 4) pre : solver interface Smoother (level 4) post : no smoother diff --git a/packages/muelu/test/interface/kokkos/Output/MLunsmoothed1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLunsmoothed1_tpetra.gold index a45d21752139..6ae0d8bad28b 100644 --- a/packages/muelu/test/interface/kokkos/Output/MLunsmoothed1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/MLunsmoothed1_tpetra.gold @@ -37,7 +37,7 @@ 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)) @@ -45,9 +45,9 @@ 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] @@ -115,7 +115,7 @@ 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)) @@ -123,9 +123,9 @@ 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] @@ -196,7 +196,7 @@ 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)) @@ -204,9 +204,9 @@ 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] @@ -277,7 +277,7 @@ 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)) @@ -285,9 +285,9 @@ 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] @@ -337,15 +337,15 @@ smoother -> -------------------------------------------------------------------------------- Number of levels = 5 Operator complexity = 1.49 -Smoother complexity = 1.98 +Smoother complexity = 1.97 Cycle type = V 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 369 1105 2.99 3.01 1 + 4 120 358 2.98 3.08 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} @@ -353,7 +353,7 @@ Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: t 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: [369, 369], Global nnz: 1105} Smoother (level 4) pre : solver interface Smoother (level 4) post : no smoother diff --git a/packages/muelu/test/interface/kokkos/Output/aggregation1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/aggregation1_tpetra.gold index 7700f42859d4..b9d85fd3a6d3 100644 --- a/packages/muelu/test/interface/kokkos/Output/aggregation1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/aggregation1_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/aggregation3_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/aggregation3_tpetra.gold index e7d7e3ae372d..643b9c534dd0 100644 --- a/packages/muelu/test/interface/kokkos/Output/aggregation3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/aggregation3_tpetra.gold @@ -38,7 +38,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -46,9 +46,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -126,7 +126,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -134,9 +134,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/aggregation4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/aggregation4_tpetra.gold index e0e4d75e7ce9..8be7515ab73f 100644 --- a/packages/muelu/test/interface/kokkos/Output/aggregation4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/aggregation4_tpetra.gold @@ -38,7 +38,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -46,9 +46,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -133,7 +133,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -141,9 +141,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/coarse1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/coarse1_tpetra.gold index a66e27859835..80f9937f9bdc 100644 --- a/packages/muelu/test/interface/kokkos/Output/coarse1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/coarse1_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -211,7 +211,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -219,9 +219,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -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: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos/Output/coarse2_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/coarse2_tpetra.gold index 9874e5ed86ca..31d5096120f3 100644 --- a/packages/muelu/test/interface/kokkos/Output/coarse2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/coarse2_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -211,7 +211,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -219,9 +219,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -298,7 +298,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -306,9 +306,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -385,7 +385,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -393,9 +393,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -449,9 +449,9 @@ 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 369 1105 2.99 3.01 1 + 4 122 364 2.98 3.02 1 + 5 34 100 2.94 3.59 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -459,9 +459,9 @@ Smoother (level 1) both : "Ifpack2::Relaxation": {Initialized: true, Computed: t Smoother (level 2) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, 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: 1, 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: 1, damping factor: 1, Global matrix dimensions: [369, 369], Global nnz: 1105} -Smoother (level 4) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, 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: 1, damping factor: 1, Global matrix dimensions: [122, 122], Global nnz: 364} Smoother (level 5) pre : no smoother Smoother (level 5) post : no smoother diff --git a/packages/muelu/test/interface/kokkos/Output/coarse3_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/coarse3_tpetra.gold index 71d82f923dfb..8bb840d62544 100644 --- a/packages/muelu/test/interface/kokkos/Output/coarse3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/coarse3_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/default_e3d_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/default_e3d_tpetra.gold index da58a771b266..5ba32285575f 100644 --- a/packages/muelu/test/interface/kokkos/Output/default_e3d_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/default_e3d_tpetra.gold @@ -31,7 +31,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -39,9 +39,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -112,7 +112,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -120,9 +120,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/default_mhd_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/default_mhd_np4_tpetra.gold index 015229a16a45..f6bc2eeb39a8 100644 --- a/packages/muelu/test/interface/kokkos/Output/default_mhd_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/default_mhd_np4_tpetra.gold @@ -32,7 +32,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -40,9 +40,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -104,7 +104,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -112,9 +112,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/default_mhd_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/default_mhd_tpetra.gold index f8cdc51106ae..dd08ab2108a2 100644 --- a/packages/muelu/test/interface/kokkos/Output/default_mhd_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/default_mhd_tpetra.gold @@ -32,7 +32,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -40,9 +40,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -104,7 +104,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -112,9 +112,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/default_p2d_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/default_p2d_tpetra.gold index bb5f7dbd8955..54243a9e8e6a 100644 --- a/packages/muelu/test/interface/kokkos/Output/default_p2d_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/default_p2d_tpetra.gold @@ -31,7 +31,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -39,9 +39,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -112,7 +112,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -120,9 +120,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/default_p3d_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/default_p3d_tpetra.gold index bb5f7dbd8955..54243a9e8e6a 100644 --- a/packages/muelu/test/interface/kokkos/Output/default_p3d_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/default_p3d_tpetra.gold @@ -31,7 +31,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -39,9 +39,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -112,7 +112,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -120,9 +120,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/default_pg_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/default_pg_np4_tpetra.gold index 554fbb625147..86c74183bb14 100644 --- a/packages/muelu/test/interface/kokkos/Output/default_pg_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/default_pg_np4_tpetra.gold @@ -37,7 +37,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -126,7 +126,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -134,9 +134,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -200,7 +200,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 4 + 2 1112 3346 3.01 3.00 4 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos/Output/default_pg_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/default_pg_tpetra.gold index ea26983d8065..e10002f9f1bd 100644 --- a/packages/muelu/test/interface/kokkos/Output/default_pg_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/default_pg_tpetra.gold @@ -37,7 +37,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -126,7 +126,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -134,9 +134,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/driver_drekar1_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/driver_drekar1_np4_tpetra.gold index b5c80726b2b3..ec479f34e954 100644 --- a/packages/muelu/test/interface/kokkos/Output/driver_drekar1_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/driver_drekar1_np4_tpetra.gold @@ -35,7 +35,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -43,9 +43,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -144,14 +144,14 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 1 - 2 1111 3331 3.00 3.00 1 - 3 371 1111 2.99 2.99 1 + 2 1109 3325 3.00 3.01 1 + 3 368 1102 2.99 3.01 1 Smoother (level 0) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 2, lambdaMax = , alpha: 20, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [9999, 9999], Global nnz: 29995} Smoother (level 1) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 2, lambdaMax = , alpha: 20, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [3335, 3335], Global nnz: 10015} -Smoother (level 2) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 2, lambdaMax = , alpha: 20, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [1111, 1111], Global nnz: 3331} +Smoother (level 2) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 2, lambdaMax = , alpha: 20, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [1109, 1109], Global nnz: 3325} Smoother (level 3) pre : solver interface Smoother (level 3) post : no smoother diff --git a/packages/muelu/test/interface/kokkos/Output/driver_drekar1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/driver_drekar1_tpetra.gold index 7aed5fefa3ef..e79ebedf6e99 100644 --- a/packages/muelu/test/interface/kokkos/Output/driver_drekar1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/driver_drekar1_tpetra.gold @@ -35,7 +35,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -43,9 +43,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -166,7 +166,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -174,9 +174,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -297,7 +297,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -305,9 +305,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -416,7 +416,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 370 1108 2.99 3.00 1 Smoother (level 0) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 2, lambdaMax = , alpha: 20, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos/Output/driver_drekar2_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/driver_drekar2_np4_tpetra.gold index 49d10118c2df..4b80fc5b195f 100644 --- a/packages/muelu/test/interface/kokkos/Output/driver_drekar2_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/driver_drekar2_np4_tpetra.gold @@ -36,7 +36,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -44,9 +44,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -145,14 +145,14 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 1 - 2 1111 3331 3.00 3.00 1 - 3 371 1111 2.99 2.99 1 + 2 1109 3325 3.00 3.01 1 + 3 369 1105 2.99 3.01 1 Smoother (level 0) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 2, lambdaMax = , alpha: 20, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [9999, 9999], Global nnz: 29995} Smoother (level 1) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 2, lambdaMax = , alpha: 20, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [3335, 3335], Global nnz: 10015} -Smoother (level 2) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 2, lambdaMax = , alpha: 20, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [1111, 1111], Global nnz: 3331} +Smoother (level 2) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 2, lambdaMax = , alpha: 20, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [1109, 1109], Global nnz: 3325} Smoother (level 3) pre : solver interface Smoother (level 3) post : no smoother diff --git a/packages/muelu/test/interface/kokkos/Output/driver_drekar2_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/driver_drekar2_tpetra.gold index c741a3ffa16d..19755b316756 100644 --- a/packages/muelu/test/interface/kokkos/Output/driver_drekar2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/driver_drekar2_tpetra.gold @@ -36,7 +36,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -44,9 +44,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -168,7 +168,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -176,9 +176,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -300,7 +300,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -308,9 +308,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -419,7 +419,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 370 1108 2.99 3.00 1 Smoother (level 0) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 2, lambdaMax = , alpha: 20, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos/Output/emin1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/emin1_tpetra.gold index 7ecbe43e9d94..048d3d5192db 100644 --- a/packages/muelu/test/interface/kokkos/Output/emin1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/emin1_tpetra.gold @@ -37,7 +37,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -134,7 +134,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -142,9 +142,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/emin2_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/emin2_tpetra.gold index f6a2f53cbe57..76655260782f 100644 --- a/packages/muelu/test/interface/kokkos/Output/emin2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/emin2_tpetra.gold @@ -37,7 +37,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -134,7 +134,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -142,9 +142,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/emin3_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/emin3_tpetra.gold index f25ed9c5a259..82f8b780e027 100644 --- a/packages/muelu/test/interface/kokkos/Output/emin3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/emin3_tpetra.gold @@ -37,7 +37,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -134,7 +134,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -142,9 +142,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/empty_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/empty_tpetra.gold index 7700f42859d4..b9d85fd3a6d3 100644 --- a/packages/muelu/test/interface/kokkos/Output/empty_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/empty_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/operator_solve_1_np1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/operator_solve_1_np1_tpetra.gold index 20f68cb9c4eb..ead294f87e9b 100644 --- a/packages/muelu/test/interface/kokkos/Output/operator_solve_1_np1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/operator_solve_1_np1_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -211,7 +211,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -219,9 +219,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] diff --git a/packages/muelu/test/interface/kokkos/Output/operator_solve_1_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/operator_solve_1_np4_tpetra.gold index 06f7330fcd96..2d6b350c8fc0 100644 --- a/packages/muelu/test/interface/kokkos/Output/operator_solve_1_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/operator_solve_1_np4_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -211,7 +211,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -219,9 +219,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] diff --git a/packages/muelu/test/interface/kokkos/Output/operator_solve_5_np1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/operator_solve_5_np1_tpetra.gold index d9a648f67204..934d6cd4ae65 100644 --- a/packages/muelu/test/interface/kokkos/Output/operator_solve_5_np1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/operator_solve_5_np1_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -208,7 +208,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -216,9 +216,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] diff --git a/packages/muelu/test/interface/kokkos/Output/operator_solve_5_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/operator_solve_5_np4_tpetra.gold index 5afd6852a376..b638f7c8bec2 100644 --- a/packages/muelu/test/interface/kokkos/Output/operator_solve_5_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/operator_solve_5_np4_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -208,7 +208,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -216,9 +216,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] diff --git a/packages/muelu/test/interface/kokkos/Output/operator_solve_6_np1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/operator_solve_6_np1_tpetra.gold index f19941336bb3..4da27c45ddc9 100644 --- a/packages/muelu/test/interface/kokkos/Output/operator_solve_6_np1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/operator_solve_6_np1_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -208,7 +208,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -216,9 +216,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] diff --git a/packages/muelu/test/interface/kokkos/Output/operator_solve_6_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/operator_solve_6_np4_tpetra.gold index 3c8a3358fe1c..4ffd5cdc913b 100644 --- a/packages/muelu/test/interface/kokkos/Output/operator_solve_6_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/operator_solve_6_np4_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] @@ -208,7 +208,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -216,9 +216,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] diff --git a/packages/muelu/test/interface/kokkos/Output/operator_solve_7_np1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/operator_solve_7_np1_tpetra.gold index b6f08d3f32da..d44340395aa0 100644 --- a/packages/muelu/test/interface/kokkos/Output/operator_solve_7_np1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/operator_solve_7_np1_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] diff --git a/packages/muelu/test/interface/kokkos/Output/operator_solve_7_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/operator_solve_7_np4_tpetra.gold index 29d186b523cc..467a4d8d697e 100644 --- a/packages/muelu/test/interface/kokkos/Output/operator_solve_7_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/operator_solve_7_np4_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesDeterministic (Phase 1 (main)) BuildAggregatesDeterministic (Phase 2a (secondary)) BuildAggregatesDeterministic (Phase 2b (expansion)) BuildAggregatesDeterministic (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -aggregation: enable phase 1 = 1 [default] -aggregation: phase 1 algorithm = Serial [default] aggregation: deterministic = 1 [unused] +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] diff --git a/packages/muelu/test/interface/kokkos/Output/pg1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/pg1_tpetra.gold index 7c5e0f92e821..4d828d342bfa 100644 --- a/packages/muelu/test/interface/kokkos/Output/pg1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/pg1_tpetra.gold @@ -37,7 +37,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -126,7 +126,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -134,9 +134,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/pg2_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/pg2_tpetra.gold index 7c5e0f92e821..4d828d342bfa 100644 --- a/packages/muelu/test/interface/kokkos/Output/pg2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/pg2_tpetra.gold @@ -37,7 +37,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -126,7 +126,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -134,9 +134,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/repartition1_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/repartition1_np4_tpetra.gold index a6f249e8fb18..c47d32e1bddb 100644 --- a/packages/muelu/test/interface/kokkos/Output/repartition1_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/repartition1_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -285,7 +285,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos/Output/repartition1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/repartition1_tpetra.gold index 6e69d83b769f..17cfd1bcbafe 100644 --- a/packages/muelu/test/interface/kokkos/Output/repartition1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/repartition1_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/repartition3_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/repartition3_np4_tpetra.gold index 9b8a8497cdf3..90a86a6d6a7e 100644 --- a/packages/muelu/test/interface/kokkos/Output/repartition3_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/repartition3_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -295,7 +295,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos/Output/repartition3_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/repartition3_tpetra.gold index 29a82dfd1e4b..45c1862fe800 100644 --- a/packages/muelu/test/interface/kokkos/Output/repartition3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/repartition3_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/repartition4_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/repartition4_np4_tpetra.gold index 3609331a0a65..b721c2cdfc2e 100644 --- a/packages/muelu/test/interface/kokkos/Output/repartition4_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/repartition4_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -294,7 +294,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 4 + 2 1112 3346 3.01 3.00 4 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos/Output/repartition4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/repartition4_tpetra.gold index 4e2a3e5f2eeb..cf5b1cca0c4f 100644 --- a/packages/muelu/test/interface/kokkos/Output/repartition4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/repartition4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/reuse-RAP-1_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/reuse-RAP-1_np4_tpetra.gold index c222dc6194a4..11c2d72caa87 100644 --- a/packages/muelu/test/interface/kokkos/Output/reuse-RAP-1_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/reuse-RAP-1_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -283,7 +283,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -327,7 +327,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos/Output/reuse-RAP-1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/reuse-RAP-1_tpetra.gold index b00b61c957da..12248d63ccf7 100644 --- a/packages/muelu/test/interface/kokkos/Output/reuse-RAP-1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/reuse-RAP-1_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/reuse-RAP-2_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/reuse-RAP-2_np4_tpetra.gold index 2b055cebc0f7..f6b78985e5f9 100644 --- a/packages/muelu/test/interface/kokkos/Output/reuse-RAP-2_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/reuse-RAP-2_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -162,7 +162,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -170,9 +170,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -257,7 +257,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -301,7 +301,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos/Output/reuse-RAP-2_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/reuse-RAP-2_tpetra.gold index 72a7e51744c1..6e533dde78b1 100644 --- a/packages/muelu/test/interface/kokkos/Output/reuse-RAP-2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/reuse-RAP-2_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -162,7 +162,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -170,9 +170,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/reuse-RP-2_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/reuse-RP-2_np4_tpetra.gold index 7415d2ff7c60..f5028d31e11b 100644 --- a/packages/muelu/test/interface/kokkos/Output/reuse-RP-2_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/reuse-RP-2_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -162,7 +162,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -170,9 +170,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -257,7 +257,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -387,7 +387,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos/Output/reuse-RP-2_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/reuse-RP-2_tpetra.gold index 7edab5dd70ea..316c9364a9f4 100644 --- a/packages/muelu/test/interface/kokkos/Output/reuse-RP-2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/reuse-RP-2_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -162,7 +162,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -170,9 +170,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/reuse-S-1_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/reuse-S-1_np4_tpetra.gold index 8c94cc12bfcd..43f77b391179 100644 --- a/packages/muelu/test/interface/kokkos/Output/reuse-S-1_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/reuse-S-1_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -283,7 +283,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -334,7 +334,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -342,9 +342,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -470,7 +470,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -478,9 +478,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -577,7 +577,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos/Output/reuse-S-1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/reuse-S-1_tpetra.gold index 2204622fbc8a..3f311ecc547f 100644 --- a/packages/muelu/test/interface/kokkos/Output/reuse-S-1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/reuse-S-1_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -345,7 +345,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -353,9 +353,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -481,7 +481,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -489,9 +489,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/reuse-full-1_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/reuse-full-1_np4_tpetra.gold index 241fab28d4d9..a38c7562e850 100644 --- a/packages/muelu/test/interface/kokkos/Output/reuse-full-1_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/reuse-full-1_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -283,7 +283,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -308,7 +308,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos/Output/reuse-full-1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/reuse-full-1_tpetra.gold index f8240f7d2b36..181c0b497fdb 100644 --- a/packages/muelu/test/interface/kokkos/Output/reuse-full-1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/reuse-full-1_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/reuse-none_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/reuse-none_np4_tpetra.gold index 82c8b23e9dde..df103205fe27 100644 --- a/packages/muelu/test/interface/kokkos/Output/reuse-none_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/reuse-none_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -285,7 +285,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -336,7 +336,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -344,9 +344,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -472,7 +472,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -480,9 +480,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -581,7 +581,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos/Output/reuse-none_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/reuse-none_tpetra.gold index 45b6800b8499..1a1e294c5d26 100644 --- a/packages/muelu/test/interface/kokkos/Output/reuse-none_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/reuse-none_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -345,7 +345,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -353,9 +353,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -481,7 +481,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -489,9 +489,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/reuse-tP-1_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/reuse-tP-1_np4_tpetra.gold index 6710e7b44baf..ae89b3aba95e 100644 --- a/packages/muelu/test/interface/kokkos/Output/reuse-tP-1_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/reuse-tP-1_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -285,7 +285,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -483,7 +483,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos/Output/reuse-tP-1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/reuse-tP-1_tpetra.gold index b6463572088e..d46263a1986e 100644 --- a/packages/muelu/test/interface/kokkos/Output/reuse-tP-1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/reuse-tP-1_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/reuse-tP-2_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/reuse-tP-2_np4_tpetra.gold index c1217b433a5d..91af4fb9044e 100644 --- a/packages/muelu/test/interface/kokkos/Output/reuse-tP-2_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/reuse-tP-2_np4_tpetra.gold @@ -41,7 +41,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -49,9 +49,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -178,7 +178,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -186,9 +186,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -287,7 +287,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -425,7 +425,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -433,9 +433,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -534,7 +534,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos/Output/reuse-tP-2_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/reuse-tP-2_tpetra.gold index d0a200744e69..948089d7e0c4 100644 --- a/packages/muelu/test/interface/kokkos/Output/reuse-tP-2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/reuse-tP-2_tpetra.gold @@ -41,7 +41,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -49,9 +49,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -178,7 +178,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -186,9 +186,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -434,7 +434,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -442,9 +442,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/reuse-tP-3_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/reuse-tP-3_np4_tpetra.gold index 8fd9b7d222a3..76078f5ddeec 100644 --- a/packages/muelu/test/interface/kokkos/Output/reuse-tP-3_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/reuse-tP-3_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -285,7 +285,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -423,7 +423,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -431,9 +431,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -532,7 +532,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos/Output/reuse-tP-3_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/reuse-tP-3_tpetra.gold index 6998c0daaec1..01c4db11e1dc 100644 --- a/packages/muelu/test/interface/kokkos/Output/reuse-tP-3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/reuse-tP-3_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -176,7 +176,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -184,9 +184,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -432,7 +432,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -440,9 +440,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/smoother10_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/smoother10_tpetra.gold index 7ecaf32b845e..358824b63971 100644 --- a/packages/muelu/test/interface/kokkos/Output/smoother10_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/smoother10_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/smoother11_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/smoother11_tpetra.gold index 4a348d927e22..214f41489c2a 100644 --- a/packages/muelu/test/interface/kokkos/Output/smoother11_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/smoother11_tpetra.gold @@ -56,7 +56,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -64,9 +64,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -162,7 +162,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -170,9 +170,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/smoother12_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/smoother12_tpetra.gold index 01775166210a..0d938c6180e6 100644 --- a/packages/muelu/test/interface/kokkos/Output/smoother12_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/smoother12_tpetra.gold @@ -31,7 +31,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -39,9 +39,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -112,7 +112,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -120,9 +120,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -193,7 +193,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -201,9 +201,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -248,7 +248,7 @@ keep smoother data = 0 [default] PreSmoother data = Teuchos::RCP >{ptr=0,node=0,strong_count=0,weak_count=0} [default] PostSmoother data = Teuchos::RCP >{ptr=0,node=0,strong_count=0,weak_count=0} [default] smoother -> - chebyshev: ratio eigenvalue = 2.99461 + chebyshev: ratio eigenvalue = 3.01084 chebyshev: boost factor = 1.1 [unused] chebyshev: min diagonal value = 2.22045e-16 [default] chebyshev: degree = 1 [default] @@ -274,7 +274,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -282,9 +282,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -329,7 +329,7 @@ keep smoother data = 0 [default] PreSmoother data = Teuchos::RCP >{ptr=0,node=0,strong_count=0,weak_count=0} [default] PostSmoother data = Teuchos::RCP >{ptr=0,node=0,strong_count=0,weak_count=0} [default] smoother -> - chebyshev: ratio eigenvalue = 2.99194 + chebyshev: ratio eigenvalue = 3.04959 chebyshev: boost factor = 1.1 [unused] chebyshev: min diagonal value = 2.22045e-16 [default] chebyshev: degree = 1 [default] @@ -355,7 +355,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -363,9 +363,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -428,9 +428,9 @@ 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 369 1105 2.99 3.01 1 + 4 121 361 2.98 3.05 1 + 5 36 106 2.94 3.36 1 Smoother (level 0) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 1, lambdaMax = , alpha: 2, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [9999, 9999], Global nnz: 29995} @@ -438,9 +438,9 @@ Smoother (level 1) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: tr Smoother (level 2) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 1, lambdaMax = , alpha: 4, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [1111, 1111], Global nnz: 3331} -Smoother (level 3) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 1, lambdaMax = , alpha: 2.99461, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [371, 371], Global nnz: 1111} +Smoother (level 3) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 1, lambdaMax = , alpha: 3.01084, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [369, 369], Global nnz: 1105} -Smoother (level 4) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 1, lambdaMax = , alpha: 2.99194, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [124, 124], Global nnz: 370} +Smoother (level 4) both : "Ifpack2::Chebyshev": {Initialized: true, Computed: true, "Ifpack2::Details::Chebyshev":{degree: 1, lambdaMax = , alpha: 3.04959, lambdaMin = , boost factor: 1.1}, Global matrix dimensions: [121, 121], Global nnz: 361} Smoother (level 5) pre : solver interface Smoother (level 5) post : no smoother diff --git a/packages/muelu/test/interface/kokkos/Output/smoother13_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/smoother13_tpetra.gold index 35d80ca9aea9..2417f88e2e66 100644 --- a/packages/muelu/test/interface/kokkos/Output/smoother13_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/smoother13_tpetra.gold @@ -38,7 +38,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -46,9 +46,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -126,7 +126,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -134,9 +134,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/smoother1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/smoother1_tpetra.gold index 7700f42859d4..b9d85fd3a6d3 100644 --- a/packages/muelu/test/interface/kokkos/Output/smoother1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/smoother1_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/smoother2_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/smoother2_tpetra.gold index 51caf4695c24..a67cab4ffbd6 100644 --- a/packages/muelu/test/interface/kokkos/Output/smoother2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/smoother2_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/smoother3_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/smoother3_tpetra.gold index dd796fbdabad..8f3a7b0636bd 100644 --- a/packages/muelu/test/interface/kokkos/Output/smoother3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/smoother3_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/smoother4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/smoother4_tpetra.gold index f5f426f6b623..4510989a7c73 100644 --- a/packages/muelu/test/interface/kokkos/Output/smoother4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/smoother4_tpetra.gold @@ -18,7 +18,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -26,9 +26,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -86,7 +86,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -94,9 +94,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/smoother5_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/smoother5_tpetra.gold index bb5f7dbd8955..54243a9e8e6a 100644 --- a/packages/muelu/test/interface/kokkos/Output/smoother5_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/smoother5_tpetra.gold @@ -31,7 +31,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -39,9 +39,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -112,7 +112,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -120,9 +120,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/smoother6_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/smoother6_tpetra.gold index 404a13da5738..ed140afb5165 100644 --- a/packages/muelu/test/interface/kokkos/Output/smoother6_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/smoother6_tpetra.gold @@ -25,7 +25,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -33,9 +33,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -100,7 +100,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -108,9 +108,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/smoother9_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/smoother9_tpetra.gold index ef1a7b8c7f93..75c42b869800 100644 --- a/packages/muelu/test/interface/kokkos/Output/smoother9_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/smoother9_tpetra.gold @@ -38,7 +38,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -46,9 +46,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -126,7 +126,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -134,9 +134,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/sync1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/sync1_tpetra.gold index 7700f42859d4..b9d85fd3a6d3 100644 --- a/packages/muelu/test/interface/kokkos/Output/sync1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/sync1_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -124,7 +124,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -132,9 +132,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/transpose1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/transpose1_tpetra.gold index 99b828f36504..3e957f860475 100644 --- a/packages/muelu/test/interface/kokkos/Output/transpose1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/transpose1_tpetra.gold @@ -37,7 +37,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -45,9 +45,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -120,7 +120,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -128,9 +128,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/transpose2_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/transpose2_np4_tpetra.gold index 7842282871db..947ecd9d84a1 100644 --- a/packages/muelu/test/interface/kokkos/Output/transpose2_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/transpose2_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -162,7 +162,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -170,9 +170,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -257,7 +257,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos/Output/transpose2_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/transpose2_tpetra.gold index bc8b2deac930..5cc73d12dacb 100644 --- a/packages/muelu/test/interface/kokkos/Output/transpose2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/transpose2_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -162,7 +162,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -170,9 +170,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/transpose3_np4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/transpose3_np4_tpetra.gold index 0ea82721bb82..9c7d93557886 100644 --- a/packages/muelu/test/interface/kokkos/Output/transpose3_np4_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/transpose3_np4_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -162,7 +162,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -170,9 +170,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -257,7 +257,7 @@ Cycle type = V level rows nnz nnz/row c ratio procs 0 9999 29995 3.00 4 1 3335 10015 3.00 3.00 4 - 2 1112 3340 3.00 3.00 1 + 2 1112 3346 3.01 3.00 1 Smoother (level 0) both : "Ifpack2::Relaxation": {Initialized: true, Computed: true, Type: Symmetric Gauss-Seidel, sweeps: 1, damping factor: 1, Global matrix dimensions: [9999, 9999], Global nnz: 29995} diff --git a/packages/muelu/test/interface/kokkos/Output/transpose3_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/transpose3_tpetra.gold index 7fb87ce3b349..2be8ce9b15b3 100644 --- a/packages/muelu/test/interface/kokkos/Output/transpose3_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/transpose3_tpetra.gold @@ -40,7 +40,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -48,9 +48,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -162,7 +162,7 @@ lightweight wrap = 1 Build (MueLu::TentativePFactory_kokkos) Build (MueLu::UncoupledAggregationFactory_kokkos) BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -170,9 +170,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/unsmoothed1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/unsmoothed1_tpetra.gold index 6f9ce8a6a4a8..3e504ae003a4 100644 --- a/packages/muelu/test/interface/kokkos/Output/unsmoothed1_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/unsmoothed1_tpetra.gold @@ -36,7 +36,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -44,9 +44,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -116,7 +116,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -124,9 +124,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] diff --git a/packages/muelu/test/interface/kokkos/Output/unsmoothed2_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/unsmoothed2_tpetra.gold index 1b9de4442730..9cf92e6d18c5 100644 --- a/packages/muelu/test/interface/kokkos/Output/unsmoothed2_tpetra.gold +++ b/packages/muelu/test/interface/kokkos/Output/unsmoothed2_tpetra.gold @@ -36,7 +36,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -44,9 +44,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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] @@ -116,7 +116,7 @@ filtered matrix: reuse eigenvalue = 1 [default] lightweight wrap = 1 BuildAggregates (Phase - (Dirichlet)) -BuildAggregatesSerial (Phase 1 (main)) +BuildAggregatesRandom (Phase 1 (main)) BuildAggregatesRandom (Phase 2a (secondary)) BuildAggregatesRandom (Phase 2b (expansion)) BuildAggregatesRandom (Phase 3 (cleanup)) @@ -124,9 +124,9 @@ aggregation: max agg size = -1 [default] aggregation: min agg size = 2 [default] aggregation: max selected neighbors = 0 [default] aggregation: ordering = natural [default] -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]