Skip to content

Commit 3f5880d

Browse files
committed
CS-1152 add a checktree_mpi to testsuite with configuration and tests making use of the various MPI integrations
1 parent 9f33cc0 commit 3f5880d

File tree

4 files changed

+33
-9
lines changed

4 files changed

+33
-9
lines changed

source/dist/mpi/examples/testmpi.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,5 +481,8 @@ int main(int argc, char** argv) {
481481
}
482482

483483
MPI_Finalize();
484+
if (world_rank == 0) {
485+
printf("testmpi finished successfully\n");
486+
}
484487
return 0;
485488
}

source/dist/mpi/mpich/build.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ if [ $# -ne 2 ]; then
2727
exit 1
2828
fi
2929

30+
CONFIGURE_OPTIONS=""
31+
# if Fortran is not required - comment out if you need it
32+
CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --disable-fortran --disable-f77 --disable-f90 --disable-f08"
33+
# if C++ is not required - comment out if you need it
34+
CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --disable-cxx"
35+
# just for testing without having a high speed network
36+
CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --with-device=ch4:ofi"
37+
3038
VERSION=$1
3139
INSTALL_DIR=$2
3240

@@ -39,12 +47,12 @@ tar -xzf mpich-$VERSION.tar.gz
3947
cd mpich-$VERSION
4048

4149
# configure and build
42-
./configure --prefix=$INSTALL_DIR 2>&1 | tee configure.log
50+
./configure $CONFIGURE_OPTIONS --prefix=$INSTALL_DIR 2>&1 | tee configure.log
4351
if [ $? -ne 0 ]; then
4452
echo "configure failed"
4553
exit 1
4654
fi
47-
make -j 2>&1 | tee make.log
55+
make -j 4 2>&1 | tee make.log
4856
if [ $? -ne 0 ]; then
4957
echo "make failed"
5058
exit 1

source/dist/mpi/mvapich/build.sh

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,11 @@ fi
2929

3030
CONFIGURE_OPTIONS=""
3131
# if Fortran is not required
32-
#CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --disable-fortran --disable-f77 --disable-f90 --disable-f08"
32+
CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --disable-fortran --disable-f77 --disable-f90 --disable-f08"
33+
# if C++ is not required - comment out if you need it
34+
CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --disable-cxx"
3335
# just for testing without having a high speed network
36+
# @todo or ch4:ofi??
3437
CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --with-device=ch3"
3538

3639
VERSION=$1
@@ -45,9 +48,21 @@ tar -xzf mvapich-$VERSION.tar.gz
4548
cd mvapich-$VERSION
4649

4750
# configure and build
48-
./configure $CONFIGURE_OPTIONS --prefix=$INSTALL_DIR
49-
make -j
50-
make install
51+
./configure $CONFIGURE_OPTIONS --prefix=$INSTALL_DIR 2>&1 | tee configure.log
52+
if [ $? -ne 0 ]; then
53+
echo "configure failed"
54+
exit 1
55+
fi
56+
make -j 4 2>&1 | tee make.log
57+
if [ $? -ne 0 ]; then
58+
echo "make failed"
59+
exit 1
60+
fi
61+
make install 2>&1 | tee make-install.log
62+
if [ $? -ne 0 ]; then
63+
echo "make install failed"
64+
exit 1
65+
fi
5166

5267
# cleanup
5368
cd $BUILD_DIR

source/dist/mpi/openmpi/build.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --with-sge"
3636
CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --without-slurm --without-pbs --without-lsf"
3737
# if Fortran is not required
3838
CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --enable-mpi-fortran=no"
39-
# just for testing without having a high speed network
40-
#CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --with-device=ch3"
4139

4240
VERSION=$1
4341
MMVERSION=$(echo $VERSION | cut -d. -f1,2)
@@ -57,7 +55,7 @@ if [ $? -ne 0 ]; then
5755
echo "configure failed"
5856
exit 1
5957
fi
60-
make -j 2>&1 | tee make.log
58+
make -j 4 2>&1 | tee make.log
6159
if [ $? -ne 0 ]; then
6260
echo "make failed"
6361
exit 1

0 commit comments

Comments
 (0)