Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused metrics and members #75

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove unused metrics and members #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbe0f06
Remove rsb_dump_stats member variable
thilinarmtb Apr 30, 2024
756d9fe
Remove repair and coarse solver related members/metrics
thilinarmtb Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -106,7 +105,6 @@ PARRSB_PARTITIONER
PARRSB_TAGGED
PARRSB_LEVELS
PARRSB_FIND_DISCONNECTED_COMPONENTS
PARRSB_REPAIR
PARRSB_VERBOSE_LEVEL
PARRSB_PROFILE_LEVEL

Expand Down
39 changes: 0 additions & 39 deletions src/metrics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
13 changes: 0 additions & 13 deletions src/metrics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions src/parRSB.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,14 @@ 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)
int rsb_max_iter; // Max iterations in Lanczos / MG (Default: 50)
int rsb_max_passes; // Max Lanczos restarts / Inverse iterations (Default: 50)
double rsb_tol; // Tolerance for Lanczos or RQI (Default: 1e-5)
int rsb_dump_stats; // Dump partition statistics to a text file.
// RSB MG specific options
int rsb_mg_grammian; // MG Grammian: 0 or 1 (Default: 0)
int rsb_mg_factor; // MG Coarsening factor (Default: 2, should be > 1)
Expand Down
4 changes: 0 additions & 4 deletions src/parrsb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -38,7 +37,6 @@ parrsb_options parrsb_default_options = {
.rsb_max_iter = 50,
.rsb_max_passes = 50,
.rsb_tol = 1e-5,
.rsb_dump_stats = 0,
// RSB MG specific options
.rsb_mg_grammian = 0,
.rsb_mg_factor = 2};
Expand All @@ -62,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);
Expand All @@ -86,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");
Expand Down
Loading