Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make mix tests optional #21

Merged
merged 6 commits into from
Sep 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions verifier/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ noinst_HEADERS = \
sync/osh_wait_template.c \
sync/osh_wait_until_template.c \
strided/osh_strided_tests.h \
mix/osh_mix.h \
analysis/osh_analysis.h \
nbi/osh_nbi_tests.h \
misc/osh_misc_tests.h
Expand Down Expand Up @@ -224,10 +223,6 @@ oshmem_test_SOURCES = \
strided/osh_strided_tc19.c \
strided/osh_strided_tc10.c \
strided/osh_strided_tc20.c \
mix/osh_mix.c \
mix/osh_mix_tc1.c \
mix/osh_mix_tc2.c \
mix/osh_mix_tc3.c \
analysis/osh_analysis.c \
analysis/osh_analysis_tc1.c \
analysis/osh_analysis_tc2.c \
Expand All @@ -250,5 +245,17 @@ oshmem_test_SOURCES += \
coll/osh_coll_tc12.c
endif

if ENABLE_MPI
noinst_HEADERS += \
mix/osh_mix.h

oshmem_test_SOURCES += \
mix/osh_mix.c \
mix/osh_mix_tc1.c \
mix/osh_mix_tc2.c \
mix/osh_mix_tc3.c
endif


clean-local:
rm -f oshmem_test
6 changes: 6 additions & 0 deletions verifier/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ AC_CHECK_DECLS([shmem_alltoall32, shmem_alltoall64],
],
[AM_CONDITIONAL([HAVE_ALLTOALL],[false])], [#include "shmem.h"])

AC_ARG_ENABLE([mpi],
[AC_HELP_STRING([--disable-mpi],
[Disable OPENSHMEM+MPI mixed tests (default: enabled)])])
AS_IF([test "$enable_mpi" != "no"], [AC_DEFINE([ENABLE_MPI], [1], [Enable MPI mixed tests])])
AM_CONDITIONAL([ENABLE_MPI], [test "$enable_mpi" != "no"])

AC_ARG_ENABLE([quick-tests],
[AC_HELP_STRING([--enable-quick-tests],
[Enable faster tests with fewer iterations/operations (default: disabled)])])
Expand Down
4 changes: 4 additions & 0 deletions verifier/osh_exec.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ extern const TE_NODE lock_tcs[];
extern const TE_NODE reduce_tcs[];
extern const TE_NODE sync_tcs[];
extern const TE_NODE strided_tcs[];
#ifdef ENABLE_MPI
extern const TE_NODE mix_tcs[];
#endif
extern const TE_NODE analysis_tcs[];
extern const TE_NODE nbi_tcs[];
extern const TE_NODE misc_tcs[];
Expand All @@ -40,7 +42,9 @@ const TE_NODE exec_tst[] =
{ reduce_tcs, proc_tst_reduce, "reduce", aopt_set_string( "rd" ), "Run " MODULE_NAME " REDUCTION test suite.", TEST_RUN},
{ sync_tcs, proc_tst_sync, "sync", aopt_set_string( "sc" ), "Run " MODULE_NAME " SYNCHRONIZATION test suite.", TEST_RUN},
{ strided_tcs, proc_tst_strided, "stride", aopt_set_string( "st" ), "Run " MODULE_NAME " STRIDED test suite.", TEST_RUN},
#ifdef ENABLE_MPI
{ mix_tcs, proc_tst_mix, "mix", aopt_set_string( "mx" ), "Run " MODULE_NAME " MIX test suite.", TEST_RUN},
#endif
{ analysis_tcs, proc_tst_analysis, "analysis", aopt_set_string( "an" ), "Run " MODULE_NAME " ANALYSIS test suite.", TEST_IGNORE},
{ nbi_tcs, proc_tst_nbi, "nbi", aopt_set_string( "nb" ), "Run " MODULE_NAME " NB DATA Transfer test suite.", TEST_RUN},
{ misc_tcs, proc_tst_misc, "misc", aopt_set_string( "ms" ), "Run " MODULE_NAME " AUX test suite.", TEST_RUN},
Expand Down