Remove repair and coarse solver related members/metrics

Nek5000 · Apr 30, 2024 · 756d9fe · 756d9fe
1 parent cbe0f06
commit 756d9fe
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 60 deletions.
diff --git a/README.md b/README.md
@@ -76,7 +76,6 @@ typedef struct {
   int levels;      // Number of levels: 1, or 2 (Default: 2)
   int find_disconnected_comps; // Find number of components: 0 - No, 1 - Yes
                                // (Default: 1)
-  int repair; // Repair disconnected components: 0 - No, 1 - Yes (Default: 0)
   int verbose_level; // Verbose level: 0, 1, 2, .. etc (Default: 1)
   int profile_level; // Profile level: 0, 1, 2, .. etc (Default: 0)
   // RSB common (Lanczos and MG) options
@@ -106,7 +105,6 @@ PARRSB_PARTITIONER
 PARRSB_TAGGED
 PARRSB_LEVELS
 PARRSB_FIND_DISCONNECTED_COMPONENTS
-PARRSB_REPAIR
 PARRSB_VERBOSE_LEVEL
 PARRSB_PROFILE_LEVEL
 

diff --git a/src/metrics.c b/src/metrics.c
@@ -105,45 +105,6 @@ void metric_rsb_print(struct comm *c, int profile_level) {
   if (wrk) free(wrk);
 }
 
-void metric_crs_print(struct comm *c, int profile_level) {
-  double *wrk = tcalloc(double, 4 * MAXSIZE);
-  metric_print_aux(wrk, c);
-  double *min = wrk, *max = min + MAXSIZE, *sum = max + MAXSIZE;
-
-  for (unsigned i = 0; i < stack_size; i++) {
-    if (c->id == 0 && profile_level > 0) {
-      printf("level=%02d\n", i);
-      printf("  SCHUR_SOLVE_CHOL1                  : %e/%e/%e\n",
-             SUMMARY(i, SCHUR_SOLVE_CHOL1));
-      printf("  SCHUR_SOLVE_SETRHS1                : %e/%e/%e\n",
-             SUMMARY(i, SCHUR_SOLVE_SETRHS1));
-      printf("  SCHUR_SOLVE_PROJECT                : %e/%e/%e\n",
-             SUMMARY(i, SCHUR_SOLVE_PROJECT));
-      printf("    SCHUR_PROJECT_NITER              : %e/%e/%e\n",
-             SUMMARY(i, SCHUR_PROJECT_NITER));
-      printf("    SCHUR_PROJECT_OPERATOR           : %e/%e/%e\n",
-             SUMMARY(i, SCHUR_PROJECT_OPERATOR));
-      printf("      SCHUR_PROJECT_OPERATOR_FXI     : %e/%e/%e\n",
-             SUMMARY(i, SCHUR_PROJECT_OPERATOR_FXI));
-      printf("      SCHUR_PROJECT_OPERATOR_CHOL    : %e/%e/%e\n",
-             SUMMARY(i, SCHUR_PROJECT_OPERATOR_CHOL));
-      printf("      SCHUR_PROJECT_OPERATOR_EZL     : %e/%e/%e\n",
-             SUMMARY(i, SCHUR_PROJECT_OPERATOR_EZL));
-      printf("      SCHUR_PROJECT_OPERATOR_MATVEC  : %e/%e/%e\n",
-             SUMMARY(i, SCHUR_PROJECT_OPERATOR_MATVEC));
-      printf("    SCHUR_PROJECT_PRECOND            : %e/%e/%e\n",
-             SUMMARY(i, SCHUR_PROJECT_PRECOND));
-      printf("  SCHUR_SOLVE_SETRHS2                : %e/%e/%e\n",
-             SUMMARY(i, SCHUR_SOLVE_SETRHS2));
-      printf("  SCHUR_SOLVE_CHOL2                  : %e/%e/%e\n",
-             SUMMARY(i, SCHUR_SOLVE_CHOL2));
-    }
-    fflush(stdout);
-  }
-
-  if (wrk) free(wrk);
-}
-
 #undef SUMMARY
 
 void metric_finalize(void) {

diff --git a/src/metrics.h b/src/metrics.h
@@ -23,20 +23,7 @@ typedef enum {
   RSB_PRE,
   RSB_PROJECT_AX,
   RSB_PROJECT_MG,
-  RSB_REPAIR,
   RSB_SORT,
-  SCHUR_PROJECT_NITER,
-  SCHUR_PROJECT_OPERATOR,
-  SCHUR_PROJECT_OPERATOR_FXI,
-  SCHUR_PROJECT_OPERATOR_CHOL,
-  SCHUR_PROJECT_OPERATOR_EZL,
-  SCHUR_PROJECT_OPERATOR_MATVEC,
-  SCHUR_PROJECT_PRECOND,
-  SCHUR_SOLVE_CHOL1,
-  SCHUR_SOLVE_CHOL2,
-  SCHUR_SOLVE_PROJECT,
-  SCHUR_SOLVE_SETRHS1,
-  SCHUR_SOLVE_SETRHS2,
   TOL_FNL,
   TOL_TGT,
   TOL_INIT

diff --git a/src/parRSB.h b/src/parRSB.h
@@ -25,9 +25,8 @@ typedef struct {
   int levels;      // Number of levels: 1, or 2 (Default: 2)
   int find_disconnected_comps; // Find number of components: 0 - No, 1 - Yes
                                // (Default: 1)
-  int repair; // Repair disconnected components: 0 - No, 1 - Yes (Default: 0)
-  int verbose_level; // Verbose level: 0, 1, 2, .. etc (Default: 1)
-  int profile_level; // Profile level: 0, 1, 2, .. etc (Default: 0)
+  int verbose_level;           // Verbose level: 0, 1, 2, .. etc (Default: 1)
+  int profile_level;           // Profile level: 0, 1, 2, .. etc (Default: 0)
   // RSB common (Lanczos and MG) options
   int rsb_algo; // RSB algo: 0 - Lanczos, 1 - MG (Default: 0)
   int rsb_pre;  // RSB pre-partition : 0 - None, 1 - RCB , 2 - RIB (Default: 1)

diff --git a/src/parrsb.c b/src/parrsb.c
@@ -29,7 +29,6 @@ parrsb_options parrsb_default_options = {
     .tagged = 0,
     .levels = 2,
     .find_disconnected_comps = 1,
-    .repair = 0,
     .verbose_level = 1,
     .profile_level = 0,
     // RSB common (Lanczos and MG) options
@@ -61,7 +60,6 @@ static void update_options(parrsb_options *const options) {
   UPDATE_OPTION(levels, "PARRSB_LEVELS", 1);
   UPDATE_OPTION(find_disconnected_comps, "PARRSB_FIND_DISCONNECTED_COMPONENTS",
                 1);
-  UPDATE_OPTION(repair, "PARRSB_REPAIR", 1);
   UPDATE_OPTION(verbose_level, "PARRSB_VERBOSE_LEVEL", 1);
   UPDATE_OPTION(profile_level, "PARRSB_PROFILE_LEVEL", 1);
   UPDATE_OPTION(rsb_algo, "PARRSB_RSB_ALGO", 1);
@@ -85,7 +83,6 @@ static void print_options(const struct comm *c,
   PRINT_OPTION(levels, "PARRSB_LEVELS", "%d");
   PRINT_OPTION(find_disconnected_comps, "PARRSB_FIND_DISCONNECTED_COMPONENTS",
                "%d");
-  PRINT_OPTION(repair, "PARRSB_REPAIR", "%d");
   PRINT_OPTION(verbose_level, "PARRSB_VERBOSE_LEVEL", "%d");
   PRINT_OPTION(profile_level, "PARRSB_PROFILE_LEVEL", "%d");
   PRINT_OPTION(rsb_algo, "PARRSB_RSB_ALGO", "%d");