Changeset 12007

Timestamp:

04/16/12 16:47:05 (13 years ago)

Author:

Eric.Larour

Message:

New architecture where serial and parallel are replaced by module or not module

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (4 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -13 +13 @@
         fi
         dnl }}}
-        dnl Serial build {{{
-        AC_ARG_WITH([serial],
-                AS_HELP_STRING([--with-serial = value],[serial compilation. ]),
-                [SERIAL_VALUE=$withval],[SERIAL_VALUE="yes"])
-        AC_MSG_CHECKING(for serial compilation)
-        AM_CONDITIONAL([NOSERIAL], [test $SERIAL_VALUE = no])
-        AM_CONDITIONAL([SERIAL], [test $SERIAL_VALUE = yes])
-        AC_MSG_RESULT($SERIAL_VALUE) 
-        dnl }}}
-        dnl Parallel build {{{
-        AC_ARG_WITH([parallel],
-                AS_HELP_STRING([--with-parallel = value], [parallel compilation. ]),
-                [PARALLEL_VALUE=$withval],[PARALLEL_VALUE="yes"])
-        AC_MSG_CHECKING(for parallel compilation)
-        AM_CONDITIONAL([NOPARALLEL], [test $PARALLEL_VALUE = no])
-        AM_CONDITIONAL([PARALLEL], [test $PARALLEL_VALUE = yes])
-        AC_MSG_RESULT($PARALLEL_VALUE) 
-        ISSMEXT=".exe"
+        dnl Modules build {{{
+        AC_ARG_WITH([modules],
+                AS_HELP_STRING([--with-modules = value],[modules compilation. ]),
+                [MODULES_VALUE=$withval],[MODULES_VALUE="yes"])
+        AC_MSG_CHECKING(for modules compilation)
+        AM_CONDITIONAL([NOMODULES], [test $MODULES_VALUE = no])
+        AM_CONDITIONAL([MODULES], [test $MODULES_VALUE = yes])
+        AC_MSG_RESULT($MODULES_VALUE) 
+        dnl }}}
+        dnl Extensions{{{
         AC_SUBST([ISSMEXT])
-        dnl }}}
-        dnl Serial or Parallel check {{{
-        dnl Check that at least serial or parallel builds have been requested!
-        if test "$SERIAL_VALUE" != "yes" ; then
-                if test "$PARALLEL_VALUE" != "yes"; then
-                        AC_MSG_ERROR([cannot request --with-serial=no and --with-parallel=no at the same time!])
-                fi
-        fi
         dnl }}}
 
@@ -689 +673 @@
         AC_MSG_RESULT($HAVE_TAO)
         dnl }}}
-        dnl mpiuni{{{
-        dnl when running in serial mode, MPI must be ignored, and set to internal petsc mpiuni: 
-        if test "$PARALLEL_VALUE" = "no" ; then
-                HAVE_MPI=yes
-                MPIINCL=-I"$PETSC_ROOT/include/mpiuni"
-
-                case "${host_os}" in
-                        *cygwin*)
-                        dnl MPILIB="-link -LIBPATH:\"$PETSC_ROOT/$PETSC_ARCH/lib\" -LIBPATH:\"$PETSC_ROOT/lib\" -LIBPATH:\"$PETSC_ROOT/lib/$PETSC_ARCH\" libmpiuni.lib"
-                        ;;
-                        *linux*)
-                        MPILIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lmpiuni"
-                        ;;
-                        *darwin*)
-                        MPILIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lmpiuni"
-                        ;;
-                esac
-                                                                  
-                AC_DEFINE([_HAVE_MPI_],[1],[with Mpi in ISSM src])
-                AC_SUBST([MPIINCL])
-                AC_SUBST([MPILIB])
-        fi
-        dnl }}}
         dnl slepc{{{
         AC_ARG_WITH([slepc-dir],
@@ -1229 +1190 @@
         AC_MSG_CHECKING(consistency between all libraries)
         
-        dnl check that if petsc is requested in parallel, mpi should be specified
+        dnl check that if petsc is requested , mpi should be specified
         if test "$HAVE_PETSC" = "yes" ; then
                 if test "$HAVE_MPI" = "NO";  then
@@ -1236 +1197 @@
         fi
 
-        dnl check that we have either python or matlab support if we only compile serially
-        if test "$PARALLEL_VALUE" = "no"  && test "$HAVE_MATLAB" = "no" && test "$HAVE_PYTHON" = "no"; then
+        dnl check that we have either python or matlab support if we compile the modules
+        if test "$MODULES_VALUE" = "yes"  && test "$HAVE_MATLAB" = "no" && test "$HAVE_PYTHON" = "no"; then
                 AC_MSG_ERROR([need at least python or matlab support to compile only in serial mode!]);
-        fi
-
-        dnl check that we don't have with-matlab and with-python at the same time
-        if test "$HAVE_PYTHON" = "yes" ; then
-                if test "$HAVE_MATLAB" = "yes";  then
-                        AC_MSG_ERROR([cannot create matlab and python wrappers simultaneously! Please choose one or the other.]);
-                fi
         fi