Commit f55fd832 authored by Burlen Loring's avatar Burlen Loring

Merge branch 'sc18_vm' into 'master'

changes from sc18 vm

See merge request !141
parents dd7f2600 382dbb8e
......@@ -5,8 +5,8 @@ if (BUILD_TESTING)
SOURCES testHistogram.cpp LIBS sensei)
senseiAddTest(testHistogramParallel
COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG}
${MPIEXEC_MAX_NUMPROCS} testHistogram)
COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG}
${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} testHistogram)
senseiAddTest(testADIOSFlexpath
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testADIOS.sh
......@@ -23,12 +23,14 @@ if (BUILD_TESTING)
FEATURES ${ENABLE_PYTHON} ${ENABLE_ADIOS})
senseiAddTest(testProgrammableDataAdaptor
COMMAND ${MPIEXEC} -np 1 testProgrammableDataAdaptor
COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} 1
${MPIEXEC_POSTFLAGS} testProgrammableDataAdaptor
SOURCES testProgrammableDataAdaptor.cpp
LIBS sensei)
senseiAddTest(testProgrammableDataAdaptorPy
COMMAND ${MPIEXEC} -np 1 python
COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} 1
${MPIEXEC_POSTFLAGS} python
${CMAKE_CURRENT_SOURCE_DIR}/testProgrammableDataAdaptor.py
FEATURES ${ENABLE_PYTHON})
......@@ -39,7 +41,7 @@ if (BUILD_TESTING)
LIBS sensei)
senseiAddTest(testPythonAnalysisParallel
COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG}
${MPIEXEC_MAX_NUMPROCS} testPythonAnalysis
COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG}
${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} testPythonAnalysis
${CMAKE_CURRENT_SOURCE_DIR}/testPythonAnalysis.xml)
endif()
......@@ -6,7 +6,7 @@ then
exit 1
fi
mpiexec=$1
mpiexec=`basename $1`
npflag=$2
nproc=$3
srcdir=$4
......
#!/bin/bash
if [[ $# != 1 ]]
then
echo "make_install /path/to/sensei/install"
exit -1
fi
SENSEI_DIR=$1
rm -rf tmp_build_dir
mkdir tmp_build_dir
cd tmp_build_dir
cmake \
-DCMAKE_CXX_COMPILER=`which g++` \
-DCMAKE_C_COMPILER=`which gcc` \
-DSENSEI_DIR=${SENSEI_DIR}/lib/cmake \
-DCMAKE_INSTALL_PREFIX=${SENSEI_DIR} \
../
make install
cd ..
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment