Skip to content

Commit

Permalink
CHG: removing SLEPSC and ADIC2 that we have never used
Browse files Browse the repository at this point in the history
  • Loading branch information
MathieuMorlighem committed Jun 22, 2024
1 parent bf9c1e1 commit 938aaa9
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 98 deletions.
97 changes: 0 additions & 97 deletions m4/issm_options.m4
Original file line number Diff line number Diff line change
Expand Up @@ -1038,34 +1038,6 @@ AC_DEFUN([ISSM_OPTIONS],[
AC_DEFINE_UNQUOTED([_ADOLC_VERSION_], ${ADOLC_VERSION}, [ADOL-C version])
AC_MSG_RESULT(${ADOLC_VERSION})
dnl }}}
dnl ADIC2 {{{
AC_MSG_CHECKING([for ADIC2])
AC_ARG_WITH(
[adic2-dir],
AS_HELP_STRING([--with-adic2-dir=DIR], [ADIC2 root directory]),
[ADIC2_ROOT=${withval}],
[ADIC2_ROOT="no"]
)
if test "x${ADIC2_ROOT}" == "xno"; then
HAVE_ADIC2=no
else
HAVE_ADIC2=yes
if ! test -d "${ADIC2_ROOT}"; then
AC_MSG_ERROR([ADIC2 directory provided (${ADIC2_ROOT}) does not exist!]);
fi
fi
AC_MSG_RESULT([${HAVE_ADIC2}])
dnl ADIC2 libraries and header files
if test "x${HAVE_ADIC2}" == "xyes"; then
ADIC2INCL="-DADIC2_DENSE -I${ADIC2_ROOT}/include -I${ADIC2_ROOT}/share/runtime_dense"
ADIC2LIB=""
AC_DEFINE([_HAVE_ADIC2_], [1], [with ADIC2 in ISSM src])
AC_SUBST([ADIC2INCL])
AC_SUBST([ADIC2LIB])
fi
AM_CONDITIONAL([ADIC2], [test "x${HAVE_ADIC2}" == "xyes"])
dnl }}}
dnl ATLAS {{{
AC_MSG_CHECKING(for ATLAS and CBLAS libraries)
AC_ARG_WITH(
Expand Down Expand Up @@ -1677,33 +1649,6 @@ AC_DEFUN([ISSM_OPTIONS],[
fi
AM_CONDITIONAL([PROJ], [test "x${HAVE_PROJ}" == "xyes"])
dnl }}}
dnl SLEPc{{{
AC_MSG_CHECKING([for SLEPc])
AC_ARG_WITH(
[slepc-dir],
AS_HELP_STRING([--with-slepc-dir=DIR], [SLEPc root directory]),
[SLEPC_ROOT=${withval}],
[SLEPC_ROOT="no"]
)
if test "x${SLEPC_ROOT}" == "xno"; then
HAVE_SLEPC=no
else
HAVE_SLEPC=yes
if ! test -d "${SLEPC_ROOT}"; then
AC_MSG_ERROR([SLEPc directory provided (${SLEPC_ROOT}) does not exist!]);
fi
fi
AC_MSG_RESULT([${HAVE_SLEPC}])
dnl SLEPc libraries and header files
if test "x${HAVE_SLEPC}" == "xyes"; then
SLEPCINCL="-I${SLEPC_ROOT}/include"
SLEPCLIB="-L${SLEPC_ROOT}/lib -lslepc"
AC_DEFINE([_HAVE_SLEPC_], [1], [with SLEPc in ISSM src])
AC_SUBST([SLEPCINCL])
AC_SUBST([SLEPCLIB])
fi
dnl }}}
dnl shapelib{{{
AC_MSG_CHECKING([for shapelib])
AC_ARG_WITH(
Expand Down Expand Up @@ -2232,7 +2177,6 @@ AC_DEFUN([ISSM_OPTIONS],[
AC_SUBST([PASTIXLIB])
fi
dnl }}}
dnl }}}
dnl ml{{{
AC_MSG_CHECKING([for ml])
AC_ARG_WITH(
Expand Down Expand Up @@ -2380,31 +2324,6 @@ AC_DEFUN([ISSM_OPTIONS],[
fi
AM_CONDITIONAL([HAVE_FORTRANDIR], [test "x${IS_FORTRANDIR_A_DIR}" == "xyes"])
dnl }}}
dnl Xlib (graphics library){{{
AC_MSG_CHECKING([for Xlib (graphics library)])
AC_ARG_WITH(
[graphics-lib],
AS_HELP_STRING([--with-graphics-lib=options], [Xlib (graphics library) to use]),
[GRAPHICS_LIB=${withval}],
[GRAPHICS_LIB=""]
)
if test -n "${GRAPHICS_LIB}"; then
GRAPHICS_DIR=$(echo ${GRAPHICS_LIB} | sed -e "s/-L//g" | awk '{print $[1]}')
if test -d "${GRAPHICS_DIR}" || test -f "${GRAPHICS_DIR}"; then
HAVE_GRAPHICS=yes
GRAPHICSLIB="${GRAPHICS_LIB}"
AC_DEFINE([_HAVE_GRAPHICS_], [1], [with Xlib (graphics library) in ISSM src])
AC_SUBST([GRAPHICSLIB])
else
if test -f "${PETSC_ROOT}/conf/petscvariables"; then
PETSC_REC_GRAPHICS_LIB=$(cat ${PETSC_ROOT}/conf/petscvariables | grep X_LIB)
AC_MSG_ERROR([Xlib (graphics library) provided (${GRAPHICS_LIB}) does not exist! PETSc suggests the following library: ${PETSC_REC_GRAPHICS_LIB}]);
fi
AC_MSG_ERROR([Xlib (graphics library) provided (${GRAPHICS_LIB}) does not exist!]);
fi
fi
AC_MSG_RESULT([done])
dnl }}}
dnl MeteoIO{{{
AC_MSG_CHECKING([for MeteoIO])
AC_ARG_WITH(
Expand Down Expand Up @@ -2611,22 +2530,6 @@ AC_DEFUN([ISSM_OPTIONS],[
AX_ANALYSES_SELECTION
dnl Platform specifics
dnl with-ios{{{
AC_MSG_CHECKING(for iOS compilation)
AC_ARG_WITH(
[ios],
AS_HELP_STRING([--with-ios=YES], [compile with iOS capabilities (default: no)]),
[IOS=${withval}],
[IOS=no]
)
HAVE_IOS=no
if test "x${IOS}" == "xyes"; then
HAVE_IOS=yes
AC_DEFINE([_HAVE_IOS_], [1], [with iOS capability])
fi
AM_CONDITIONAL([IOS], [test "x${HAVE_IOS}" != "xno"])
AC_MSG_RESULT([${HAVE_IOS}])
dnl }}}
dnl with-android{{{
AC_MSG_CHECKING([for Android capability compilation])
AC_ARG_WITH(
Expand Down
2 changes: 1 addition & 1 deletion src/c/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AM_CPPFLAGS = @NEOPZINCL@ @DAKOTAINCL@ @SHAPELIBINCL@ @TRIANGLEINCL@ @PETSCINCL@ @SLEPCINCL@ @AMPIINCL@ @ADJOINTMPIINCL@ @MEDIPACKINCL@ @MPIINCL@ @PARMETISINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @CODIPACKINCL@ @GSLINCL@ @BOOSTINCL@ @ANDROID_NDKINCL@ @METEOIOINCL@ @SNOWPACKINCL@ @PROJINCL@ @ESMFINCL@ @PROJINCL@ @MPLAPACKINCL@
AM_CPPFLAGS = @NEOPZINCL@ @DAKOTAINCL@ @SHAPELIBINCL@ @TRIANGLEINCL@ @PETSCINCL@ @AMPIINCL@ @ADJOINTMPIINCL@ @MEDIPACKINCL@ @MPIINCL@ @PARMETISINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADOLCINCL@ @CODIPACKINCL@ @GSLINCL@ @BOOSTINCL@ @ANDROID_NDKINCL@ @METEOIOINCL@ @SNOWPACKINCL@ @PROJINCL@ @ESMFINCL@ @PROJINCL@ @MPLAPACKINCL@
AM_FCFLAGS = @SEMICINCL@

AUTOMAKE_OPTIONS = subdir-objects
Expand Down

0 comments on commit 938aaa9

Please sign in to comment.