From 278522d8e82a0cd0158e0bd84c800f0a905a2e2a Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Wed, 31 Jul 2013 17:56:22 +0000 Subject: [PATCH] Update LANL platform files for changes in linux memory hook configuration. No review necessary cmr=v1.7.3:reviewer=ompi-gk1.7 This commit was SVN r28969. --- contrib/platform/lanl/cray_xe6/debug-common | 2 +- contrib/platform/lanl/cray_xe6/optimized-common | 2 +- contrib/platform/lanl/tlcc/debug-nopanasas | 2 +- contrib/platform/lanl/tlcc/debug-panasas | 2 +- contrib/platform/lanl/tlcc/optimized-nopanasas | 2 +- contrib/platform/lanl/tlcc/optimized-panasas | 2 +- contrib/platform/lanl/tlcc2/debug-nopanasas | 2 +- contrib/platform/lanl/tlcc2/debug-panasas | 2 +- contrib/platform/lanl/tlcc2/optimized-nopanasas | 2 +- contrib/platform/lanl/tlcc2/optimized-panasas | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/contrib/platform/lanl/cray_xe6/debug-common b/contrib/platform/lanl/cray_xe6/debug-common index 04979f2b69..6e0947faa9 100644 --- a/contrib/platform/lanl/cray_xe6/debug-common +++ b/contrib/platform/lanl/cray_xe6/debug-common @@ -34,7 +34,7 @@ enable_mca_direct=pml-ob1 with_devel_headers=yes # enable ptmalloc (enables lazy deregistration) -with_memory_manager=ptmalloc2 +with_memory_manager=linux # disable valgrind with_valgrind=no diff --git a/contrib/platform/lanl/cray_xe6/optimized-common b/contrib/platform/lanl/cray_xe6/optimized-common index f713523e57..b284c52c56 100644 --- a/contrib/platform/lanl/cray_xe6/optimized-common +++ b/contrib/platform/lanl/cray_xe6/optimized-common @@ -41,7 +41,7 @@ enable_mca_direct=pml-ob1 with_devel_headers=yes # enable ptmalloc (enables lazy deregistration) -with_memory_manager=ptmalloc2 +with_memory_manager=linux # disable valgrind with_valgrind=no diff --git a/contrib/platform/lanl/tlcc/debug-nopanasas b/contrib/platform/lanl/tlcc/debug-nopanasas index 23d03be43b..5be9dadae7 100644 --- a/contrib/platform/lanl/tlcc/debug-nopanasas +++ b/contrib/platform/lanl/tlcc/debug-nopanasas @@ -23,5 +23,5 @@ with_verbs=yes with_devel_headers=yes with_tm=no with_io_romio_flags=--with-file-system=ufs+nfs -with_memory_manager=ptmalloc2 +with_memory_manager=linux with_valgrind=no diff --git a/contrib/platform/lanl/tlcc/debug-panasas b/contrib/platform/lanl/tlcc/debug-panasas index 0300f4245f..de44112e89 100644 --- a/contrib/platform/lanl/tlcc/debug-panasas +++ b/contrib/platform/lanl/tlcc/debug-panasas @@ -23,7 +23,7 @@ with_tm=no with_verbs=yes with_devel_headers=yes with_io_romio_flags=--with-file-system=ufs+nfs+panfs -with_memory_manager=ptmalloc2 +with_memory_manager=linux with_valgrind=no CFLAGS="-I/opt/panfs/include" CXXFLAGS="-I/opt/panfs/include" diff --git a/contrib/platform/lanl/tlcc/optimized-nopanasas b/contrib/platform/lanl/tlcc/optimized-nopanasas index d65de451b6..79ab24d832 100644 --- a/contrib/platform/lanl/tlcc/optimized-nopanasas +++ b/contrib/platform/lanl/tlcc/optimized-nopanasas @@ -23,5 +23,5 @@ with_tm=no with_verbs=yes with_devel_headers=yes with_io_romio_flags=--with-file-system=ufs+nfs -with_memory_manager=ptmalloc2 +with_memory_manager=linux with_valgrind=no diff --git a/contrib/platform/lanl/tlcc/optimized-panasas b/contrib/platform/lanl/tlcc/optimized-panasas index 6bd7deba98..c58c51032c 100644 --- a/contrib/platform/lanl/tlcc/optimized-panasas +++ b/contrib/platform/lanl/tlcc/optimized-panasas @@ -23,7 +23,7 @@ with_tm=no with_verbs=yes with_devel_headers=yes with_io_romio_flags=--with-file-system=ufs+nfs+panfs -with_memory_manager=ptmalloc2 +with_memory_manager=linux with_valgrind=no CFLAGS="-I/opt/panfs/include" CXXFLAGS="-I/opt/panfs/include" diff --git a/contrib/platform/lanl/tlcc2/debug-nopanasas b/contrib/platform/lanl/tlcc2/debug-nopanasas index 72836e9b0f..42cfd43ff2 100644 --- a/contrib/platform/lanl/tlcc2/debug-nopanasas +++ b/contrib/platform/lanl/tlcc2/debug-nopanasas @@ -24,5 +24,5 @@ with_verbs=yes with_psm=yes with_devel_headers=yes with_io_romio_flags=--with-file-system=ufs+nfs -with_memory_manager=ptmalloc2 +with_memory_manager=linux with_valgrind=no diff --git a/contrib/platform/lanl/tlcc2/debug-panasas b/contrib/platform/lanl/tlcc2/debug-panasas index e227fb7dd3..db829ba019 100644 --- a/contrib/platform/lanl/tlcc2/debug-panasas +++ b/contrib/platform/lanl/tlcc2/debug-panasas @@ -24,7 +24,7 @@ with_verbs=yes with_psm=yes with_devel_headers=yes with_io_romio_flags=--with-file-system=ufs+nfs+panfs -with_memory_manager=ptmalloc2 +with_memory_manager=linux with_valgrind=no CFLAGS="-I/opt/panfs/include" CXXFLAGS="-I/opt/panfs/include" diff --git a/contrib/platform/lanl/tlcc2/optimized-nopanasas b/contrib/platform/lanl/tlcc2/optimized-nopanasas index b6bd9d5b32..41a2f421bc 100644 --- a/contrib/platform/lanl/tlcc2/optimized-nopanasas +++ b/contrib/platform/lanl/tlcc2/optimized-nopanasas @@ -24,5 +24,5 @@ with_verbs=yes with_psm=yes with_devel_headers=yes with_io_romio_flags=--with-file-system=ufs+nfs -with_memory_manager=ptmalloc2 +with_memory_manager=linux with_valgrind=no diff --git a/contrib/platform/lanl/tlcc2/optimized-panasas b/contrib/platform/lanl/tlcc2/optimized-panasas index fc3896fa17..f5784aa9d7 100644 --- a/contrib/platform/lanl/tlcc2/optimized-panasas +++ b/contrib/platform/lanl/tlcc2/optimized-panasas @@ -24,7 +24,7 @@ with_verbs=yes with_psm=yes with_devel_headers=yes with_io_romio_flags=--with-file-system=ufs+nfs+panfs -with_memory_manager=ptmalloc2 +with_memory_manager=linux with_valgrind=no CFLAGS="-I/opt/panfs/include" CXXFLAGS="-I/opt/panfs/include"