From e811a8a9cb64a2c4a54c8b88d93ead95e16d9c96 Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Thu, 2 Jan 2014 22:35:37 +0000 Subject: [PATCH] Make the Portals 4 collective component disable itself when there's not a Portals 4 point-to-point (MTL or BTL) component in use This commit was SVN r30109. --- ompi/mca/coll/portals4/coll_portals4_component.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ompi/mca/coll/portals4/coll_portals4_component.c b/ompi/mca/coll/portals4/coll_portals4_component.c index bb717e0ea8..e1a0dda377 100644 --- a/ompi/mca/coll/portals4/coll_portals4_component.c +++ b/ompi/mca/coll/portals4/coll_portals4_component.c @@ -235,6 +235,15 @@ portals4_init_query(bool enable_progress_threads, ptl_md_t md; ptl_me_t me; + /* Make sure someone is populating the proc table, since we're not + in a really good position to do so */ + if (NULL == ompi_proc_local()->proc_endpoints[OMPI_PROC_ENDPOINT_TAG_PORTALS4]) { + opal_output_verbose(1, ompi_coll_base_framework.framework_output, + "%s:%d: Proc table not previously populated", + __FILE__, __LINE__); + return OMPI_ERROR; + } + /* Initialize Portals and create a physical, matching interface */ ret = PtlInit(); if (PTL_OK != ret) {