fdurastante/amg4psblas
1
0
Fork 0
mirror of https://github.com/sfilippone/amg4psblas.git synced 2026-10-20 21:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix use of BIT64 in MatchBox

Browse Source
This commit is contained in:
sfilippone
2025-03-22 20:29:44 +01:00
parent b9cf9dca06
commit afb5d9da76
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amgprec/amg_config.h.in
+1
View File
@@ -11,6 +11,7 @@
@CHAVEMUMPS@
@CHAVEMUMPSMODULES@
@CHAVEMUMPSINCLUDES@
@CXXMATCHBOXBIT@
#endif
amgprec/impl/aggregator/MatchBoxPC.h
+2 -2
View File
@@ -117,7 +117,7 @@ extern "C"
// Regular long integer:
#ifndef LONG_INT_H
#define LONG_INT_H
#ifdef BIT64
#ifdef AMG_MATCHBOXP_BIT64
typedef int64_t MilanLongInt;
typedef MPI_LONG MilanMpiLongInt;
#else
@@ -163,7 +163,7 @@ extern "C"
#define MilanIntMax INT32_MAX
#define MilanIntMin INT32_MIN
#ifdef BIT64
#ifdef AMG_MATCHBOXP_BIT64
#define MilanLongIntMax INT64_MAX
#define MilanLongIntMin -INT64_MAX
#else
amgprec/impl/aggregator/primitiveDataTypeDefinitions.h
+4 -4
View File
@@ -49,8 +49,8 @@
using namespace std;
//Comment out these if you do not need 64 bits.
//#ifndef BIT64
// #define BIT64
//#ifndef AMG_MATCHBOXP_BIT64
// #define AMG_MATCHBOXP_BIT64
//#endif
//Regular integer:
@@ -63,7 +63,7 @@ using namespace std;
//Regular long Integer:
#ifndef LONG_INT_H
#define LONG_INT_H
#ifdef BIT64
#ifdef AMG_MATCHBOXP_BIT64
typedef int64_t MilanLongInt;
// typedef MPI_LONG MilanMpiLongInt;
#else
@@ -108,7 +108,7 @@ using namespace std;
#define MilanIntMax INT_MAX
#define MilanIntMin INT_MIN
#ifdef BIT64
#ifdef AMG_MATCHBOXP_BIT64
#define MilanLongIntMax LONG_MAX
#define MilanLongIntMin -LONG_MAX
#else
configure
Vendored
+2 -1
View File
@@ -667,6 +667,7 @@ SLU_FLAGS
MUMPS_LIBS
MUMPS_FLAGS
EXTRA_LIBS
CXXMATCHBOXBIT
CHAVEMUMPSINCLUDES
CHAVEMUMPSMODULES
CHAVEMUMPS
@@ -7858,7 +7859,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: PSBLAS size of LPK \"$pac_cv_psblas_lpk\"." >&5
printf "%s\n" "$as_me: PSBLAS size of LPK \"$pac_cv_psblas_lpk\"." >&6;}
if test x"$pac_cv_psblas_lpk" == x8"" ; then
CXXDEFINES="$CXXDEFINES";
CXXMATCHBOXBIT="#define AMG_MATCHBOXP_BIT64"
fi
###############################################################################
configure.ac
+2 -2
View File
@@ -595,7 +595,7 @@ fi
PAC_FORTRAN_PSBLAS_INTEGER_SIZES()
AC_MSG_NOTICE([PSBLAS size of LPK "$pac_cv_psblas_lpk".])
if test x"$pac_cv_psblas_lpk" == x8"" ; then
CXXDEFINES="$CXXDEFINES";
CXXMATCHBOXBIT="#define AMG_MATCHBOXP_BIT64"
fi
###############################################################################
@@ -853,7 +853,7 @@ AC_SUBST(CSLUDISTVERSION)
AC_SUBST(CHAVEMUMPS)
AC_SUBST(CHAVEMUMPSMODULES)
AC_SUBST(CHAVEMUMPSINCLUDES)
AC_SUBST(CXXMATCHBOXBIT)
AC_SUBST(EXTRA_LIBS)