fdurastante
/
amg4psblas
mirror of https://github.com/sfilippone/amg4psblas.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update handling of AMG_SLU_VERSION in configure and interface

Browse Source
gpucinterfaces
sfilippone 7 months ago
parent a6267d8e67
commit b5df1842e0
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File

8
amgprec/impl/amg_cslu_interface.c
Unescape Escape View File

@ -112,7 +112,7 @@ typedef struct {
int amg_cslu_fact(int n, int nnz, int amg_cslu_fact(int n, int nnz,
#ifdef AMG_HAVE_SLU #ifdef AMG_HAVE_SLU
#if defined(AMG_SLU_VERSION_7) #if (AMG_SLU_VERSION >= 7)
singlecomplex *values, singlecomplex *values,
#else #else
complex *values, complex *values,
@ -181,10 +181,10 @@ int amg_cslu_fact(int n, int nnz,
panel_size = sp_ienv(1); panel_size = sp_ienv(1);
relax = sp_ienv(2); relax = sp_ienv(2);
#if defined(AMG_SLU_VERSION_7) ||defined(AMG_SLU_VERSION_5) #if (AMG_SLU_VERSION >= 7) || (AMG_SLU_VERSION == 5)
cgstrf(&options, &AC, relax, panel_size, etree, cgstrf(&options, &AC, relax, panel_size, etree,
NULL, 0, perm_c, perm_r, L, U, &Glu, &stat, &info); NULL, 0, perm_c, perm_r, L, U, &Glu, &stat, &info);
#elif defined(AMG_SLU_VERSION_4) #elif (AMG_SLU_VERSION == 4)
cgstrf(&options, &AC, relax, panel_size, etree, cgstrf(&options, &AC, relax, panel_size, etree,
NULL, 0, perm_c, perm_r, L, U, &stat, &info); NULL, 0, perm_c, perm_r, L, U, &stat, &info);
#else #else
@ -234,7 +234,7 @@ int amg_cslu_fact(int n, int nnz,
int amg_cslu_solve(int itrans, int n, int nrhs, int amg_cslu_solve(int itrans, int n, int nrhs,
#ifdef AMG_HAVE_SLU #ifdef AMG_HAVE_SLU
#if defined(AMG_SLU_VERSION_7) #if (AMG_SLU_VERSION == 7)
singlecomplex *b, singlecomplex *b,
#else #else
complex *b, complex *b,

4
amgprec/impl/amg_dslu_interface.c
Unescape Escape View File

@ -171,10 +171,10 @@ int amg_dslu_fact(int n, int nnz, double *values,
panel_size = sp_ienv(1); panel_size = sp_ienv(1);
relax = sp_ienv(2); relax = sp_ienv(2);
#if defined(AMG_SLU_VERSION_7) ||defined(AMG_SLU_VERSION_5) #if (AMG_SLU_VERSION >= 7) || (AMG_SLU_VERSION == 5)
dgstrf(&options, &AC, relax, panel_size, etree, dgstrf(&options, &AC, relax, panel_size, etree,
NULL, 0, perm_c, perm_r, L, U, &Glu, &stat, &info); NULL, 0, perm_c, perm_r, L, U, &Glu, &stat, &info);
#elif defined(AMG_SLU_VERSION_4) #elif (AMG_SLU_VERSION == 4)
dgstrf(&options, &AC, relax, panel_size, etree, dgstrf(&options, &AC, relax, panel_size, etree,
NULL, 0, perm_c, perm_r, L, U, &stat, &info); NULL, 0, perm_c, perm_r, L, U, &stat, &info);
#else #else

4
amgprec/impl/amg_sslu_interface.c
Unescape Escape View File

@ -172,10 +172,10 @@ int amg_sslu_fact(int n, int nnz, float *values,
panel_size = sp_ienv(1); panel_size = sp_ienv(1);
relax = sp_ienv(2); relax = sp_ienv(2);
#if defined(AMG_SLU_VERSION_7) ||defined(AMG_SLU_VERSION_5) #if (AMG_SLU_VERSION >= 7) || (AMG_SLU_VERSION == 5)
sgstrf(&options, &AC, relax, panel_size, sgstrf(&options, &AC, relax, panel_size,
etree, NULL, 0, perm_c, perm_r, L, U, &Glu, &stat, &info); etree, NULL, 0, perm_c, perm_r, L, U, &Glu, &stat, &info);
#elif defined(AMG_SLU_VERSION_4) #elif (AMG_SLU_VERSION == 4)
sgstrf(&options, &AC, relax, panel_size, sgstrf(&options, &AC, relax, panel_size,
etree, NULL, 0, perm_c, perm_r, L, U, &stat, &info); etree, NULL, 0, perm_c, perm_r, L, U, &stat, &info);
#else #else

4
amgprec/impl/amg_zslu_interface.c
Unescape Escape View File

@ -176,10 +176,10 @@ int amg_zslu_fact(int n, int nnz,
panel_size = sp_ienv(1); panel_size = sp_ienv(1);
relax = sp_ienv(2); relax = sp_ienv(2);
#if defined(AMG_SLU_VERSION_7) ||defined(AMG_SLU_VERSION_5) #if (AMG_SLU_VERSION >= 7) || (AMG_SLU_VERSION == 5)
zgstrf(&options, &AC, relax, panel_size, etree, zgstrf(&options, &AC, relax, panel_size, etree,
NULL, 0, perm_c, perm_r, L, U, &Glu, &stat, &info); NULL, 0, perm_c, perm_r, L, U, &Glu, &stat, &info);
#elif defined(AMG_SLU_VERSION_4) #elif (AMG_SLU_VERSION == 4)
zgstrf(&options, &AC, relax, panel_size, etree, zgstrf(&options, &AC, relax, panel_size, etree,
NULL, 0, perm_c, perm_r, L, U, &stat, &info); NULL, 0, perm_c, perm_r, L, U, &stat, &info);
#else #else

2
configure vendored
Unescape Escape View File

@ -10983,7 +10983,7 @@ if test "x$amg4psblas_cv_have_superlu" == "xyes" ; then
SLU_FLAGS="-DAMG_SLU_VERSION_$pac_slu_version $SLU_INCLUDES" SLU_FLAGS="-DAMG_SLU_VERSION_$pac_slu_version $SLU_INCLUDES"
FDEFINES="$amg_cv_define_prepend-DAMG_HAVE_SLU $FDEFINES" FDEFINES="$amg_cv_define_prepend-DAMG_HAVE_SLU $FDEFINES"
CHAVESLU="#define AMG_HAVE_SLU" CHAVESLU="#define AMG_HAVE_SLU"
CSLUVERSION="#define AMG_SLU_VERSION_$pac_slu_version" CSLUVERSION="#define AMG_SLU_VERSION $pac_slu_version"
else else
SLU_FLAGS="" SLU_FLAGS=""
fi fi

2
configure.ac
Unescape Escape View File

@ -792,7 +792,7 @@ if test "x$amg4psblas_cv_have_superlu" == "xyes" ; then
SLU_FLAGS="-DAMG_SLU_VERSION_$pac_slu_version $SLU_INCLUDES" SLU_FLAGS="-DAMG_SLU_VERSION_$pac_slu_version $SLU_INCLUDES"
FDEFINES="$amg_cv_define_prepend-DAMG_HAVE_SLU $FDEFINES" FDEFINES="$amg_cv_define_prepend-DAMG_HAVE_SLU $FDEFINES"
CHAVESLU="#define AMG_HAVE_SLU" CHAVESLU="#define AMG_HAVE_SLU"
CSLUVERSION="#define AMG_SLU_VERSION_$pac_slu_version" CSLUVERSION="#define AMG_SLU_VERSION $pac_slu_version"
else else
SLU_FLAGS="" SLU_FLAGS=""
fi fi

Write Preview
Loading…
Cancel
Save