Changeset 19168

Timestamp:

02/27/15 18:25:03 (10 years ago)

Author:

glperez

Message:

CHG: config-win64.sh uses the correct vendor option MSVC-Win64
CHG: Changed ISSM options to account for Petsc builds newer than 3.3 that do not include their own Metis installation. Added new macro for Petsc provided MPI.
CHG: 'issmmpi.h' now include 'petsc.h' when Petsc provides it.
CHG: 'PetscMat.cpp' adds logic to use sequential version of Petsc preallocation instead of MPI. Only activates if Petsc provided MPI is used.

Location:

issm/trunk-jpl

Files:

• configs/config-win64.sh (modified) (1 diff)
• m4/issm_options.m4 (modified) (3 diffs)
• src/c/toolkits/mpi/issmmpi.h (modified) (1 diff)
• src/c/toolkits/petsc/objects/PetscMat.cpp (modified) (1 diff)

issm/trunk-jpl/configs/config-win64.sh

@@ -3 +3 @@
 # Works on Win8, but should also work on 7.
 ./configure --prefix=$ISSM_DIR \
-        --with-vendor=MSVC-win64  \
+        --with-vendor=MSVC-Win64  \
         --disable-static \
         --enable-standalone-libraries \

issm/trunk-jpl/m4/issm_options.m4

@@ -197 +197 @@
                         export CC=cl
                         export CXX=cccl
-                        export CXXFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
-                        export CFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
+                        export CXXFLAGS="-DWIN32 -D_INTEL_WIN_ -D_HAVE_PETSC_MPI_ -EHsc"
+                        export CFLAGS="-DWIN32 -D_INTEL_WIN_ -D_HAVE_PETSC_MPI_ -EHsc"
                         export AR="ar-lib lib"
                         export OS_LDFLAG="-Wl,"
@@ -963 +963 @@
                                 else
                                         PETSCLIB="-L$PETSC_ROOT/lib  -Wl,libpetsc.lib"
-                                        if test $PETSC_MAJOR -gt 3 || test $PETSC_MINOR -ge 3; then PETSCLIB+="  -Wl,libmetis.lib"; fi
                                 fi
                                 ;;
@@ -990 +989 @@
         dnl }}}
         dnl metis{{{
-        if test "$HAVE_PETSC" = "yes" && test "x$PETSC_MAJOR" = "x3" && test $PETSC_MINOR -ge 3; then
+        if test "$HAVE_PETSC" = "yes" && test "x$PETSC_MAJOR" = "x3" && test $PETSC_MINOR -ge 3 && test $VENDOR != "MSVC-Win64"; then
                 dnl in petsc >=3.3, metis is provided
                 HAVE_METIS="yes"

issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.h

@@ -20 +20 @@
         #ifdef _HAVE_AMPI_
                 #include <ampi/ampi.h>
+        #elif  _HAVE_PETSC_MPI_ // Petsc now hides there MPI header. It can be reached through Petsc.
+                #include <petsc.h>
         #else 
                 #include <mpi.h>

issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.cpp

@@ -42 +42 @@
         MatSetSizes(this->matrix,m,n,M,N);
         MatSetFromOptions(this->matrix);
-        PetscErrorCode ierr = MatMPIAIJSetPreallocation(this->matrix,0,d_nnz,0,o_nnz);
+
+        /* 
+         * Versions of Petsc beyond 3.3 have changed the use of preallocation 
+         * routines to distinguish between parallel builds and sequential. Since
+         * our Windows builds are currently only sequential, we need to change
+         * the way we use these functions.
+         *
+         * The following code computes the total number of non-zeroes per row of the
+         * matrix in question. In parallel builds it is nescessary to kep track of 
+         * diagonal non zeros and off-diagonal (d_nnz and o_nnz). Sequential does
+         * not make that distinction.
+        */
+        #ifdef _HAVE_PETSC_MPI_
+         int* nnz = new int[M];
+         for(int i = 0; i < M; i++)
+                 nnz[i] = o_nnz[i] + d_nnz[i];
+
+                PetscErrorCode ierr = MatSeqAIJSetPreallocation(this->matrix,0,nnz);
+        #else
+                PetscErrorCode ierr = MatMPIAIJSetPreallocation(this->matrix,0,d_nnz,0,o_nnz);
+        #endif
         if(ierr) _error_("PETSc could not allocate matrix (probably not enough memory)");
 //      MatSetOption(this->matrix,MAT_NEW_NONZERO_ALLOCATION_ERR,PETSC_FALSE);