Skip to content

Fix incorrect call to dist_psymbtonum when fact is SamePattern_SameRowPerm #143

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

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

Fix incorrect call to dist_psymbtonum when fact is SamePattern_SameRowPerm #143

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
c9398ae
pddrive[23]: add options for row/col perm and parallel symbolic facto…
jamtrott May 22, 2023
4175b28
pdgssvx: fix call to dist_psymbtonum when fact is SamePattern_SameRow…
jamtrott May 22, 2023
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
15 changes: 14 additions & 1 deletion EXAMPLE/pddrive2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ int main(int argc, char *argv[])
double *b, *b1, *xtrue, *xtrue1;
int_t *colind, *colind1, *rowptr, *rowptr1;
int_t i, j, m, n, nnz_loc, m_loc;
int nprow, npcol;
int nprow, npcol, colperm, rowperm, symbfact;
int iam, info, ldb, ldx, nrhs;
char **cpp, c, *postfix;
int ii, omp_mpi_level;
Expand All @@ -78,6 +78,9 @@ int main(int argc, char *argv[])
nprow = 1; /* Default process rows. */
npcol = 1; /* Default process columns. */
nrhs = 1; /* Number of right-hand side. */
colperm = -1;
rowperm = -1;
symbfact = -1;

/* ------------------------------------------------------------
INITIALIZE MPI ENVIRONMENT.
Expand All @@ -100,6 +103,12 @@ int main(int argc, char *argv[])
break;
case 'c': npcol = atoi(*cpp);
break;
case 'p': rowperm = atoi(*cpp);
break;
case 'q': colperm = atoi(*cpp);
break;
case 's': symbfact = atoi(*cpp);
break;
}
} else { /* Last arg is considered a filename */
if ( !(fp = fopen(*cpp, "r")) ) {
Expand Down Expand Up @@ -174,6 +183,10 @@ int main(int argc, char *argv[])
*/
set_default_options_dist(&options);

if (rowperm != -1) options.RowPerm = rowperm;
if (colperm != -1) options.ColPerm = colperm;
if (symbfact != -1) options.ParSymbFact = symbfact;

if (!iam) {
print_options_dist(&options);
fflush(stdout);
Expand Down
15 changes: 14 additions & 1 deletion EXAMPLE/pddrive3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ int main(int argc, char *argv[])
double *b, *b1, *xtrue, *nzval, *nzval1;
int_t *colind, *colind1, *rowptr, *rowptr1;
int_t i, j, m, n, nnz_loc, m_loc, fst_row;
int nprow, npcol;
int nprow, npcol, colperm, rowperm, symbfact;
int iam, info, ldb, ldx, nrhs;
char **cpp, c, *postfix;
int ii, omp_mpi_level;
Expand All @@ -75,6 +75,9 @@ int main(int argc, char *argv[])
nprow = 1; /* Default process rows. */
npcol = 1; /* Default process columns. */
nrhs = 1; /* Number of right-hand side. */
colperm = -1;
rowperm = -1;
symbfact = -1;

/* ------------------------------------------------------------
INITIALIZE MPI ENVIRONMENT.
Expand All @@ -97,6 +100,12 @@ int main(int argc, char *argv[])
break;
case 'c': npcol = atoi(*cpp);
break;
case 'p': rowperm = atoi(*cpp);
break;
case 'q': colperm = atoi(*cpp);
break;
case 's': symbfact = atoi(*cpp);
break;
}
} else { /* Last arg is considered a filename */
if ( !(fp = fopen(*cpp, "r")) ) {
Expand Down Expand Up @@ -189,6 +198,10 @@ int main(int argc, char *argv[])
*/
set_default_options_dist(&options);

if (rowperm != -1) options.RowPerm = rowperm;
if (colperm != -1) options.ColPerm = colperm;
if (symbfact != -1) options.ParSymbFact = symbfact;

if (!iam) {
print_options_dist(&options);
fflush(stdout);
Expand Down
15 changes: 14 additions & 1 deletion EXAMPLE/psdrive2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ int main(int argc, char *argv[])
float *b, *b1, *xtrue, *xtrue1;
int_t *colind, *colind1, *rowptr, *rowptr1;
int_t i, j, m, n, nnz_loc, m_loc;
int nprow, npcol;
int nprow, npcol, colperm, rowperm, symbfact;
int iam, info, ldb, ldx, nrhs;
char **cpp, c, *postfix;
int ii, omp_mpi_level;
Expand All @@ -78,6 +78,9 @@ int main(int argc, char *argv[])
nprow = 1; /* Default process rows. */
npcol = 1; /* Default process columns. */
nrhs = 1; /* Number of right-hand side. */
colperm = -1;
rowperm = -1;
symbfact = -1;

/* ------------------------------------------------------------
INITIALIZE MPI ENVIRONMENT.
Expand All @@ -100,6 +103,12 @@ int main(int argc, char *argv[])
break;
case 'c': npcol = atoi(*cpp);
break;
case 'p': rowperm = atoi(*cpp);
break;
case 'q': colperm = atoi(*cpp);
break;
case 's': symbfact = atoi(*cpp);
break;
}
} else { /* Last arg is considered a filename */
if ( !(fp = fopen(*cpp, "r")) ) {
Expand Down Expand Up @@ -175,6 +184,10 @@ int main(int argc, char *argv[])
set_default_options_dist(&options);
options.IterRefine = SLU_SINGLE;

if (rowperm != -1) options.RowPerm = rowperm;
if (colperm != -1) options.ColPerm = colperm;
if (symbfact != -1) options.ParSymbFact = symbfact;

if (!iam) {
print_options_dist(&options);
fflush(stdout);
Expand Down
15 changes: 14 additions & 1 deletion EXAMPLE/psdrive3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ int main(int argc, char *argv[])
float *b, *b1, *xtrue, *nzval, *nzval1;
int_t *colind, *colind1, *rowptr, *rowptr1;
int_t i, j, m, n, nnz_loc, m_loc, fst_row;
int nprow, npcol;
int nprow, npcol, colperm, rowperm, symbfact;
int iam, info, ldb, ldx, nrhs;
char **cpp, c, *postfix;
int ii, omp_mpi_level;
Expand All @@ -75,6 +75,9 @@ int main(int argc, char *argv[])
nprow = 1; /* Default process rows. */
npcol = 1; /* Default process columns. */
nrhs = 1; /* Number of right-hand side. */
colperm = -1;
rowperm = -1;
symbfact = -1;

/* ------------------------------------------------------------
INITIALIZE MPI ENVIRONMENT.
Expand All @@ -97,6 +100,12 @@ int main(int argc, char *argv[])
break;
case 'c': npcol = atoi(*cpp);
break;
case 'p': rowperm = atoi(*cpp);
break;
case 'q': colperm = atoi(*cpp);
break;
case 's': symbfact = atoi(*cpp);
break;
}
} else { /* Last arg is considered a filename */
if ( !(fp = fopen(*cpp, "r")) ) {
Expand Down Expand Up @@ -190,6 +199,10 @@ int main(int argc, char *argv[])
set_default_options_dist(&options);
options.IterRefine = SLU_SINGLE;

if (rowperm != -1) options.RowPerm = rowperm;
if (colperm != -1) options.ColPerm = colperm;
if (symbfact != -1) options.ParSymbFact = symbfact;

if (!iam) {
print_options_dist(&options);
fflush(stdout);
Expand Down
15 changes: 14 additions & 1 deletion EXAMPLE/pzdrive2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ int main(int argc, char *argv[])
doublecomplex *b, *b1, *xtrue, *xtrue1;
int_t *colind, *colind1, *rowptr, *rowptr1;
int_t i, j, m, n, nnz_loc, m_loc;
int nprow, npcol;
int nprow, npcol, colperm, rowperm, symbfact;
int iam, info, ldb, ldx, nrhs;
char **cpp, c, *postfix;
int ii, omp_mpi_level;
Expand All @@ -77,6 +77,9 @@ int main(int argc, char *argv[])
nprow = 1; /* Default process rows. */
npcol = 1; /* Default process columns. */
nrhs = 1; /* Number of right-hand side. */
colperm = -1;
rowperm = -1;
symbfact = -1;

/* ------------------------------------------------------------
INITIALIZE MPI ENVIRONMENT.
Expand All @@ -99,6 +102,12 @@ int main(int argc, char *argv[])
break;
case 'c': npcol = atoi(*cpp);
break;
case 'p': rowperm = atoi(*cpp);
break;
case 'q': colperm = atoi(*cpp);
break;
case 's': symbfact = atoi(*cpp);
break;
}
} else { /* Last arg is considered a filename */
if ( !(fp = fopen(*cpp, "r")) ) {
Expand Down Expand Up @@ -173,6 +182,10 @@ int main(int argc, char *argv[])
*/
set_default_options_dist(&options);

if (rowperm != -1) options.RowPerm = rowperm;
if (colperm != -1) options.ColPerm = colperm;
if (symbfact != -1) options.ParSymbFact = symbfact;

if (!iam) {
print_options_dist(&options);
fflush(stdout);
Expand Down
15 changes: 14 additions & 1 deletion EXAMPLE/pzdrive3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ int main(int argc, char *argv[])
doublecomplex *b, *b1, *xtrue, *nzval, *nzval1;
int_t *colind, *colind1, *rowptr, *rowptr1;
int_t i, j, m, n, nnz_loc, m_loc, fst_row;
int nprow, npcol;
int nprow, npcol, colperm, rowperm, symbfact;
int iam, info, ldb, ldx, nrhs;
char **cpp, c, *postfix;
int ii, omp_mpi_level;
Expand All @@ -74,6 +74,9 @@ int main(int argc, char *argv[])
nprow = 1; /* Default process rows. */
npcol = 1; /* Default process columns. */
nrhs = 1; /* Number of right-hand side. */
colperm = -1;
rowperm = -1;
symbfact = -1;

/* ------------------------------------------------------------
INITIALIZE MPI ENVIRONMENT.
Expand All @@ -96,6 +99,12 @@ int main(int argc, char *argv[])
break;
case 'c': npcol = atoi(*cpp);
break;
case 'p': rowperm = atoi(*cpp);
break;
case 'q': colperm = atoi(*cpp);
break;
case 's': symbfact = atoi(*cpp);
break;
}
} else { /* Last arg is considered a filename */
if ( !(fp = fopen(*cpp, "r")) ) {
Expand Down Expand Up @@ -188,6 +197,10 @@ int main(int argc, char *argv[])
*/
set_default_options_dist(&options);

if (rowperm != -1) options.RowPerm = rowperm;
if (colperm != -1) options.ColPerm = colperm;
if (symbfact != -1) options.ParSymbFact = symbfact;

if (!iam) {
print_options_dist(&options);
fflush(stdout);
Expand Down
3 changes: 1 addition & 2 deletions SRC/pdgssvx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,8 +1132,7 @@ pdgssvx(superlu_dist_options_t *options, SuperMatrix *A,
if (symb_comm != MPI_COMM_NULL) MPI_Comm_free (&symb_comm);

/* Distribute entries of A into L & U data structures. */
//if (parSymbFact == NO || ???? Fact == SamePattern_SameRowPerm) {
if ( parSymbFact == NO ) {
if ( parSymbFact == NO || Fact == SamePattern_SameRowPerm ) {
/* CASE OF SERIAL SYMBOLIC */
/* Apply column permutation to the original distributed A */
for (j = 0; j < nnz_loc; ++j) colind[j] = perm_c[colind[j]];
Expand Down
3 changes: 1 addition & 2 deletions SRC/psgssvx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,8 +1133,7 @@ psgssvx(superlu_dist_options_t *options, SuperMatrix *A,
if (symb_comm != MPI_COMM_NULL) MPI_Comm_free (&symb_comm);

/* Distribute entries of A into L & U data structures. */
//if (parSymbFact == NO || ???? Fact == SamePattern_SameRowPerm) {
if ( parSymbFact == NO ) {
if ( parSymbFact == NO || Fact == SamePattern_SameRowPerm ) {
/* CASE OF SERIAL SYMBOLIC */
/* Apply column permutation to the original distributed A */
for (j = 0; j < nnz_loc; ++j) colind[j] = perm_c[colind[j]];
Expand Down
3 changes: 1 addition & 2 deletions SRC/pzgssvx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1134,8 +1134,7 @@ pzgssvx(superlu_dist_options_t *options, SuperMatrix *A,
if (symb_comm != MPI_COMM_NULL) MPI_Comm_free (&symb_comm);

/* Distribute entries of A into L & U data structures. */
//if (parSymbFact == NO || ???? Fact == SamePattern_SameRowPerm) {
if ( parSymbFact == NO ) {
if ( parSymbFact == NO || Fact == SamePattern_SameRowPerm ) {
/* CASE OF SERIAL SYMBOLIC */
/* Apply column permutation to the original distributed A */
for (j = 0; j < nnz_loc; ++j) colind[j] = perm_c[colind[j]];
Expand Down