Changeset 1439 for issm/trunk/m4

Timestamp:

07/30/09 14:53:37 (16 years ago)

Author:

Eric.Larour

Message:

All changes necessary to carry out compilation under windows intel platforms

Location:

issm/trunk/m4

Files:

• issm_options.m4 (modified) (7 diffs)
• matlab.m4 (modified) (2 diffs)

issm/trunk/m4/issm_options.m4

@@ -51 +51 @@
                 MATLABINCL=-I"$MATLAB_ROOT/extern/include";
                 dnl  use matlab provided mexext routine to test for extension
-                MEXEXT=`$MATLAB_ROOT/bin/mexext`
-                MEXEXT=".$MEXEXT"
+                                
                 MEX=$MATLAB_ROOT/bin/mex
 
@@ -66 +65 @@
                                 MEXLINK="-pthread -shared -W2,--version-script,${MATLAB_ROOT}/extern/lib/glnx86/mexFunction.map";
                         fi
+                        MEXEXT=`$MATLAB_ROOT/bin/mexext`
+                        MEXEXT=".$MEXEXT"
                         ;;
                         *darwin9.6.0*)
                         MEXLIB=-L"$MATLAB_ROOT/bin/maci/ -lmex -lmx"
                         MEXLINK="-Wl,-twolevel_namespace -undefined error -arch i386 -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -bundle -Wl,-exported_symbols_list,$MATLAB_ROOT/extern/lib/maci/mexFunction.map"
+                        MEXEXT=`$MATLAB_ROOT/bin/mexext`
+                        MEXEXT=".$MEXEXT"
+                        ;;
+                        *cygwin*)
+                        MEXLIB="-dll -export:mexFunction -LIBPATH:\"$MATLAB_ROOT\extern\lib\win32\microsoft\" libmx.lib libmex.lib libmat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  -NOLOGO -INCREMENTAL:NO"
+
+
+                        MEXEXT=`$MATLAB_ROOT/bin/mexext.bat`
+                        MEXEXT=".$MEXEXT"
                         ;;
 
@@ -176 +186 @@
                 dnl defaults
                 HAVE_METIS=yes
+                
+                case "${host_os}" in
+                        *cygwin*)
+                        METISLIB="-LIBPATH:\"$METIS_ROOT\" libmetis.lib"
+                        ;;
+                        *linux*)
+                        METISLIB=-L"$METIS_ROOT/ -lmetis"
+                        ;;
+                        *darwin9.6.0*)
+                        METISLIB=-L"$METIS_ROOT/ -lmetis"
+                        ;;
+                esac
+                                                  
                 METISINCL=-I"$METIS_ROOT/Lib"
-                METISLIB=-L"$METIS_ROOT/ -lmetis"
 
                 AC_DEFINE([_HAVE_METIS_],[1],[with Metis in ISSM src])
@@ -256 +278 @@
                 
                         PETSCINCL="-I$PETSC_ROOT/include  -I$PETSC_ROOT/ -I$PETSC_ROOT/bmake/$PETSC_ARCH -I$PETSC_ROOT/src/mat/impls/dense/mpi/plapack/"
-                        PETSCLIB="-L$PETSC_ROOT/lib/$PETSC_ARCH -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetsc  -lpetscsnes -lpetscts"
+                
+                        case "${host_os}" in
+                                *cygwin*)
+                                PETSCLIB="-link -LIBPATH:\"$PETSC_ROOT/lib/$PETSC_ARCH\" libpetscksp.lib  libpetscdm.lib  libpetscmat.lib  libpetscvec.lib libpetsc.lib  libpetscsnes.lib libpetscts.lib libmpiuni.lib"
+                                ;;
+                                *linux*)
+                                PETSCLIB="-L$PETSC_ROOT/lib/$PETSC_ARCH -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetsc  -lpetscsnes -lpetscts"
+                                ;;
+                                *darwin9.6.0*)
+                                PETSCLIB="-L$PETSC_ROOT/lib/$PETSC_ARCH -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetsc  -lpetscsnes -lpetscts"
+                                ;;
+                        esac
                                                   
 
@@ -273 +306 @@
 
         if test $HAVE_PETSC = no; then
-                if test "$PARALLEL_VALUE" = "yes" ; then
-                        AC_MSG_ERROR([could not find petsc. user should specify --with-petsc-dir and --with-petsc-arch options. Petsc is needed to run ISSM in paralle!])
-                fi
+                AC_MSG_ERROR([could not find petsc. user should specify --with-petsc-dir and --with-petsc-arch options. Petsc is needed to run ISSM!])
         else
                 AC_MSG_RESULT($HAVE_PETSC)
         fi
 
+        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*)
+                        MPILIB="-link -LIBPATH:\"$PETSC_ROOT/lib/$PETSC_ARCH\" libmpiuni.lib"
+                        ;;
+                        *linux*)
+                        MPILIB="-L$PETSC_ROOT/lib/$PETSC_ARCH -lmpiuni"
+                        ;;
+                        *darwin9.6.0*)
+                        MPILIB="-L$PETSC_ROOT/lib/$PETSC_ARCH -lmpiuni"
+                        ;;
+                esac
+                                                                  
+
+
+                        
+                AC_DEFINE([_HAVE_MPI_],[1],[with Mpi in ISSM src])
+                AC_DEFINE([HAVE_MPI],[1],[with Mpi in ISSM src])
+                AC_SUBST([MPIINCL])
+                AC_SUBST([MPILIB])
+        fi
+        
 
         dnl Slepc directory
@@ -338 +395 @@
                 HAVE_BLASLAPACK=yes
                 BLASLAPACKINCL=""
-                dnl BLASLAPACKLIB=-L"$BLASLAPACK_ROOT -lmkl_lapack -lmkl -lguide"
-                BLASLAPACKLIB=-L"$BLASLAPACK_ROOT -lfblas -lflapack"
+                
+                dnl: branch on whether we are running on windows or linux.
+                case "${host_os}" in
+                        *cygwin*)
+                        BLASLAPACKLIB="-link -LIBPATH:\"$BLASLAPACK_ROOT\" libf2cblas.lib  libf2clapack.lib"
+                        ;;
+                        *linux*)
+                        BLASLAPACKLIB=-L"$BLASLAPACK_ROOT -lfblas -lflapack" 
+                        ;;
+                        *darwin9.6.0*)
+                        BLASLAPACKLIB=-L"$BLASLAPACK_ROOT -lfblas -lflapack" 
+                        ;;
+                esac
+                                                                  
+
 
                 AC_DEFINE([_HAVE_BLASLAPACK_],[1],[with blas lapack in ISSM src])
@@ -489 +559 @@
         AC_MSG_RESULT(done)
 
+        dnl vendor?
+        AC_ARG_WITH([vendor],
+                          AS_HELP_STRING([--with-vendor = VENDOR], [vendor name, ex: intel]),
+                         [VENDOR=$withval],[VENDOR=""]) 
+        AC_MSG_CHECKING(for vendor compilers )
+        if test -n "$VENDOR"; then
+
+                if  test $VENDOR = intel; then
+                        export CC=icl
+                        export CXX=icl
+                        export CXXFLAGS="-DWIN32 -D_INTEL_"
+                else
+                AC_MSG_ERROR([unknow compiler vendor!])
+                fi
+        fi
+
 ])

issm/trunk/m4/matlab.m4

@@ -289 +289 @@
                                 break
                         fi
+                                
+                                # For Matlab R2008 and more, the version number is stored in bin/util/mex/version.txt 
+                        ax_cv_matlab_version=`cat $MATLAB/bin/util/mex/version.txt`
+                        if test -n "$ax_cv_matlab_version" ; then
+                                break
+                        fi
+
                 fi
         done
@@ -305 +312 @@
     MATLAB_MINOR=`echo $MATLAB_VERSION | sed -e 's/^@<:@0-9@:>@*\.\(@<:@0-9@:>@*\).*/\1/'`
     ;;
+  R2009a)
+        MATLAB_VERSION=R2009a
+    MATLAB_MAJOR=R2009
+    MATLAB_MINOR=a
+        ;;
   *)
     if test x$ax_enable_matlab = xyes ; then