From 4de53392e96b129f8330982b4285a2644d85aae1 Mon Sep 17 00:00:00 2001 From: David Ozog Date: Thu, 14 Sep 2017 13:33:16 -0400 Subject: [PATCH 1/3] Add --disable-mix option to remove MPI dependency This commit adds an enable/disable option for the 'mix' tests. The default is to enable. Relies on the ENABLE_MIX macro to include/exclude appropriate source files. Signed-off-by: David Ozog --- verifier/Makefile.am | 17 ++++++++++++----- verifier/configure.ac | 6 ++++++ verifier/osh_exec.c | 4 ++++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/verifier/Makefile.am b/verifier/Makefile.am index 3fc1e68..8130f36 100644 --- a/verifier/Makefile.am +++ b/verifier/Makefile.am @@ -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 @@ -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 \ @@ -250,5 +245,17 @@ oshmem_test_SOURCES += \ coll/osh_coll_tc12.c endif +if ENABLE_MIX +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 diff --git a/verifier/configure.ac b/verifier/configure.ac index 25c64a5..d1429a6 100644 --- a/verifier/configure.ac +++ b/verifier/configure.ac @@ -39,5 +39,11 @@ AC_CHECK_DECLS([shmem_alltoall32, shmem_alltoall64], ], [AM_CONDITIONAL([HAVE_ALLTOALL],[false])], [#include "shmem.h"]) +AC_ARG_ENABLE([mix], + [AC_HELP_STRING([--enable-mix], + [Enable OPENSHMEM+MPI mixed tests (default: enabled)])]) +AS_IF([test "$enable_mix" = "yes"], [AC_DEFINE([ENABLE_MIX], [1], [Enable mix tests])]) +AM_CONDITIONAL([ENABLE_MIX], [test "$enable_mix" = "yes"]) + AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/verifier/osh_exec.c b/verifier/osh_exec.c index b716cd3..e15cf19 100644 --- a/verifier/osh_exec.c +++ b/verifier/osh_exec.c @@ -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_MIX 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[]; @@ -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_MIX { 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}, From 464f53de7b28d22d7df7d173d50b6fc8be53bd24 Mon Sep 17 00:00:00 2001 From: David Ozog Date: Thu, 14 Sep 2017 13:57:58 -0400 Subject: [PATCH 2/3] Fix faulty disable logic from previous commit Signed-off-by: David Ozog --- verifier/configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/verifier/configure.ac b/verifier/configure.ac index d1429a6..a4f9066 100644 --- a/verifier/configure.ac +++ b/verifier/configure.ac @@ -40,10 +40,10 @@ AC_CHECK_DECLS([shmem_alltoall32, shmem_alltoall64], [AM_CONDITIONAL([HAVE_ALLTOALL],[false])], [#include "shmem.h"]) AC_ARG_ENABLE([mix], - [AC_HELP_STRING([--enable-mix], - [Enable OPENSHMEM+MPI mixed tests (default: enabled)])]) -AS_IF([test "$enable_mix" = "yes"], [AC_DEFINE([ENABLE_MIX], [1], [Enable mix tests])]) -AM_CONDITIONAL([ENABLE_MIX], [test "$enable_mix" = "yes"]) + [AC_HELP_STRING([--disable-mix], + [Disable OPENSHMEM+MPI mixed tests (default: enabled)])]) +AS_IF([test "$enable_mix" != "no"], [AC_DEFINE([ENABLE_MIX], [1], [Enable mix tests])]) +AM_CONDITIONAL([ENABLE_MIX], [test "$enable_mix" != "no"]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT From 32e76e9d708d59e759a6263cacbc25bbc4390c1a Mon Sep 17 00:00:00 2001 From: David Ozog Date: Thu, 14 Sep 2017 14:23:45 -0400 Subject: [PATCH 3/3] Rename --enable-mix to 'mpi' to clarify for users Signed-off-by: David Ozog --- verifier/Makefile.am | 2 +- verifier/configure.ac | 8 ++++---- verifier/osh_exec.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/verifier/Makefile.am b/verifier/Makefile.am index 8130f36..82de6ce 100644 --- a/verifier/Makefile.am +++ b/verifier/Makefile.am @@ -245,7 +245,7 @@ oshmem_test_SOURCES += \ coll/osh_coll_tc12.c endif -if ENABLE_MIX +if ENABLE_MPI noinst_HEADERS += \ mix/osh_mix.h diff --git a/verifier/configure.ac b/verifier/configure.ac index a4f9066..5aa0af7 100644 --- a/verifier/configure.ac +++ b/verifier/configure.ac @@ -39,11 +39,11 @@ AC_CHECK_DECLS([shmem_alltoall32, shmem_alltoall64], ], [AM_CONDITIONAL([HAVE_ALLTOALL],[false])], [#include "shmem.h"]) -AC_ARG_ENABLE([mix], - [AC_HELP_STRING([--disable-mix], +AC_ARG_ENABLE([mpi], + [AC_HELP_STRING([--disable-mpi], [Disable OPENSHMEM+MPI mixed tests (default: enabled)])]) -AS_IF([test "$enable_mix" != "no"], [AC_DEFINE([ENABLE_MIX], [1], [Enable mix tests])]) -AM_CONDITIONAL([ENABLE_MIX], [test "$enable_mix" != "no"]) +AS_IF([test "$enable_mpi" != "no"], [AC_DEFINE([ENABLE_MPI], [1], [Enable MPI mixed tests])]) +AM_CONDITIONAL([ENABLE_MPI], [test "$enable_mpi" != "no"]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/verifier/osh_exec.c b/verifier/osh_exec.c index e15cf19..316a5c1 100644 --- a/verifier/osh_exec.c +++ b/verifier/osh_exec.c @@ -23,7 +23,7 @@ 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_MIX +#ifdef ENABLE_MPI extern const TE_NODE mix_tcs[]; #endif extern const TE_NODE analysis_tcs[]; @@ -42,7 +42,7 @@ 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_MIX +#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},