From 0c421ef6452c6f43ad73bccf92df2de3ee1cb5ed Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Mon, 26 Jul 2004 13:04:32 +0000 Subject: [PATCH] - Minor fixes for topo - Make ompi_info show topo modules This commit was SVN r1804. --- src/mca/topo/.ompi_ignore | 0 src/mca/topo/base/.ompi_ignore | 0 src/mca/topo/base/base.h | 3 +++ src/tools/ompi_info/modules.cc | 9 +++------ 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 src/mca/topo/.ompi_ignore delete mode 100644 src/mca/topo/base/.ompi_ignore diff --git a/src/mca/topo/.ompi_ignore b/src/mca/topo/.ompi_ignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/mca/topo/base/.ompi_ignore b/src/mca/topo/base/.ompi_ignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/mca/topo/base/base.h b/src/mca/topo/base/base.h index 49417ba427..ad693f14e6 100644 --- a/src/mca/topo/base/base.h +++ b/src/mca/topo/base/base.h @@ -106,6 +106,9 @@ extern "C" { int rank, int *nneighbors); +#if defined(c_plusplus) || defined(__cplusplus) +} +#endif /* * Globals diff --git a/src/tools/ompi_info/modules.cc b/src/tools/ompi_info/modules.cc index 5fe60cef27..e623af3f48 100644 --- a/src/tools/ompi_info/modules.cc +++ b/src/tools/ompi_info/modules.cc @@ -27,6 +27,8 @@ #include "mca/coll/base/base.h" #include "mca/ns/ns.h" #include "mca/ns/base/base.h" +#include "mca/topo/topo.h" +#include "mca/topo/base/base.h" #include "tools/ompi_info/ompi_info.h" using namespace std; @@ -145,13 +147,8 @@ void ompi_info::open_components() mca_ptl_base_open(); component_map["ptl"] = &mca_ptl_base_modules_available; -#if 0 - // topo component opening not implemented yet mca_topo_base_open(); - component_map["topo"] = &mca_topo_base_components_available; -#else - component_map["topo"] = NULL; -#endif + component_map["topo"] = &mca_topo_base_modules_opened; // All done