Changeset 15764

Timestamp:

08/08/13 18:41:15 (12 years ago)

Author:

Eric.Larour

Message:

CHG: added adjoinable mpi libraries in autotools and the makefiles

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (2 diffs)
• src/c/Makefile.am (modified) (3 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -480 +480 @@
         if test "x$HAVE_ADOLC" == "xyes"; then
                 ADOLCINCL="-I$ADOLC_ROOT/include"
-                ADOLCLIB="-L$ADOLC_ROOT/lib64 -ladolc"
+                dnl ADOLCLIB="-L$ADOLC_ROOT/lib64 -ladolc" used to be the path
+                ADOLCLIB="-L$ADOLC_ROOT/lib -ladolc"
                 AC_DEFINE([_HAVE_ADOLC_],[1],[with adolc in ISSM src])
                 AC_SUBST([ADOLCINCL])
@@ -588 +589 @@
         fi
         AM_CONDITIONAL([GSL], [test x$HAVE_GSL = xyes])
+        dnl }}}
+        dnl adjoinable-mpi{{{
+        AC_ARG_WITH([ampi-dir],
+          AS_HELP_STRING([--with-ampi-dir=DIR], [adjoinable mpi root directory.]),
+          [AMPI_ROOT=$withval],[AMPI_ROOT="no"]) 
+
+        dnl Check whether ampi is enabled
+        AC_MSG_CHECKING([for ampi])
+        if test "x$AMPI_ROOT" = "xno" ; then
+                HAVE_AMPI=no
+        else
+                HAVE_AMPI=yes
+                if ! test -d "$AMPI_ROOT"; then
+                        AC_MSG_ERROR([ampi directory provided ($AMPI_ROOT) does not exist]);
+                fi
+        fi
+        AC_MSG_RESULT($HAVE_AMPI)
+        
+        dnl ampi headers and libraries
+        if test "x$HAVE_AMPI" == "xyes"; then
+                AMPIINCL="-I$AMPI_ROOT/include"
+                AMPILIB="-dy -L$AMPI_ROOT/lib -lampiCommon -L$ADOLC_ROOT/lib -ladolc -L$AMPI_ROOT/lib -lampiCommon -lampiBookkeeping -lampiTape"
+                AC_DEFINE([_HAVE_AMPI_],[1],[with adjoinable mpi in ISSM src])
+                AC_SUBST([AMPIINCL])
+                AC_SUBST([AMPILIB])
+        fi
+        AM_CONDITIONAL([AMPI], [test x$HAVE_AMPI = xyes])
         dnl }}}
         dnl rose{{{

issm/trunk-jpl/src/c/Makefile.am

@@ -1 @@
-AM_CPPFLAGS = @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @TRIANGLEINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @GSLINCL@ @BOOSTINCL@ @ANDROID_NDKINCL@
+AM_CPPFLAGS = @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @AMPIINCL@ @MPIINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @TRIANGLEINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @GSLINCL@ @BOOSTINCL@ @ANDROID_NDKINCL@
 
 EXEEXT=$(ISSMEXT)
@@ -942 +942 @@
 
 libISSMCore_la_SOURCES  = $(issm_sources)
-libISSMCore_la_LIBADD = $(PETSCLIB) $(TAOLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(ADOLCLIB)
+libISSMCore_la_LIBADD = $(PETSCLIB) $(TAOLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(AMPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(ADOLCLIB)
 libISSMCore_la_FFLAGS = $(AM_FFLAGS)
 endif
@@ -990 +990 @@
 
 #External packages
-LDADD += $(PETSCLIB) $(TAOLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(ADOLCLIB)
+LDADD += $(PETSCLIB) $(TAOLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(AMPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(ADOLCLIB)
 
 if FORTRAN