From 307d52aedc3bc3498c66a707076353da1aa0a2e5 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 17 Oct 2008 16:27:20 +0000 Subject: [PATCH] Ensure to check for internal ptmalloc2 support properly. This commit was SVN r19760. --- ompi/mca/btl/openib/btl_openib_component.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ompi/mca/btl/openib/btl_openib_component.c b/ompi/mca/btl/openib/btl_openib_component.c index 2985c1e3aa..5a9ed15df4 100644 --- a/ompi/mca/btl/openib/btl_openib_component.c +++ b/ompi/mca/btl/openib/btl_openib_component.c @@ -2037,6 +2037,7 @@ btl_openib_component_init(int *num_btl_modules, Right now, ptmalloc2 is the only memory manager that we have on OS's that support OpenFabrics that provide both FREE and MUNMAP support, so the following test is [currently] good enough... */ +#if !OMPI_HAVE_THREADS value = opal_mem_hooks_support_level(); if ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) == ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) & value)) { @@ -2044,7 +2045,8 @@ btl_openib_component_init(int *num_btl_modules, "ptmalloc2 with no threads", true, orte_process_info.nodename); goto no_btls; - } + } +#endif /* If we have a memory manager available, and mpi_leave_pinned==-1, then unless the user explicitly set