File tree Expand file tree Collapse file tree 3 files changed +13
-4
lines changed Expand file tree Collapse file tree 3 files changed +13
-4
lines changed Original file line number Diff line number Diff line change @@ -690,8 +690,11 @@ if test "x$enable_darshan_runtime" = xyes ; then
690690 #error OPENMPI FOUND
691691 #endif
692692 ] ) ] ,
693- [ ] ,
694- [ AC_DEFINE ( HAVE_OPEN_MPI , 1 , Define if OpenMPI is being used ) ] )
693+ [ is_ompi=0] , [ is_ompi=1] )
694+
695+ if test "x$is_ompi" = x1 ; then
696+ AC_DEFINE ( HAVE_OPEN_MPI , 1 , [ Define if OpenMPI is being used] )
697+ fi
695698
696699 # determine if the MPI library includes MPI-IO functions or not
697700 AC_MSG_CHECKING ( for MPI-IO support in MPI )
883886 with_log_path=
884887 with_jobid_env=
885888 have_mpi_io_large_count_apis=no
889+ is_ompi=0
886890fi
887891
888892AC_SUBST ( ENABLE_LD_PRELOAD , [ "$enable_ld_preload"] )
@@ -918,6 +922,7 @@ AC_SUBST(HDF5_PATH, ["$with_hdf5"])
918922AC_SUBST ( PNETCDF_PATH , [ "$with_pnetcdf"] )
919923AC_SUBST ( DAOS_PATH , [ "$with_daos"] )
920924AC_SUBST ( LDMS_PATH , [ "$LDMS_HOME"] )
925+ AC_SUBST ( HAVE_OPEN_MPI , [ "$is_ompi"] )
921926
922927AM_CONDITIONAL(ENABLE_MMAP_LOGS, [ test "x$enable_mmap_logs" = xyes] )
923928AM_CONDITIONAL(ENABLE_LDPRELOAD, [ test "x$enable_ld_preload" = xyes] )
Original file line number Diff line number Diff line change @@ -17,6 +17,7 @@ AM_TESTS_ENVIRONMENT += export TST_DARSHAN_LOG_PATH="$(__DARSHAN_LOG_PATH)";
1717AM_TESTS_ENVIRONMENT += export DARSHAN_INSTALL_DIR="$(prefix ) ";
1818AM_TESTS_ENVIRONMENT += export USERNAME_ENV="$(USERNAME_ENV ) ";
1919AM_TESTS_ENVIRONMENT += export HAVE_MPI_LARGE_COUNT="$(HAVE_MPI_LARGE_COUNT ) ";
20+ AM_TESTS_ENVIRONMENT += export HAVE_OPEN_MPI="$(HAVE_OPEN_MPI ) ";
2021AM_TESTS_ENVIRONMENT += export check_PROGRAMS="$(check_PROGRAMS ) ";
2122
2223TESTS = tst_runs.sh
Original file line number Diff line number Diff line change @@ -34,12 +34,15 @@ echo "DARSHAN_CONFIG=$DARSHAN_CONFIG"
3434
3535$DARSHAN_CONFIG --all
3636
37- # run NP number of MPI processes
38- # Note when using OpenMPI, setting NP > 2 will fail.
37+ # run NP number of MPI processes, default 2
3938if test " x$NP " = x ; then
4039 NP=2
4140fi
4241
42+ if test " x$HAVE_OPEN_MPI " = x1 ; then
43+ TESTMPIRUN=" $TESTMPIRUN --oversubscribe"
44+ fi
45+
4346TEST_FILE=./testfile.dat
4447
4548# tst_mpi_io.c takes the following command-line options.
You can’t perform that action at this time.
0 commit comments