Changeset 19390

Timestamp:

06/04/15 19:23:22 (10 years ago)

Author:

glperez

Message:

CHG: Added MPI variables to sdk 7.1 Win64 environment script.
CHG: New option for parallel Win64
CHG: Added contional to set number of processes to 1 when Windows build is not parallel.
CHG: Added ability to for IssmConfig to recognize when Petsc provides MPI.

Location:

issm/trunk-jpl

Files:

• externalpackages/windows/configs/sdk7.1-win64.sh (modified) (2 diffs)
• m4/issm_options.m4 (modified) (1 diff)
• src/m/classes/clusters/generic.m (modified) (1 diff)
• src/wrappers/IssmConfig/IssmConfig.cpp (modified) (1 diff)

issm/trunk-jpl/externalpackages/windows/configs/sdk7.1-win64.sh

@@ -17 +17 @@
 # directory of 'Windows Kits' instead.
 export WIN_SDK_DIR='C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\'
+export MPI_DIR='C:\Programs\MPICH2'
 
 # Unfotunately, standard installation directories of Matlab usually include 
@@ -37 +38 @@
 
 export MSVC_DIR_UNIX=`cygpath -u "${MSVC_DIR}"`
-export PATH="${MSVC_DIR_UNIX}/bin/amd64:$PATH"
+export MPI_DIR_UNIX=`cygpath -u "${MPI_DIR}"`
+export PATH="${MSVC_DIR_UNIX}/bin/amd64:${MPI_DIR_UNIX}/bin:$PATH"

issm/trunk-jpl/m4/issm_options.m4

@@ -204 +204 @@
                         IS_WINDOWS=yes
                         OSLIBS="-Wl,kernel32.lib -Wl,user32.lib -Wl,gdi32.lib -Wl,winspool.lib -Wl,comdlg32.lib -Wl,advapi32.lib -Wl,shell32.lib -Wl,ole32.lib -Wl,oleaut32.lib -Wl,uuid.lib -Wl,odbc32.lib -Wl,odbccp32.lib"
+                elif  test $VENDOR = MSVC-Win64-par; then
+                        export CC=cl
+                        export CXX=cccl
+                        export CXXFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
+                        export CFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
+                        export AR="ar-lib lib"
+                        export OS_LDFLAG="-Wl,"
+                        export RANLIB=true
+                        IS_WINDOWS=yes
+                        OSLIBS="-Wl,kernel32.lib -Wl,user32.lib -Wl,gdi32.lib -Wl,winspool.lib -Wl,comdlg32.lib -Wl,advapi32.lib -Wl,shell32.lib -Wl,ole32.lib -Wl,oleaut32.lib -Wl,uuid.lib -Wl,odbc32.lib -Wl,odbccp32.lib"
                 elif test $VENDOR = intel-linux; then
                         export CC=icc

issm/trunk-jpl/src/m/classes/clusters/generic.m

@@ -144 +144 @@
                                 fprintf(fid,'@echo off\n');
 
-                                warning('parallel runs not allowed yet in Windows. Defaulting to 1 cpus');
-                                cluster.np=1;
+                                if IssmConfig('_HAVE_PETSC_MPI_'),
+                                        warning('parallel runs not allowed yet in Windows. Defaulting to 1 cpus');
+                                        cluster.np=1;
+                                end
 
                                 if cluster.np>1,

issm/trunk-jpl/src/wrappers/IssmConfig/IssmConfig.cpp

@@ -36 +36 @@
         if(strcmp(name,"_HAVE_MPI_")==0){
                 #ifdef _HAVE_MPI_
+                value = 1.;
+                #endif
+        }
+        if(strcmp(name,"_HAVE_PETSC_MPI_")==0){
+                #ifdef _HAVE_PETSC_MPI_
                 value = 1.;
                 #endif