Merge pull request #309 from hpc4cmb/mpitranslate

Change the way that MPI communicators are passed to C++
hpc4cmb · Nov 16, 2019 · 5b5b0e7 · 5b5b0e7
2 parents 40260ec + 5154ef7
commit 5b5b0e7
Show file tree

Hide file tree

Showing 17 changed files with 72 additions and 361 deletions.
diff --git a/platforms/cori-gcc-haswell.sh b/platforms/cori-gcc-haswell.sh
diff --git a/platforms/cori-gcc-knl.sh b/platforms/cori-gcc-knl.sh
diff --git a/platforms/cori-intel-haswell.sh b/platforms/cori-intel-haswell.sh
diff --git a/platforms/cori-intel-knl.sh b/platforms/cori-intel-knl.sh
diff --git a/platforms/edison-gcc.sh b/platforms/edison-gcc.sh
diff --git a/platforms/edison-intel.sh b/platforms/edison-intel.sh
diff --git a/platforms/linux-gcc-dbg.sh b/platforms/linux-gcc-dbg.sh
diff --git a/platforms/linux-gcc.sh b/platforms/linux-gcc.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-# Pass extra configure options to this script, including
-# things like --prefix, --with-elemental, etc.
+# Pass extra cmake options to this script, including
+# things like -DCMAKE_INSTALL_PREFIX=/path/to/install, etc.
 
 opts="$@"
 

diff --git a/platforms/linux-intel-dbg.sh b/platforms/linux-intel-dbg.sh
diff --git a/platforms/linux-intel.sh b/platforms/linux-intel.sh
@@ -1,21 +1,20 @@
 #!/bin/bash
 
-# Pass extra configure options to this script, including
-# things like --prefix, --with-elemental, etc.
+# Pass extra cmake options to this script, including
+# things like -DCMAKE_INSTALL_PREFIX=/path/to/install, etc.
 
-OPTS="$@"
+opts="$@"
 
-export PYTHON=python3
-export CC=mpiicc
-export CXX=mpiicpc
-export MPICC=mpiicc
-export MPICXX=mpiicpc
-export CFLAGS="-O3 -g -fPIC -pthread"
-export CXXFLAGS="-O3 -g -fPIC -pthread"
-export OPENMP_CFLAGS="-qopenmp"
-export OPENMP_CXXFLAGS="-qopenmp"
-
-./configure ${OPTS} \
-    --with-math="-limf -lsvml" \
-    --with-mkl="${MKLROOT}/lib/intel64" \
-    --with-tbb="${TBBROOT}/lib/intel64/gcc4.7"
+cmake \
+    -DCMAKE_C_COMPILER="icc" \
+    -DCMAKE_CXX_COMPILER="icpc" \
+    -DMPI_C_COMPILER="mpiicc" \
+    -DMPI_CXX_COMPILER="mpiicpc" \
+    -DCMAKE_C_FLAGS="-O3 -g -fPIC -pthread" \
+    -DCMAKE_CXX_FLAGS="-O3 -g -fPIC -pthread -std=c++11" \
+    -DBLAS_LIBRARIES=${MKLROOT}/lib/intel64/libmkl_rt.so \
+    -DLAPACK_LIBRARIES=${MKLROOT}/lib/intel64/libmkl_rt.so \
+    -DPYTHON_EXECUTABLE:FILEPATH=$(which python3) \
+    -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+    ${opts} \
+    ..
diff --git a/platforms/nersc-intel.sh b/platforms/nersc-intel.sh
diff --git a/platforms/osx-clang-condaforge.sh b/platforms/osx-clang-condaforge.sh
diff --git a/platforms/osx_macports.sh b/platforms/osx_macports.sh
diff --git a/platforms/tacc-intel-knl.sh b/platforms/tacc-intel-knl.sh