Skip to content

Commit

Permalink
(orte|ompi|oshmem)*info tools: convert to opal_dl interface
Browse files Browse the repository at this point in the history
Noe that this commit removes option:lt_dladvise from the various
"info" tools output.  This technically breaks our CLI "ABI" because
we're not deprecating it / replacing it with an alias to some other
"into" tool output.

Although the dl/libltdl component contains an "have_lt_dladvise" MCA
var that contains the same information, the "option:lt_dladvise"
output from the various "info" tools is *not* an MCA var, and
therefore we can't alias it.  So it just has to die.
  • Loading branch information
jsquyres committed Feb 21, 2015
1 parent 02864f5 commit 7ee7795
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 18 deletions.
9 changes: 3 additions & 6 deletions ompi/tools/ompi_info/param.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,7 @@ void ompi_info_do_config(bool want_all)
char *fortran_usempif08_profiling;
char *cxxexceptions;
char *threads;
char *want_libltdl;
char *have_ltdl_advise;
char *have_dl;
#if OMPI_RTE_ORTE
char *mpirun_prefix_by_default;
#endif
Expand Down Expand Up @@ -259,8 +258,7 @@ void ompi_info_do_config(bool want_all)
fortran_mpifh_profiling = (OMPI_ENABLE_MPI_PROFILING && OMPI_BUILD_FORTRAN_MPIFH_BINDINGS) ? "yes" : "no";
fortran_usempi_profiling = (OMPI_ENABLE_MPI_PROFILING && OMPI_BUILD_FORTRAN_USEMPI_BINDINGS) ? "yes" : "no";
fortran_usempif08_profiling = (OMPI_ENABLE_MPI_PROFILING && OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS) ? "yes" : "no";
want_libltdl = OPAL_WANT_LIBLTDL ? "yes" : "no";
have_ltdl_advise = OPAL_HAVE_LTDL_ADVISE ? "yes" : "no";
have_dl = OPAL_HAVE_DL_SUPPORT ? "yes" : "no";
#if OMPI_RTE_ORTE
mpirun_prefix_by_default = ORTE_WANT_ORTERUN_PREFIX_BY_DEFAULT ? "yes" : "no";
#endif
Expand Down Expand Up @@ -620,8 +618,7 @@ void ompi_info_do_config(bool want_all)
opal_info_out("MPI parameter check", "option:mpi-param-check", paramcheck);
opal_info_out("Memory profiling support", "option:mem-profile", memprofile);
opal_info_out("Memory debugging support", "option:mem-debug", memdebug);
opal_info_out("libltdl support", "option:dlopen", want_libltdl);
opal_info_out("lt_dladvise support", "option:lt_dladvise", have_ltdl_advise);
opal_info_out("dl support", "option:dlopen", have_dl);
opal_info_out("Heterogeneous support", "options:heterogeneous", heterogeneous);
#if OMPI_RTE_ORTE
opal_info_out("mpirun default --prefix", "mpirun:prefix_by_default",
Expand Down
9 changes: 3 additions & 6 deletions orte/tools/orte-info/param.c
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,7 @@ void orte_info_do_config(bool want_all)
char *memdebug;
char *debug;
char *threads;
char *want_libltdl;
char *have_ltdl_advise;
char *have_dl;
char *orterun_prefix_by_default;
char *wtime_support;
char *symbol_visibility;
Expand All @@ -351,8 +350,7 @@ void orte_info_do_config(bool want_all)
memprofile = OPAL_ENABLE_MEM_PROFILE ? "yes" : "no";
memdebug = OPAL_ENABLE_MEM_DEBUG ? "yes" : "no";
debug = OPAL_ENABLE_DEBUG ? "yes" : "no";
want_libltdl = OPAL_WANT_LIBLTDL ? "yes" : "no";
have_ltdl_advise = OPAL_HAVE_LTDL_ADVISE ? "yes" : "no";
have_dl = OPAL_HAVE_DL_SUPPORT ? "yes" : "no";
orterun_prefix_by_default = ORTE_WANT_ORTERUN_PREFIX_BY_DEFAULT ? "yes" : "no";
wtime_support = OPAL_TIMER_USEC_NATIVE ? "native" : "gettimeofday";
symbol_visibility = OPAL_C_HAVE_VISIBILITY ? "yes" : "no";
Expand Down Expand Up @@ -423,8 +421,7 @@ void orte_info_do_config(bool want_all)
orte_info_out("Internal debug support", "option:debug", debug);
orte_info_out("Memory profiling support", "option:mem-profile", memprofile);
orte_info_out("Memory debugging support", "option:mem-debug", memdebug);
orte_info_out("libltdl support", "option:dlopen", want_libltdl);
orte_info_out("lt_dladvise support", "option:lt_dladvise", have_ltdl_advise);
orte_info_out("dl support", "option:dlopen", have_dl);
orte_info_out("Heterogeneous support", "options:heterogeneous", heterogeneous);
orte_info_out("orterun default --prefix", "orterun:prefix_by_default",
orterun_prefix_by_default);
Expand Down
9 changes: 3 additions & 6 deletions oshmem/tools/oshmem_info/param.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,7 @@ void oshmem_info_do_config(bool want_all)
char *fortran_usempif08_profiling;
char *cxxexceptions;
char *threads;
char *want_libltdl;
char *have_ltdl_advise;
char *have_dl;
#if OMPI_RTE_ORTE
char *mpirun_prefix_by_default;
#endif
Expand Down Expand Up @@ -234,8 +233,7 @@ void oshmem_info_do_config(bool want_all)
fortran_mpifh_profiling = (OMPI_ENABLE_MPI_PROFILING && OMPI_BUILD_FORTRAN_MPIFH_BINDINGS) ? "yes" : "no";
fortran_usempi_profiling = (OMPI_ENABLE_MPI_PROFILING && OMPI_BUILD_FORTRAN_USEMPI_BINDINGS) ? "yes" : "no";
fortran_usempif08_profiling = (OMPI_ENABLE_MPI_PROFILING && OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS) ? "yes" : "no";
want_libltdl = OPAL_WANT_LIBLTDL ? "yes" : "no";
have_ltdl_advise = OPAL_HAVE_LTDL_ADVISE ? "yes" : "no";
have_dl = OPAL_HAVE_DL_SUPPORT ? "yes" : "no";
#if OMPI_RTE_ORTE
mpirun_prefix_by_default = ORTE_WANT_ORTERUN_PREFIX_BY_DEFAULT ? "yes" : "no";
#endif
Expand Down Expand Up @@ -568,8 +566,7 @@ void oshmem_info_do_config(bool want_all)
opal_info_out("MPI parameter check", "option:mpi-param-check", paramcheck);
opal_info_out("Memory profiling support", "option:mem-profile", memprofile);
opal_info_out("Memory debugging support", "option:mem-debug", memdebug);
opal_info_out("libltdl support", "option:dlopen", want_libltdl);
opal_info_out("lt_dladvise support", "option:lt_dladvise", have_ltdl_advise);
opal_info_out("dl support", "option:dlopen", have_dl);
opal_info_out("Heterogeneous support", "options:heterogeneous", heterogeneous);
#if OMPI_RTE_ORTE
opal_info_out("mpirun default --prefix", "mpirun:prefix_by_default",
Expand Down

0 comments on commit 7ee7795

Please sign in to comment.