From 89bd91900104e5336bacf161d776599173e3637c Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Wed, 27 Apr 2016 12:06:18 -0600 Subject: [PATCH 1/3] memory: fix typo This is a 2.x specific change. No master equivalent. Signed-off-by: Nathan Hjelm --- opal/mca/memory/base/memory_base_open.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opal/mca/memory/base/memory_base_open.c b/opal/mca/memory/base/memory_base_open.c index 2ab4c00eb2..79c1111fa9 100644 --- a/opal/mca/memory/base/memory_base_open.c +++ b/opal/mca/memory/base/memory_base_open.c @@ -113,7 +113,7 @@ static int opal_memory_base_open(mca_base_open_flag_t flags) #if MEMORY_LINUX_PTMALLOC2 /* See above comment about linux/ptmalloc2 about why this abstraction violation is here. */ - if (0 == strcmp (tmp->mca_component_name, "linux")) { + if (0 == strcmp (tmp->memoryc_version.mca_component_name, "linux")) { /* if ptmalloc is enabled always use it */ priority = 1000000; } From b90b83dd3f0ff7c4da72b3bb0da5f28a38f191f0 Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Wed, 27 Apr 2016 13:27:32 -0600 Subject: [PATCH 2/3] memory: give linux same priority as patcher component This commit ensures that is --with-memory-manager=linux is specified then the linux memory component is actually enabled. The lower priority was preventing this. Signed-off-by: Nathan Hjelm --- opal/mca/memory/linux/configure.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opal/mca/memory/linux/configure.m4 b/opal/mca/memory/linux/configure.m4 index 9a37d38a4d..9688512774 100644 --- a/opal/mca/memory/linux/configure.m4 +++ b/opal/mca/memory/linux/configure.m4 @@ -19,7 +19,7 @@ # # $HEADER$ # -AC_DEFUN([MCA_opal_memory_linux_PRIORITY], [40]) +AC_DEFUN([MCA_opal_memory_linux_PRIORITY], [41]) AC_DEFUN([MCA_opal_memory_linux_COMPILE_MODE], [ AC_MSG_CHECKING([for MCA component $2:$3 compile mode]) From 8c8cc5b9ae5d98ddf9bd7b91d5171c64a5f1af6c Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Wed, 27 Apr 2016 13:30:50 -0600 Subject: [PATCH 3/3] platform/lanl: do not use ptmalloc2 Signed-off-by: Nathan Hjelm --- contrib/platform/lanl/cray_xc_cle5.2/debug-common | 3 --- contrib/platform/lanl/cray_xc_cle5.2/optimized-common | 3 --- contrib/platform/lanl/darwin/darwin-common | 3 --- contrib/platform/lanl/toss/toss-common | 3 --- 4 files changed, 12 deletions(-) diff --git a/contrib/platform/lanl/cray_xc_cle5.2/debug-common b/contrib/platform/lanl/cray_xc_cle5.2/debug-common index d75d45a1f9..4397ccf9d0 100644 --- a/contrib/platform/lanl/cray_xc_cle5.2/debug-common +++ b/contrib/platform/lanl/cray_xc_cle5.2/debug-common @@ -32,8 +32,5 @@ enable_mca_direct=pml-ob1 # enable development headers with_devel_headers=yes -# enable ptmalloc (enables lazy deregistration) -with_memory_manager=linux - # disable valgrind with_valgrind=no diff --git a/contrib/platform/lanl/cray_xc_cle5.2/optimized-common b/contrib/platform/lanl/cray_xc_cle5.2/optimized-common index 04e556ff84..4380b9a0e9 100644 --- a/contrib/platform/lanl/cray_xc_cle5.2/optimized-common +++ b/contrib/platform/lanl/cray_xc_cle5.2/optimized-common @@ -40,8 +40,5 @@ enable_mca_direct=pml-ob1 # enable development headers with_devel_headers=yes -# enable ptmalloc (enables lazy deregistration) -with_memory_manager=linux - # disable valgrind with_valgrind=no diff --git a/contrib/platform/lanl/darwin/darwin-common b/contrib/platform/lanl/darwin/darwin-common index 1b51cf39d3..31ee911e26 100644 --- a/contrib/platform/lanl/darwin/darwin-common +++ b/contrib/platform/lanl/darwin/darwin-common @@ -22,9 +22,6 @@ enable_cxx_exceptions=no # Disable components not needed on any TOSS platform enable_mca_no_build=carto,crs,filem,routed-linear,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,btl-tcp -# Enable malloc hooks for mpi_leave_pinned -with_memory_manager=linux - # TOSS2 uses slurm with_slurm=yes with_tm=no diff --git a/contrib/platform/lanl/toss/toss-common b/contrib/platform/lanl/toss/toss-common index ba000be23f..2927fb2816 100644 --- a/contrib/platform/lanl/toss/toss-common +++ b/contrib/platform/lanl/toss/toss-common @@ -22,9 +22,6 @@ enable_cxx_exceptions=no # Disable components not needed on any TOSS platform enable_mca_no_build=carto,crs,filem,routed-linear,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,btl-tcp -# Enable malloc hooks for mpi_leave_pinned -with_memory_manager=linux - # TOSS2 uses slurm with_slurm=yes with_tm=no