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

Jump to bottom

In Aleph/PETSc backend in parallel use 'BlockJacobi' preconditionner instead of ILU or IC #789

Merged
merged 2 commits into from
Jul 6, 2023
Merged

In Aleph/PETSc backend in parallel use 'BlockJacobi' preconditionner instead of ILU or IC #789

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55cbd83
[arcane,aleph] Dans le backend 'PETSc', utilise 'BlockJacobi' comme p…
grospelliergilles Jul 6, 2023
c8fdff6
[arcane,aleph] Corrige compilation avec les versions de PETSc antérie…
grospelliergilles Jul 6, 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
53 changes: 45 additions & 8 deletions arcane/src/arcane/aleph/petsc/AlephPETSc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,28 @@
namespace Arcane
{

namespace
{

inline void
petscCheck(PetscErrorCode error_code)
{
// Note GG: Je ne sais pas vraiment à partir de quelle version de PETSc
// la valeur 'PETSC_SUCCESS' la fonction 'PetscCallVoid' sont
// disponibles mais elles le sont dans la 3.18.0.
#if PETSC_VERSION_GE(3,18,0)
if (error_code==PETSC_SUCCESS)
return;
PetscCallVoid(error_code);
ARCANE_FATAL("Error in PETSc backend errcode={0}",error_code);
#else
if (error_code!=0)
ARCANE_FATAL("Error in PETSc backend errcode={0}",error_code);
#endif
}

}

/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/

Expand Down Expand Up @@ -214,7 +236,7 @@ _checkInitPETSc()
debug() << Trace::Color::cyan() << "[AlephTopologyPETSc] Initializing PETSc. UseArg=" << has_args;
if (has_args){
const CommandLineArguments& args = init_args.commandLineArguments();
PetscInitialize(args.commandLineArgc(),args.commandLineArgv(),PETSC_NULL,PETSC_NULL);
PetscInitialize(args.commandLineArgc(),args.commandLineArgv(),nullptr,nullptr);
}
else{
PetscInitializeNoArguments();
Expand Down Expand Up @@ -364,10 +386,10 @@ AlephMatrixCreate(void)
m_kernel->topology()->nb_row_size(), // M = number of global rows
m_kernel->topology()->nb_row_size(), // N = number of global columns
0, // ignored (number of nonzeros per row in DIAGONAL portion of local submatrix)
// array containing the number of nonzeros in the various rows of the DIAGONAL portion of local submatrix
// array containing the number of nonzeros in the various rows of the DIAGONAL portion of local submatrix
m_kernel->topology()->gathered_nb_row_elements().subView(ilower,size).unguardedBasePointer(),
0, // ignored (number of nonzeros per row in the OFF-DIAGONAL portion of local submatrix)
// array containing the number of nonzeros in the various rows of the OFF-DIAGONAL portion of local submatrix
// array containing the number of nonzeros in the various rows of the OFF-DIAGONAL portion of local submatrix
m_kernel->topology()->gathered_nb_row_elements().subView(ilower,size).unguardedBasePointer(),
&m_petsc_matrix);
MatSetOption(m_petsc_matrix, MAT_NEW_NONZERO_LOCATION_ERR, PETSC_FALSE);
Expand Down Expand Up @@ -470,6 +492,7 @@ AlephMatrixSolve(AlephVector* x,AlephVector* b,AlephVector* t,

ARCANE_CHECK_POINTER(x_petsc);
ARCANE_CHECK_POINTER(b_petsc);
const bool is_parallel = m_kernel->subParallelMng(m_index)->isParallel();

Vec solution = x_petsc->m_petsc_vector;
Vec RHS = b_petsc->m_petsc_vector;
Expand All @@ -496,14 +519,27 @@ AlephMatrixSolve(AlephVector* x,AlephVector* b,AlephVector* t,
}

KSPGetPC(m_ksp_solver,&prec);

switch(solver_param->precond()){
case TypesSolver::NONE : PCSetType(prec,PCNONE); break;
// Jacobi (i.e. diagonal scaling preconditioning)
case TypesSolver::DIAGONAL : PCSetType(prec,PCJACOBI); break;
// Incomplete factorization preconditioners.
case TypesSolver::ILU : PCSetType(prec,PCILU); break;
case TypesSolver::ILU:
// ILU ne fonctionne pas en parallèle avec PETSc (sauf si compilé avec Hypre)
if (is_parallel)
PCSetType(prec,PCBJACOBI);
else
PCSetType(prec,PCILU);
break;
// Incomplete Cholesky factorization preconditioners.
case TypesSolver::IC : PCSetType(prec,PCICC); break;
case TypesSolver::IC:
// IC ne fonctionne pas en parallèle avec PETSc.
if (is_parallel)
PCSetType(prec,PCBJACOBI);
else
PCSetType(prec,PCICC);
break;
// Sparse Approximate Inverse method of Grote and Barnard as a preconditioner (SIAM J. Sci. Comput.; vol 18, nr 3)
case TypesSolver::SPAIstat : PCSetType(prec,PCSPAI); break;
// Use multigrid preconditioning.
Expand Down Expand Up @@ -569,13 +605,14 @@ AlephMatrixSolve(AlephVector* x,AlephVector* b,AlephVector* t,
KSPGetType(m_ksp_solver,&kt);
PCType pt;
PCGetType(prec,&pt);
debug()<<"[AlephMatrixSolve] Will use KSP type :" << kt << " PC type : "<< pt ;
info(4) << "[AlephMatrixSolve] Will use KSP type :" << kt << " PC type : "<< pt
<< " is_parallel=" << is_parallel;

// solve the linear system //
debug()<<"[AlephMatrixSolve] All set up, now solving";
KSPSolve(m_ksp_solver,RHS,solution);
petscCheck(KSPSolve(m_ksp_solver,RHS,solution));
debug()<<"[AlephMatrixSolve] solved";
KSPGetConvergedReason(m_ksp_solver,&reason);
petscCheck(KSPGetConvergedReason(m_ksp_solver,&reason));

switch(reason){
#if !PETSC_VERSION_(3,0,0)
Expand Down
Loading