Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions contrib/platform/lanl/cray_xc_cle5.2/debug-common
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 0 additions & 3 deletions contrib/platform/lanl/cray_xc_cle5.2/optimized-common
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 0 additions & 3 deletions contrib/platform/lanl/darwin/darwin-common
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions contrib/platform/lanl/toss/toss-common
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/memory/base/memory_base_open.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/memory/linux/configure.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down