Skip to content

Debug for SYMGS+SPMV fusion #2

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
xiaofengF wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Debug for SYMGS+SPMV fusion #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 43 additions & 8 deletions src/ComputeSYMGS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1232,7 +1232,8 @@ int ComputeFusedSYMGS_SPMV ( const SparseMatrix & A, const Vector & r, Vector &
double * const xv = x.values;
double * const yv = y.values;
double **matrixDiagonal = A.matrixDiagonal;

//define temp storage for rv - matrix lower product x
std::vector<double>storeBMinusLx(r.localLength, 0);
/*
* FORWARD
*/
Expand All @@ -1250,6 +1251,10 @@ int ComputeFusedSYMGS_SPMV ( const SparseMatrix & A, const Vector & r, Vector &

for ( local_int_t j = 0; j < currentNumberOfNonzeros; j++ ) {
local_int_t curCol = currentColIndices[j];
//add temp storage for rv - matrix lower product x
if (curCol == row) {
storeBMinusLx[row] = sum;
}
sum -= currentValues[j] * xv[curCol];
}
sum += xv[row] * currentDiagonal;
Expand All @@ -1270,22 +1275,52 @@ int ComputeFusedSYMGS_SPMV ( const SparseMatrix & A, const Vector & r, Vector &
const local_int_t * const currentColIndices = A.mtxIndL[row];
const int currentNumberOfNonzeros = A.nonzerosInRow[row];
const double currentDiagonal = matrixDiagonal[row][0];
double sum = 0.0;
//use temp storage for rv - matrix lower product x
double sum = storeBMinusLx[row];
for ( local_int_t j = currentNumberOfNonzeros-1; j >= 0; j-- ) {
local_int_t curCol = currentColIndices[j];
if (curCol > row) {
sum -= currentValues[j] * xv[curCol];
}
}

xv[row] = sum / currentDiagonal;

// if symmetry property can be used, the fusion can be much faster.
// yv[row] = storeBMinusLx[row];
// //use temp storage for Ax = (L+D+U)x = b-Lx_pre+Lx
// for ( local_int_t j = 0; j < currentNumberOfNonzeros; j++ ) {
// local_int_t curCol = currentColIndices[j];
// if (curCol > row) {
// yv[curCol] += currentValues[j] * xv[row];
// }
// }
}
}

for ( local_int_t l = A.tdg.size()-1; l >= 0; l-- ) {
#ifndef HPCG_NO_OPENMP
#pragma omp parallel for
#endif
for ( local_int_t i = A.tdg[l].size()-1; i >= 0; i-- ) {
local_int_t row = A.tdg[l][i];
const double * const currentValues = A.matrixValues[row];
const local_int_t * const currentColIndices = A.mtxIndL[row];
const int currentNumberOfNonzeros = A.nonzerosInRow[row];
const double currentDiagonal = matrixDiagonal[row][0];

yv[row] = storeBMinusLx[row];
for ( local_int_t j = currentNumberOfNonzeros-1; j >= 0; j-- ) {
local_int_t curCol = currentColIndices[j];
sum += currentValues[j] * xv[curCol];
if (curCol < row) {
yv[row] += currentValues[j] * xv[curCol];
}
}
sum -= xv[row] * currentDiagonal;
xv[row] = (rv[row] - sum) / currentDiagonal;
sum += xv[row] * currentDiagonal;
yv[row] = sum;
}
}

return 0;
}

int ComputeSYMGS_TDG ( const SparseMatrix & A, const Vector & r, Vector & x ) {

assert( x.localLength == A.localNumberOfColumns);
Expand Down