CFD/hypre
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed wrong pointer checking; error handler in debug mode (#275)

Browse Source 
This PR fixed a pointer comparison error in GPU matvec y=Ax, (if both pointers of x and y are NULL, should not throw errors).
This commit is contained in:
Ruipeng Li 2021-02-10 23:11:32 -08:00 committed by GitHub
parent 33da39f68a
commit c4ca3e1050
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/seq_mv/csr_matvec_device.c
View File

@ -29,25 +29,30 @@ hypre_CSRMatrixMatvecDevice2( HYPRE_Int trans,
hypre_Vector *y,
HYPRE_Int offset )
{
if (hypre_VectorData(x) == hypre_VectorData(y))
{
hypre_error_w_msg(HYPRE_ERROR_GENERIC, "ERROR::x and y are the same pointer in hypre_CSRMatrixMatvecDevice2");
}
#ifdef HYPRE_USING_CUSPARSE
#if CUSPARSE_VERSION >= CUSPARSE_NEWAPI_VERSION
/* Luke E: The generic API is techinically supported on 10.1,10.2 as a preview,
* with Dscrmv being deprecated. However, there are limitations.
* While in Cuda < 11, there are specific mentions of using csr2csc involving
* transposed matrix products with dcsrm*,
* they are not present in SpMV interface.
*/
hypre_CSRMatrixMatvecCusparseNewAPI(trans, alpha, A, x, beta, y, offset);
/* Luke E: The generic API is techinically supported on 10.1,10.2 as a preview,
* with Dscrmv being deprecated. However, there are limitations.
* While in Cuda < 11, there are specific mentions of using csr2csc involving
* transposed matrix products with dcsrm*,
* they are not present in SpMV interface.
*/
hypre_CSRMatrixMatvecCusparseNewAPI(trans, alpha, A, x, beta, y, offset);
#else
hypre_CSRMatrixMatvecCusparseOldAPI(trans, alpha, A, x, beta, y, offset);
hypre_CSRMatrixMatvecCusparseOldAPI(trans, alpha, A, x, beta, y, offset);
#endif
#elif defined(HYPRE_USING_DEVICE_OPENMP)
hypre_CSRMatrixMatvecOMPOffload(trans, alpha, A, x, beta, y, offset);
hypre_CSRMatrixMatvecOMPOffload(trans, alpha, A, x, beta, y, offset);
#else // #ifdef HYPRE_USING_CUSPARSE
#error HYPRE SPMV TODO
#endif
return hypre_error_flag;
return hypre_error_flag;
}
/* y = alpha * A * x + beta * b */
@ -68,11 +73,6 @@ hypre_CSRMatrixMatvecDevice( HYPRE_Int trans,
// TODO: RL: do we need offset > 0 at all?
hypre_assert(offset == 0);
if (hypre_VectorData(x) == hypre_VectorData(y))
{
hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ERROR::x and y are the same pointer in hypre_CSRMatrixMatvecDevice\n");
}
HYPRE_Int nx = trans ? hypre_CSRMatrixNumRows(A) : hypre_CSRMatrixNumCols(A);
HYPRE_Int ny = trans ? hypre_CSRMatrixNumCols(A) : hypre_CSRMatrixNumRows(A);
@ -130,11 +130,6 @@ hypre_CSRMatrixMatvecMaskedDevice( HYPRE_Complex alpha,
HYPRE_Int *mask,
HYPRE_Int size_of_mask )
{
if (hypre_VectorData(x) == hypre_VectorData(y))
{
hypre_error_w_msg(HYPRE_ERROR_GENERIC,"ERROR::x and y are the same pointer in hypre_CSRMatrixMatvecMaskedDevice\n");
}
if (hypre_VectorData(b) != hypre_VectorData(y))
{
hypre_TMemcpy( hypre_VectorData(y),

5
src/seq_mv/csr_spgemm_device_rowest.c
View File

@ -375,8 +375,9 @@ hypreDevice_CSRSpGemmRownnzEstimate(HYPRE_Int m, HYPRE_Int k, HYPRE_Int n,
}
else
{
printf("Unknown row nnz estimation method %d! \n", row_est_mtd);
exit(-1);
char msg[256];
hypre_sprintf(msg, "Unknown row nnz estimation method %d! \n", row_est_mtd);
hypre_error_w_msg(HYPRE_ERROR_GENERIC, msg);
}
#ifdef HYPRE_PROFILE