Skip to content

Adding reference counting to ParCSRMatrix #1443

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

Merged
rfalgout merged 11 commits into from
Jan 8, 2026
Merged

Adding reference counting to ParCSRMatrix #1443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c5323ba
Adding reference counting to ParCSRMatrix
rfalgout Dec 18, 2025
e448284
Preliminary logic changes to pcg.c before implementing reference counter
rfalgout Dec 19, 2025
264c378
Merge branch 'master' into mat-ref-count
rfalgout Dec 26, 2025
6123cff
This fixes a couple of memory leaks due to refcount update
rfalgout Dec 26, 2025
bc1dfaf
Fixed more memory leak issues related to refcount (should be all of t…
rfalgout Dec 26, 2025
bac3199
Made remaining precond_Mat changes and cleaned up krylov solvers
rfalgout Dec 26, 2025
132ad94
Updating TEST_error/error.sh saved file
rfalgout Dec 27, 2025
e95e56a
Merge branch 'master' into mat-ref-count
rfalgout Dec 29, 2025
776b5fd
Calling internal routines for AMSFEI functions (not supporting the ex…
rfalgout Dec 30, 2025
fd8d2f3
Changed 'diagscale.c' to 'diag_scale.c' to avoid filename conflicts w…
rfalgout Jan 5, 2026
c07ee89
Merge branch 'master' into mat-ref-count
rfalgout Jan 5, 2026
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
11 changes: 5 additions & 6 deletions src/FEI_mv/fei-hypre/HYPRE_LSC_aux.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4288,20 +4288,19 @@ void HYPRE_LinSysCore::setupPreconAMS()
HYPRE_IJVectorGetObject(currX_, (void **) &x_csr);

if( amsG_ == NULL ) {

//Old way of doing things
//only works for 1 domain per processor (in ALE3D)
//not compatible with contact
HYPRE_AMSFEISetup(HYPrecon_,
hypre_AMSFEISetup(HYPrecon_,
A_csr,
b_csr,
x_csr,
AMSData_.EdgeNodeList_,
AMSData_.numNodes_,
AMSData_.numLocalNodes_,
AMSData_.NodeNumbers_,
AMSData_.NodalCoord_,
AMSData_.numEdges_,
AMSData_.numLocalNodes_,
AMSData_.numNodes_,
AMSData_.NodalCoord_);
AMSData_.EdgeNodeList_);
} else {
//New Code//
HYPRE_ParCSRMatrix G_csr;
Expand Down
2 changes: 1 addition & 1 deletion src/FEI_mv/fei-hypre/HYPRE_LinSysCore.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ HYPRE_LinSysCore::~HYPRE_LinSysCore()
// Destroy G and coordinate vectors
// OLD WAY
if( amsG_ == NULL ) {
HYPRE_AMSFEIDestroy( HYPrecon_ );
hypre_AMSFEIDestroy( HYPrecon_ );
}
HYPRE_AMSDestroy( HYPrecon_ );
}
Expand Down
8 changes: 4 additions & 4 deletions src/krylov/_hypre_krylov.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ hypre_BiCGSTABFunctionsCreate(
hypre_KrylovPtrToScaleVector ScaleVector,
hypre_KrylovPtrToAxpy Axpy,
hypre_KrylovPtrToCommInfo CommInfo,
hypre_KrylovPtrToPrecond Precond,
hypre_KrylovPtrToPrecondSetup PrecondSetup
hypre_KrylovPtrToPrecondSetup PrecondSetup,
hypre_KrylovPtrToPrecond Precond
);

/**
Expand Down Expand Up @@ -518,8 +518,8 @@ hypre_GMRESFunctionsCreate(
hypre_KrylovPtrToClearVector ClearVector,
hypre_KrylovPtrToScaleVector ScaleVector,
hypre_KrylovPtrToAxpy Axpy,
hypre_KrylovPtrToPrecond Precond,
hypre_KrylovPtrToPrecondSetup PrecondSetup
hypre_KrylovPtrToPrecondSetup PrecondSetup,
hypre_KrylovPtrToPrecond Precond
);

/**
Expand Down
12 changes: 6 additions & 6 deletions src/krylov/_hypre_krylov_mup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ HYPRE_Int
hypre_BiCGSTABDestroy_long_dbl( void *bicgstab_vdata );

hypre_BiCGSTABFunctions *
hypre_BiCGSTABFunctionsCreate_flt( hypre_KrylovPtrToCreateVector CreateVector, hypre_KrylovPtrToDestroyVector DestroyVector, hypre_KrylovPtrToMatvecCreate MatvecCreate, hypre_KrylovPtrToMatvec Matvec, hypre_KrylovPtrToMatvecDestroy MatvecDestroy, hypre_KrylovPtrToInnerProd InnerProd, hypre_KrylovPtrToCopyVector CopyVector, hypre_KrylovPtrToClearVector ClearVector, hypre_KrylovPtrToScaleVector ScaleVector, hypre_KrylovPtrToAxpy Axpy, hypre_KrylovPtrToCommInfo CommInfo, hypre_KrylovPtrToPrecond Precond, hypre_KrylovPtrToPrecondSetup PrecondSetup );
hypre_BiCGSTABFunctionsCreate_flt( hypre_KrylovPtrToCreateVector CreateVector, hypre_KrylovPtrToDestroyVector DestroyVector, hypre_KrylovPtrToMatvecCreate MatvecCreate, hypre_KrylovPtrToMatvec Matvec, hypre_KrylovPtrToMatvecDestroy MatvecDestroy, hypre_KrylovPtrToInnerProd InnerProd, hypre_KrylovPtrToCopyVector CopyVector, hypre_KrylovPtrToClearVector ClearVector, hypre_KrylovPtrToScaleVector ScaleVector, hypre_KrylovPtrToAxpy Axpy, hypre_KrylovPtrToCommInfo CommInfo, hypre_KrylovPtrToPrecondSetup PrecondSetup, hypre_KrylovPtrToPrecond Precond );
hypre_BiCGSTABFunctions *
hypre_BiCGSTABFunctionsCreate_dbl( hypre_KrylovPtrToCreateVector CreateVector, hypre_KrylovPtrToDestroyVector DestroyVector, hypre_KrylovPtrToMatvecCreate MatvecCreate, hypre_KrylovPtrToMatvec Matvec, hypre_KrylovPtrToMatvecDestroy MatvecDestroy, hypre_KrylovPtrToInnerProd InnerProd, hypre_KrylovPtrToCopyVector CopyVector, hypre_KrylovPtrToClearVector ClearVector, hypre_KrylovPtrToScaleVector ScaleVector, hypre_KrylovPtrToAxpy Axpy, hypre_KrylovPtrToCommInfo CommInfo, hypre_KrylovPtrToPrecond Precond, hypre_KrylovPtrToPrecondSetup PrecondSetup );
hypre_BiCGSTABFunctionsCreate_dbl( hypre_KrylovPtrToCreateVector CreateVector, hypre_KrylovPtrToDestroyVector DestroyVector, hypre_KrylovPtrToMatvecCreate MatvecCreate, hypre_KrylovPtrToMatvec Matvec, hypre_KrylovPtrToMatvecDestroy MatvecDestroy, hypre_KrylovPtrToInnerProd InnerProd, hypre_KrylovPtrToCopyVector CopyVector, hypre_KrylovPtrToClearVector ClearVector, hypre_KrylovPtrToScaleVector ScaleVector, hypre_KrylovPtrToAxpy Axpy, hypre_KrylovPtrToCommInfo CommInfo, hypre_KrylovPtrToPrecondSetup PrecondSetup, hypre_KrylovPtrToPrecond Precond );
hypre_BiCGSTABFunctions *
hypre_BiCGSTABFunctionsCreate_long_dbl( hypre_KrylovPtrToCreateVector CreateVector, hypre_KrylovPtrToDestroyVector DestroyVector, hypre_KrylovPtrToMatvecCreate MatvecCreate, hypre_KrylovPtrToMatvec Matvec, hypre_KrylovPtrToMatvecDestroy MatvecDestroy, hypre_KrylovPtrToInnerProd InnerProd, hypre_KrylovPtrToCopyVector CopyVector, hypre_KrylovPtrToClearVector ClearVector, hypre_KrylovPtrToScaleVector ScaleVector, hypre_KrylovPtrToAxpy Axpy, hypre_KrylovPtrToCommInfo CommInfo, hypre_KrylovPtrToPrecond Precond, hypre_KrylovPtrToPrecondSetup PrecondSetup );
hypre_BiCGSTABFunctionsCreate_long_dbl( hypre_KrylovPtrToCreateVector CreateVector, hypre_KrylovPtrToDestroyVector DestroyVector, hypre_KrylovPtrToMatvecCreate MatvecCreate, hypre_KrylovPtrToMatvec Matvec, hypre_KrylovPtrToMatvecDestroy MatvecDestroy, hypre_KrylovPtrToInnerProd InnerProd, hypre_KrylovPtrToCopyVector CopyVector, hypre_KrylovPtrToClearVector ClearVector, hypre_KrylovPtrToScaleVector ScaleVector, hypre_KrylovPtrToAxpy Axpy, hypre_KrylovPtrToCommInfo CommInfo, hypre_KrylovPtrToPrecondSetup PrecondSetup, hypre_KrylovPtrToPrecond Precond );

HYPRE_Int
hypre_BiCGSTABGetConverged_flt( void *bicgstab_vdata, HYPRE_Int *converged );
Expand Down Expand Up @@ -756,11 +756,11 @@ HYPRE_Int
hypre_GMRESDestroy_long_dbl( void *gmres_vdata );

hypre_GMRESFunctions *
hypre_GMRESFunctionsCreate_flt( hypre_KrylovPtrToCAlloc CAlloc, hypre_KrylovPtrToFree Free, hypre_KrylovPtrToCommInfo CommInfo, hypre_KrylovPtrToCreateVector CreateVector, hypre_KrylovPtrToCreateVectorArray CreateVectorArray, hypre_KrylovPtrToDestroyVector DestroyVector, hypre_KrylovPtrToMatvecCreate MatvecCreate, hypre_KrylovPtrToMatvec Matvec, hypre_KrylovPtrToMatvecDestroy MatvecDestroy, hypre_KrylovPtrToInnerProdTagged InnerProd, hypre_KrylovPtrToCopyVector CopyVector, hypre_KrylovPtrToClearVector ClearVector, hypre_KrylovPtrToScaleVector ScaleVector, hypre_KrylovPtrToAxpy Axpy, hypre_KrylovPtrToPrecond Precond, hypre_KrylovPtrToPrecondSetup PrecondSetup );
hypre_GMRESFunctionsCreate_flt( hypre_KrylovPtrToCAlloc CAlloc, hypre_KrylovPtrToFree Free, hypre_KrylovPtrToCommInfo CommInfo, hypre_KrylovPtrToCreateVector CreateVector, hypre_KrylovPtrToCreateVectorArray CreateVectorArray, hypre_KrylovPtrToDestroyVector DestroyVector, hypre_KrylovPtrToMatvecCreate MatvecCreate, hypre_KrylovPtrToMatvec Matvec, hypre_KrylovPtrToMatvecDestroy MatvecDestroy, hypre_KrylovPtrToInnerProdTagged InnerProd, hypre_KrylovPtrToCopyVector CopyVector, hypre_KrylovPtrToClearVector ClearVector, hypre_KrylovPtrToScaleVector ScaleVector, hypre_KrylovPtrToAxpy Axpy, hypre_KrylovPtrToPrecondSetup PrecondSetup, hypre_KrylovPtrToPrecond Precond );
hypre_GMRESFunctions *
hypre_GMRESFunctionsCreate_dbl( hypre_KrylovPtrToCAlloc CAlloc, hypre_KrylovPtrToFree Free, hypre_KrylovPtrToCommInfo CommInfo, hypre_KrylovPtrToCreateVector CreateVector, hypre_KrylovPtrToCreateVectorArray CreateVectorArray, hypre_KrylovPtrToDestroyVector DestroyVector, hypre_KrylovPtrToMatvecCreate MatvecCreate, hypre_KrylovPtrToMatvec Matvec, hypre_KrylovPtrToMatvecDestroy MatvecDestroy, hypre_KrylovPtrToInnerProdTagged InnerProd, hypre_KrylovPtrToCopyVector CopyVector, hypre_KrylovPtrToClearVector ClearVector, hypre_KrylovPtrToScaleVector ScaleVector, hypre_KrylovPtrToAxpy Axpy, hypre_KrylovPtrToPrecond Precond, hypre_KrylovPtrToPrecondSetup PrecondSetup );
hypre_GMRESFunctionsCreate_dbl( hypre_KrylovPtrToCAlloc CAlloc, hypre_KrylovPtrToFree Free, hypre_KrylovPtrToCommInfo CommInfo, hypre_KrylovPtrToCreateVector CreateVector, hypre_KrylovPtrToCreateVectorArray CreateVectorArray, hypre_KrylovPtrToDestroyVector DestroyVector, hypre_KrylovPtrToMatvecCreate MatvecCreate, hypre_KrylovPtrToMatvec Matvec, hypre_KrylovPtrToMatvecDestroy MatvecDestroy, hypre_KrylovPtrToInnerProdTagged InnerProd, hypre_KrylovPtrToCopyVector CopyVector, hypre_KrylovPtrToClearVector ClearVector, hypre_KrylovPtrToScaleVector ScaleVector, hypre_KrylovPtrToAxpy Axpy, hypre_KrylovPtrToPrecondSetup PrecondSetup, hypre_KrylovPtrToPrecond Precond );
hypre_GMRESFunctions *
hypre_GMRESFunctionsCreate_long_dbl( hypre_KrylovPtrToCAlloc CAlloc, hypre_KrylovPtrToFree Free, hypre_KrylovPtrToCommInfo CommInfo, hypre_KrylovPtrToCreateVector CreateVector, hypre_KrylovPtrToCreateVectorArray CreateVectorArray, hypre_KrylovPtrToDestroyVector DestroyVector, hypre_KrylovPtrToMatvecCreate MatvecCreate, hypre_KrylovPtrToMatvec Matvec, hypre_KrylovPtrToMatvecDestroy MatvecDestroy, hypre_KrylovPtrToInnerProdTagged InnerProd, hypre_KrylovPtrToCopyVector CopyVector, hypre_KrylovPtrToClearVector ClearVector, hypre_KrylovPtrToScaleVector ScaleVector, hypre_KrylovPtrToAxpy Axpy, hypre_KrylovPtrToPrecond Precond, hypre_KrylovPtrToPrecondSetup PrecondSetup );
hypre_GMRESFunctionsCreate_long_dbl( hypre_KrylovPtrToCAlloc CAlloc, hypre_KrylovPtrToFree Free, hypre_KrylovPtrToCommInfo CommInfo, hypre_KrylovPtrToCreateVector CreateVector, hypre_KrylovPtrToCreateVectorArray CreateVectorArray, hypre_KrylovPtrToDestroyVector DestroyVector, hypre_KrylovPtrToMatvecCreate MatvecCreate, hypre_KrylovPtrToMatvec Matvec, hypre_KrylovPtrToMatvecDestroy MatvecDestroy, hypre_KrylovPtrToInnerProdTagged InnerProd, hypre_KrylovPtrToCopyVector CopyVector, hypre_KrylovPtrToClearVector ClearVector, hypre_KrylovPtrToScaleVector ScaleVector, hypre_KrylovPtrToAxpy Axpy, hypre_KrylovPtrToPrecondSetup PrecondSetup, hypre_KrylovPtrToPrecond Precond );

HYPRE_Int
hypre_GMRESGetAbsoluteTol_flt( void *gmres_vdata, hypre_float *a_tol );
Expand Down
54 changes: 28 additions & 26 deletions src/krylov/bicgstab.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,19 @@

hypre_BiCGSTABFunctions *
hypre_BiCGSTABFunctionsCreate(
void * (*CreateVector) ( void *vvector ),
HYPRE_Int (*DestroyVector) ( void *vvector ),
void * (*MatvecCreate) ( void *A, void *x ),
HYPRE_Int (*Matvec) ( void *matvec_data, HYPRE_Complex alpha, void *A,
void *x, HYPRE_Complex beta, void *y ),
HYPRE_Int (*MatvecDestroy) ( void *matvec_data ),
HYPRE_Real (*InnerProd) ( void *x, void *y ),
HYPRE_Int (*CopyVector) ( void *x, void *y ),
HYPRE_Int (*ClearVector) ( void *x ),
HYPRE_Int (*ScaleVector) ( HYPRE_Complex alpha, void *x ),
HYPRE_Int (*Axpy) ( HYPRE_Complex alpha, void *x, void *y ),
HYPRE_Int (*CommInfo) ( void *A, HYPRE_Int *my_id,
HYPRE_Int *num_procs ),
HYPRE_Int (*PrecondSetup) ( void *vdata, void *A, void *b, void *x ),
HYPRE_Int (*Precond) ( void *vdata, void *A, void *b, void *x )
hypre_KrylovPtrToCreateVector CreateVector,
hypre_KrylovPtrToDestroyVector DestroyVector,
hypre_KrylovPtrToMatvecCreate MatvecCreate,
hypre_KrylovPtrToMatvec Matvec,
hypre_KrylovPtrToMatvecDestroy MatvecDestroy,
hypre_KrylovPtrToInnerProd InnerProd,
hypre_KrylovPtrToCopyVector CopyVector,
hypre_KrylovPtrToClearVector ClearVector,
hypre_KrylovPtrToScaleVector ScaleVector,
hypre_KrylovPtrToAxpy Axpy,
hypre_KrylovPtrToCommInfo CommInfo,
hypre_KrylovPtrToPrecondSetup PrecondSetup,
hypre_KrylovPtrToPrecond Precond
)
{
hypre_BiCGSTABFunctions * bicgstab_functions;
Expand Down Expand Up @@ -149,22 +147,20 @@ hypre_BiCGSTABSetup( void *bicgstab_vdata,
hypre_BiCGSTABFunctions *bicgstab_functions = bicgstab_data->functions;

HYPRE_Int max_iter = (bicgstab_data -> max_iter);
HYPRE_Int (*precond_setup)(void*, void*, void*,
void*) = (bicgstab_functions -> precond_setup);
hypre_KrylovPtrToPrecondSetup precond_setup = (bicgstab_functions -> precond_setup);
void *precond_data = (bicgstab_data -> precond_data);
void *precond_Mat = (bicgstab_data -> precond_Mat);

HYPRE_ANNOTATE_FUNC_BEGIN;

//set preconditioning matrix
if ((bicgstab_data -> precond_Mat) == NULL)
(bicgstab_data -> A) = A;

// if a preconditioning matrix has not been set, use A
if (precond_Mat == NULL)
{
(bicgstab_data -> precond_Mat) = A;
precond_Mat = (bicgstab_data -> precond_Mat) ;
precond_Mat = A;
}

(bicgstab_data -> A) = A;

/*--------------------------------------------------
* The arguments for NewVector are important to
* maintain consistency between the setup and
Expand Down Expand Up @@ -258,7 +254,7 @@ hypre_BiCGSTABSolve(void *bicgstab_vdata,
void *p = (bicgstab_data -> p);
void *q = (bicgstab_data -> q);

HYPRE_Int (*precond)(void*, void*, void*, void*) = (bicgstab_functions -> precond);
hypre_KrylovPtrToPrecond precond = (bicgstab_functions -> precond);
HYPRE_Int *precond_data = (HYPRE_Int*)(bicgstab_data -> precond_data);
// preconditioning matrix
void *precond_Mat = (bicgstab_data -> precond_Mat) ;
Expand All @@ -285,6 +281,12 @@ hypre_BiCGSTABSolve(void *bicgstab_vdata,

HYPRE_ANNOTATE_FUNC_BEGIN;

// if a preconditioning matrix has not been set, use A
if (precond_Mat == NULL)
{
precond_Mat = A;
}

(bicgstab_data -> converged) = 0;

(*(bicgstab_functions->CommInfo))(A, &my_id, &num_procs);
Expand Down Expand Up @@ -683,8 +685,8 @@ hypre_BiCGSTABSetStopCrit( void *bicgstab_vdata,

HYPRE_Int
hypre_BiCGSTABSetPrecond( void *bicgstab_vdata,
HYPRE_Int (*precond)(void*, void*, void*, void*),
HYPRE_Int (*precond_setup)(void*, void*, void*, void*),
hypre_KrylovPtrToPrecond precond,
hypre_KrylovPtrToPrecondSetup precond_setup,
void *precond_data )
{
hypre_BiCGSTABData *bicgstab_data = (hypre_BiCGSTABData *)bicgstab_vdata;
Expand Down
4 changes: 2 additions & 2 deletions src/krylov/bicgstab.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ hypre_BiCGSTABFunctionsCreate(
hypre_KrylovPtrToScaleVector ScaleVector,
hypre_KrylovPtrToAxpy Axpy,
hypre_KrylovPtrToCommInfo CommInfo,
hypre_KrylovPtrToPrecond Precond,
hypre_KrylovPtrToPrecondSetup PrecondSetup
hypre_KrylovPtrToPrecondSetup PrecondSetup,
hypre_KrylovPtrToPrecond Precond
);

/**
Expand Down
45 changes: 21 additions & 24 deletions src/krylov/cgnr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,21 @@

hypre_CGNRFunctions *
hypre_CGNRFunctionsCreate(
HYPRE_Int (*CommInfo) ( void *A, HYPRE_Int *my_id,
HYPRE_Int *num_procs ),
void * (*CreateVector) ( void *vector ),
HYPRE_Int (*DestroyVector) ( void *vector ),
void * (*MatvecCreate) ( void *A, void *x ),
HYPRE_Int (*Matvec) ( void *matvec_data, HYPRE_Complex alpha, void *A,
void *x, HYPRE_Complex beta, void *y ),
HYPRE_Int (*MatvecT) ( void *matvec_data, HYPRE_Complex alpha, void *A,
void *x, HYPRE_Complex beta, void *y ),
HYPRE_Int (*MatvecDestroy) ( void *matvec_data ),
HYPRE_Real (*InnerProd) ( void *x, void *y ),
HYPRE_Int (*CopyVector) ( void *x, void *y ),
HYPRE_Int (*ClearVector) ( void *x ),
HYPRE_Int (*ScaleVector) ( HYPRE_Complex alpha, void *x ),
HYPRE_Int (*Axpy) ( HYPRE_Complex alpha, void *x, void *y ),
HYPRE_Int (*PrecondSetup) ( void *vdata, void *A, void *b, void *x ),
HYPRE_Int (*Precond) ( void *vdata, void *A, void *b, void *x ),
HYPRE_Int (*PrecondT) ( void *vdata, void *A, void *b, void *x )
hypre_KrylovPtrToCommInfo CommInfo,
hypre_KrylovPtrToCreateVector CreateVector,
hypre_KrylovPtrToDestroyVector DestroyVector,
hypre_KrylovPtrToMatvecCreate MatvecCreate,
hypre_KrylovPtrToMatvec Matvec,
hypre_KrylovPtrToMatvecT MatvecT,
hypre_KrylovPtrToMatvecDestroy MatvecDestroy,
hypre_KrylovPtrToInnerProd InnerProd,
hypre_KrylovPtrToCopyVector CopyVector,
hypre_KrylovPtrToClearVector ClearVector,
hypre_KrylovPtrToScaleVector ScaleVector,
hypre_KrylovPtrToAxpy Axpy,
hypre_KrylovPtrToPrecondSetup PrecondSetup,
hypre_KrylovPtrToPrecond Precond,
hypre_KrylovPtrToPrecondT PrecondT
)
{
hypre_CGNRFunctions * cgnr_functions;
Expand Down Expand Up @@ -144,7 +141,7 @@ hypre_CGNRSetup(void *cgnr_vdata,
hypre_CGNRFunctions *cgnr_functions = cgnr_data->functions;

HYPRE_Int max_iter = (cgnr_data -> max_iter);
HYPRE_Int (*precond_setup)(void*, void*, void*, void*) = (cgnr_functions -> precond_setup);
hypre_KrylovPtrToPrecondSetup precond_setup = (cgnr_functions -> precond_setup);
void *precond_data = (cgnr_data -> precond_data);
HYPRE_Int ierr = 0;

Expand Down Expand Up @@ -203,8 +200,8 @@ hypre_CGNRSolve(void *cgnr_vdata,
void *r = (cgnr_data -> r);
void *t = (cgnr_data -> t);
void *matvec_data = (cgnr_data -> matvec_data);
HYPRE_Int (*precond)(void*, void*, void*, void*) = (cgnr_functions -> precond);
HYPRE_Int (*precondT)(void*, void*, void*, void*) = (cgnr_functions -> precondT);
hypre_KrylovPtrToPrecond precond = (cgnr_functions -> precond);
hypre_KrylovPtrToPrecondT precondT = (cgnr_functions -> precondT);
void *precond_data = (cgnr_data -> precond_data);
HYPRE_Int logging = (cgnr_data -> logging);
HYPRE_Real *norms = (cgnr_data -> norms);
Expand Down Expand Up @@ -523,9 +520,9 @@ hypre_CGNRSetStopCrit( void *cgnr_vdata,

HYPRE_Int
hypre_CGNRSetPrecond(void *cgnr_vdata,
HYPRE_Int (*precond)(void*, void*, void*, void*),
HYPRE_Int (*precondT)(void*, void*, void*, void*),
HYPRE_Int (*precond_setup)(void*, void*, void*, void*),
hypre_KrylovPtrToPrecond precond,
hypre_KrylovPtrToPrecondT precondT,
hypre_KrylovPtrToPrecondSetup precond_setup,
void *precond_data )
{
hypre_CGNRData *cgnr_data = (hypre_CGNRData *)cgnr_vdata;
Expand Down
Loading