Changeset 26039

Timestamp:

03/04/21 15:39:08 (4 years ago)

Author:

jdquinn

Message:

CHG: Modified configuration files for Windows build; external packages for MS-MPI and MinGW MEX; minor clean up

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (10 diffs)
• externalpackages/mingw-mex (added)
• externalpackages/mingw-mex/README (added)
• externalpackages/mingw-mex/configuremingw.p (added)
• externalpackages/msmpi (added)
• externalpackages/msmpi/install.sh (added)
• externalpackages/petsc/install-3.14-win-msys2-mingw-msmpi.sh (modified) (2 diffs)
• jenkins/ross-win-msys2-mingw-msmpi-basic (modified) (3 diffs)
• src/m/classes/clusters/generic.m (modified) (3 diffs)
• src/m/solve/waitonlock.m (modified) (1 diff)

issm/trunk-jpl/etc/environment.sh

@@ -168 +168 @@
 } #}}}
 
-#######################
-# OS-specific handling
-#######################
-
-OS=$(uname -s)
-
-if [[ "${OS}" == MINGW* || "${OS}" == MSYS* ]]; then
-        # If this is a Windows build, we need to copy MSMPI to working $ISSM_DIR
-        MSMPI_ROOT="${ISSM_DIR}/MSMPI"
-        if [ ! -d "${MSMPI_ROOT}" ]; then
-                ${ISSM_DIR}/scripts/win-msys2-create_local_msmpi_dir.sh
-        fi
-        export MSMPI_ROOT # Used in installation of ParMETIS, ScaLAPACK
-        path_prepend "${ISSM_DIR}/bin" # Lets dynamic linker find DLLs
-        cpath_prepend "${MSMPI_ROOT}/include"
-        library_path_prepend "${MSMPI_ROOT}/lib"
-fi
-
-# Windows compilers
-if [[ "${ISSM_ARCH}" == "cygwin-intel" ]]; then
-        source ${ISSM_DIR}/externalpackages/windows/windows_environment.sh
-fi
-
 path_append "${ISSM_DIR}/aux-config"
 path_append "${ISSM_DIR}/scripts"
@@ -201 +178 @@
 if [ -z "${ISSM_EXT_DIR+x}" ]; then
         export ISSM_EXT_DIR="${ISSM_DIR}/externalpackages"
+fi
+
+#######################
+# OS-specific handling
+#######################
+
+OS=$(uname -s)
+
+if [[ "${OS}" == MINGW* ]]; then
+        MSMPI_ROOT="${ISSM_EXT_DIR}/msmpi/install"
+        if [ -d "${MSMPI_ROOT}" ]; then
+                export MSMPI_ROOT # Used in installation of ParMETIS, ScaLAPACK
+                path_prepend "${ISSM_DIR}/bin" # Allows dynamic loaded to find DLLs
+                cpath_prepend "${MSMPI_ROOT}/include"
+                library_path_prepend "${MSMPI_ROOT}/lib"
+        fi
+
+        MPIEXEC_DIR=$(cygpath -u $(cygpath -ms "/c/Program Files/Microsoft MPI/Bin"))
+        if [ -d "${MPIEXEC_DIR}" ]; then
+                export MPIEXEC_DIR
+                path_append "${MPIEXEC_DIR}"
+        fi
+
+        path_prepend "${ISSM_DIR}/bin" # Allows dynamic loader to find DLLs
+fi
+
+# Windows compilers
+if [[ "${ISSM_ARCH}" == "cygwin-intel" ]]; then
+        source ${ISSM_DIR}/externalpackages/windows/windows_environment.sh
 fi
 
@@ -284 +290 @@
 if [ -d "${BLAS_ROOT}" ]; then
         export BLAS_ROOT # Used in installation of LAPACK, ScaLAPACK, PETSc
-        path_append "${BLAS_ROOT}/lib" # Lets dynamic linker find DLLs
         library_path_append "${BLAS_ROOT}/lib"
         ld_library_path_append "${BLAS_ROOT}/lib"
+
+        if [[ "${OS}" == MINGW* ]]; then
+                path_append "${BLAS_ROOT}/lib" # Allows dynamic loaded to find DLLs
+        fi
 fi
 
@@ -292 +301 @@
 if [ -d "${LAPACK_ROOT}" ]; then
         export LAPACK_ROOT # Used in installation of ScaLAPACK, MUMPS, PETSc
-        path_append "${LAPACK_ROOT}/lib" # Lets dynamic linker find DLLs
         library_path_append "${LAPACK_ROOT}/lib"
         ld_library_path_append "${LAPACK_ROOT}/lib"
+
+        if [[ "${OS}" == MINGW* ]]; then
+                path_append "${LAPACK_ROOT}/lib" # Allows dynamic loaded to find DLLs
+        fi
 fi
 
@@ -300 +312 @@
 if [ -d "${METIS_ROOT}" ]; then
         export METIS_ROOT # Used in installation of ParMETIS, Gmsh, PETSc
-        path_append "${METIS_ROOT}/lib" # Lets dynamic linker find DLLs
         library_path_prepend "${METIS_ROOT}/lib"
         ld_library_path_prepend "${METIS_ROOT}/lib"
+
+        if [[ "${OS}" == MINGW* ]]; then
+                path_append "${METIS_ROOT}/lib" # Allows dynamic loaded to find DLLs
+        fi
 fi
 
@@ -308 +323 @@
 if [ -d "${MUMPS_ROOT}" ]; then
         export MUMPS_ROOT # Used in installation of PETSc
-        path_append "${MUMPS_ROOT}/lib" # Lets dynamic linker find DLLs
         library_path_append "${MUMPS_ROOT}/lib"
+
+        if [[ "${OS}" == MINGW* ]]; then
+                path_append "${MUMPS_ROOT}/lib" # Allows dynamic loaded to find DLLs
+        fi
 fi
 
@@ -315 +333 @@
 if [ -d "${PARMETIS_ROOT}" ]; then
         export PARMETIS_ROOT # Used in installation of MUMPS, PETSc
-        path_append "${PARMETIS_ROOT}/lib" # Lets dynamic linker find DLLs
         library_path_prepend "${PARMETIS_ROOT}/lib"
         ld_library_path_prepend "${PARMETIS_ROOT}/lib"
+
+        if [[ "${OS}" == MINGW* ]]; then
+                path_append "${PARMETIS_ROOT}/lib" # Allows dynamic loaded to find DLLs
+        fi
 fi
 
@@ -323 +344 @@
 if [ -d "${SCALAPACK_ROOT}" ]; then
         export SCALAPACK_ROOT # Used in installation of MUMPS, PETSc
-        path_append "${SCALAPACK_ROOT}/lib" # Lets dynamic linker find DLLs
         library_path_append "${SCALAPACK_ROOT}/lib"
+
+        if [[ "${OS}" == MINGW* ]]; then
+                path_append "${SCALAPACK_ROOT}/lib" # Allows dynamic loaded to find DLLs
+        fi
 fi
 
@@ -336 +360 @@
 if [ -d "${PETSC_ROOT}" ]; then
         export PETSC_ROOT # Used in installation of Gmsh
-        path_append "${PETSC_ROOT}/lib" # Lets dynamic linker find DLLs
         library_path_prepend "${PETSC_ROOT}/lib"
         ld_library_path_prepend "${PETSC_ROOT}/lib"
+
+        if [[ "${OS}" == MINGW* ]]; then
+                path_append "${PETSC_ROOT}/lib" # Allows dynamic loaded to find DLLs
+        fi
 
         # In case we have installed certain external packages via PETSc
@@ -511 +538 @@
 TRIANGLE_ROOT="${ISSM_EXT_DIR}/triangle/install"
 if [ -d "${TRIANGLE_ROOT}" ]; then
-        path_append "${TRIANGLE_ROOT}/lib" # Lets dynamic linker find DLLs
         ld_library_path_append "${TRIANGLE_ROOT}/lib"
         dyld_library_path_append "${TRIANGLE_ROOT}/lib"
+
+        if [[ "${OS}" == MINGW* ]]; then
+                path_append "${TRIANGLE_ROOT}/lib" # Allows dynamic loaded to find DLLs
+        fi
 fi
 

issm/trunk-jpl/externalpackages/petsc/install-3.14-win-msys2-mingw-msmpi.sh

@@ -5 +5 @@
 # - You must install various needed packages with,
 #
-#               pacman -S autoconf make automake-wrapper bison git mingw-w64-x86_64-freeglut mingw-w64-x86_64-toolchain patch python perl pkg-config pkgfile rebase tar time tzcode unzip which mingw-w64-x86_64-libmicroutils
+#               pacman -S git mingw-w64-x86_64-freeglut mingw-w64-x86_64-toolchain python pkg-config mingw-w64-x86_64-libmicroutils
 #
-# then remove the MinGW 64-bit version of Python (and depdendent packages) with,
+# then remove the MinGW 64-bit version of Python (and dependent packages) with,
 #
 #               pacman -R mingw-w64-x86_64-gdb-multiarch mingw-w64-x86_64-gdb mingw-w64-x86_64-python
@@ -69 +69 @@
         --with-ssl=0 \
         --with-proc-filesystem=0 \
-        --with-mpiexec="/c/PROGRA~1/MICROS~1/Bin/mpiexec.exe" \
+        --with-mpiexec="${MPIEXEC_DIR}/mpiexec.exe" \
         --with-mpi-lib="-L${MSMPI_ROOT}/lib -lmsmpi" \
         --with-mpi-include="${MSMPI_ROOT}/include" \

issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic

@@ +1 @@
+MATLAB_PATH=$(cygpath -u $(cygpath -ms "/c/Program Files/MATLAB/R2019b"))
+
 ISSM_CONFIG='\
         --prefix=${ISSM_DIR} \
@@ -25 +27 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="
+        msmpi           install.sh
         petsc           install-3.14-win-msys2-mingw-msmpi.sh
         triangle        install-win-msys2-mingw.sh
@@ -48 +51 @@
 
 # Number of CPUs used in the nightly runs
-NUMCPUS_RUN=1
+NUMCPUS_RUN=2
 
 # Nightly run options

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

@@ -139 +139 @@
                                 fprintf(fid,'@echo off\n');
 
-                                if IssmConfig('_HAVE_PETSC_MPI_'),
-                                        warning('parallel runs not allowed yet in Windows. Defaulting to 1 cpus');
-                                        cluster.np=1;
-                                end
+                                % 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,
-                                        % fprintf(fid,'"C:\\Program Files\\MPICH2\\bin\\mpiexec.exe" -n %i "%s/%s" %s ./ %s ',cluster.np,cluster.codepath,executable,solution,modelname);
-                                        fprintf(fid,'"C:\\PROGRA~1\\MICROS~1\\Bin\\mpiexec.exe" -n %i "%s/%s" %s ./ %s ',cluster.np,cluster.codepath,executable,solution,modelname);
-                                else
-                                        fprintf(fid,'"%s/%s" %s ./ %s ',cluster.codepath,executable,solution,modelname);
+                                        % fprintf(fid,'"C:\\Program Files\\MPICH2\\bin\\mpiexec.exe" -n %i "%s/%s" %s ./ %s',cluster.np,cluster.codepath,executable,solution,modelname);
+                                        fprintf(fid,'"C:\\Program Files\\Microsoft MPI\\Bin\\mpiexec.exe" -n %i "%s/%s" %s ./ %s',cluster.np,cluster.codepath,executable,solution,modelname);
+                                else
+                                        fprintf(fid,'"%s/%s" %s ./ %s',cluster.codepath,executable,solution,modelname);
                                 end
                                 fclose(fid);
@@ -305 +305 @@
 
                         if ~ispc,
-
                                 %figure out what shell extension we will use:
                                 if isempty(strfind(cluster.shell,'csh')),
@@ -319 +318 @@
                                 else
                                         if ~batch,
-                                        launchcommand=['source ' cluster.etcpath '/environment.' shellext ' && cd ' cluster.executionpath ' && rm -rf ./' dirname ' && mkdir ' dirname ...
+                                                launchcommand=['source ' cluster.etcpath '/environment.' shellext ' && cd ' cluster.executionpath ' && rm -rf ./' dirname ' && mkdir ' dirname ...
                                                 ' && cd ' dirname ' && mv ../' dirname '.tar.gz ./ && tar -zxf ' dirname '.tar.gz  && source  ' modelname '.queue '];
                                         else
-                                        launchcommand=['source ' cluster.etcpath '/environment.' shellext ' && cd ' cluster.executionpath ' && rm -rf ./' dirname ' && mkdir ' dirname ...
+                                                launchcommand=['source ' cluster.etcpath '/environment.' shellext ' && cd ' cluster.executionpath ' && rm -rf ./' dirname ' && mkdir ' dirname ...
                                                 ' && cd ' dirname ' && mv ../' dirname '.tar.gz ./ && tar -zxf ' dirname '.tar.gz '];
                                         end

issm/trunk-jpl/src/m/solve/waitonlock.m

@@ -2 +2 @@
 %WAITONLOCK - wait for a file
 %
-%   This routine will return when a file named 'lockfilename' is written to disk.
-%   Also check for outlog file be cause it might bewritten several seconds
-%   after the lock file.
+%   This routine will return when a file named 'lockfilename' is written to 
+%   disk. Also check for outlog file be cause it might be written several 
+%   seconds after the lock file.
 %   If the time limit given in input is exceeded, return 0
 %