From 65f0a1759d173e4f0f49eb5d5db707b9a03c89e2 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Thu, 16 Apr 2009 18:54:19 +0000 Subject: [PATCH] Relentless pursuit of parameters... This commit was SVN r21034. --- contrib/platform/lanl/rr-class/debug-master.conf | 5 ++++- contrib/platform/lanl/rr-class/debug-nopanasas.conf | 4 +++- contrib/platform/lanl/rr-class/debug-panasas.conf | 4 +++- contrib/platform/lanl/rr-class/debug-slave | 2 ++ contrib/platform/lanl/rr-class/optimized-master.conf | 5 ++++- contrib/platform/lanl/rr-class/optimized-nopanasas.conf | 4 +++- contrib/platform/lanl/rr-class/optimized-panasas.conf | 4 +++- contrib/platform/lanl/rr-class/optimized-slave | 2 ++ contrib/platform/lanl/rr-class/optimized-slave.conf | 1 - contrib/platform/lanl/tlcc/debug-nopanasas.conf | 4 +++- contrib/platform/lanl/tlcc/debug-panasas.conf | 4 +++- contrib/platform/lanl/tlcc/optimized-nopanasas.conf | 4 +++- contrib/platform/lanl/tlcc/optimized-panasas.conf | 4 +++- 13 files changed, 36 insertions(+), 11 deletions(-) diff --git a/contrib/platform/lanl/rr-class/debug-master.conf b/contrib/platform/lanl/rr-class/debug-master.conf index a0498b8276..66ed7fd7c8 100644 --- a/contrib/platform/lanl/rr-class/debug-master.conf +++ b/contrib/platform/lanl/rr-class/debug-master.conf @@ -72,7 +72,9 @@ orte_tmpdir_base = /tmp orte_allocation_required = 1 ## MPI behavior -mpi_leave_pinned = 1 +## Do NOT specify mpi_leave_pinned so system +## can figure out for itself whether or not +## it is supported and usable pml = csum ## Protect looped collectives @@ -93,6 +95,7 @@ oob_tcp_rcvbuf = 32768 ## Define the MPI interconnects btl = sm,openib,tcp,self +btl_tcp_if_include = apnet0,apnet1,apnet2,apnet3,eth0 ## Setup OpenIB btl_openib_want_fork_support = 0 diff --git a/contrib/platform/lanl/rr-class/debug-nopanasas.conf b/contrib/platform/lanl/rr-class/debug-nopanasas.conf index bf1e64911d..7469d2a90f 100644 --- a/contrib/platform/lanl/rr-class/debug-nopanasas.conf +++ b/contrib/platform/lanl/rr-class/debug-nopanasas.conf @@ -72,7 +72,9 @@ orte_tmpdir_base = /tmp orte_allocation_required = 1 ## MPI behavior -mpi_leave_pinned = 1 +## Do NOT specify mpi_leave_pinned so system +## can figure out for itself whether or not +## it is supported and usable pml = csum ## Protect looped collectives diff --git a/contrib/platform/lanl/rr-class/debug-panasas.conf b/contrib/platform/lanl/rr-class/debug-panasas.conf index bf1e64911d..7469d2a90f 100644 --- a/contrib/platform/lanl/rr-class/debug-panasas.conf +++ b/contrib/platform/lanl/rr-class/debug-panasas.conf @@ -72,7 +72,9 @@ orte_tmpdir_base = /tmp orte_allocation_required = 1 ## MPI behavior -mpi_leave_pinned = 1 +## Do NOT specify mpi_leave_pinned so system +## can figure out for itself whether or not +## it is supported and usable pml = csum ## Protect looped collectives diff --git a/contrib/platform/lanl/rr-class/debug-slave b/contrib/platform/lanl/rr-class/debug-slave index aee890636e..17e6c159c9 100644 --- a/contrib/platform/lanl/rr-class/debug-slave +++ b/contrib/platform/lanl/rr-class/debug-slave @@ -25,6 +25,8 @@ with_openib=no with_devel_headers=yes with_slurm=no with_memory_manager=ptmalloc2 +CC=ppu-gcc +CXX=ppu-g++ LDFLAGS="-m64" CFLAGS="-m64" CXXFLAGS="-m64" diff --git a/contrib/platform/lanl/rr-class/optimized-master.conf b/contrib/platform/lanl/rr-class/optimized-master.conf index a0498b8276..66ed7fd7c8 100644 --- a/contrib/platform/lanl/rr-class/optimized-master.conf +++ b/contrib/platform/lanl/rr-class/optimized-master.conf @@ -72,7 +72,9 @@ orte_tmpdir_base = /tmp orte_allocation_required = 1 ## MPI behavior -mpi_leave_pinned = 1 +## Do NOT specify mpi_leave_pinned so system +## can figure out for itself whether or not +## it is supported and usable pml = csum ## Protect looped collectives @@ -93,6 +95,7 @@ oob_tcp_rcvbuf = 32768 ## Define the MPI interconnects btl = sm,openib,tcp,self +btl_tcp_if_include = apnet0,apnet1,apnet2,apnet3,eth0 ## Setup OpenIB btl_openib_want_fork_support = 0 diff --git a/contrib/platform/lanl/rr-class/optimized-nopanasas.conf b/contrib/platform/lanl/rr-class/optimized-nopanasas.conf index f88fec906a..34800cf027 100644 --- a/contrib/platform/lanl/rr-class/optimized-nopanasas.conf +++ b/contrib/platform/lanl/rr-class/optimized-nopanasas.conf @@ -72,7 +72,9 @@ orte_tmpdir_base = /tmp orte_allocation_required = 1 ## MPI behavior -mpi_leave_pinned = 1 +## Do NOT specify mpi_leave_pinned so system +## can figure out for itself whether or not +## it is supported and usable pml = csum ## Protect looped collectives diff --git a/contrib/platform/lanl/rr-class/optimized-panasas.conf b/contrib/platform/lanl/rr-class/optimized-panasas.conf index f88fec906a..34800cf027 100644 --- a/contrib/platform/lanl/rr-class/optimized-panasas.conf +++ b/contrib/platform/lanl/rr-class/optimized-panasas.conf @@ -72,7 +72,9 @@ orte_tmpdir_base = /tmp orte_allocation_required = 1 ## MPI behavior -mpi_leave_pinned = 1 +## Do NOT specify mpi_leave_pinned so system +## can figure out for itself whether or not +## it is supported and usable pml = csum ## Protect looped collectives diff --git a/contrib/platform/lanl/rr-class/optimized-slave b/contrib/platform/lanl/rr-class/optimized-slave index 8215fecb1f..48fc13213e 100644 --- a/contrib/platform/lanl/rr-class/optimized-slave +++ b/contrib/platform/lanl/rr-class/optimized-slave @@ -25,6 +25,8 @@ with_openib=no with_devel_headers=yes with_slurm=no with_memory_manager=ptmalloc2 +CC=ppu-gcc +CXX=ppu-g++ LDFLAGS="-m64" CFLAGS="-m64" CXXFLAGS="-m64" diff --git a/contrib/platform/lanl/rr-class/optimized-slave.conf b/contrib/platform/lanl/rr-class/optimized-slave.conf index 75a887cfa6..2c7ca21e66 100644 --- a/contrib/platform/lanl/rr-class/optimized-slave.conf +++ b/contrib/platform/lanl/rr-class/optimized-slave.conf @@ -78,7 +78,6 @@ oob_tcp_rcvbuf = 32768 ## Define the MPI interconnects btl = tcp,self -btl_tcp_if_include=eth0 ## Setup MPI options mpi_show_handle_leaks = 0 diff --git a/contrib/platform/lanl/tlcc/debug-nopanasas.conf b/contrib/platform/lanl/tlcc/debug-nopanasas.conf index 105edbdd01..81ea7ad23e 100644 --- a/contrib/platform/lanl/tlcc/debug-nopanasas.conf +++ b/contrib/platform/lanl/tlcc/debug-nopanasas.conf @@ -72,7 +72,9 @@ orte_tmpdir_base = /tmp orte_allocation_required = 1 ## MPI behavior -mpi_leave_pinned = 1 +## Do NOT specify mpi_leave_pinned so system +## can figure out for itself whether or not +## it is supported and usable ## Protect looped collectives coll_sync_priority = 100 diff --git a/contrib/platform/lanl/tlcc/debug-panasas.conf b/contrib/platform/lanl/tlcc/debug-panasas.conf index 105edbdd01..81ea7ad23e 100644 --- a/contrib/platform/lanl/tlcc/debug-panasas.conf +++ b/contrib/platform/lanl/tlcc/debug-panasas.conf @@ -72,7 +72,9 @@ orte_tmpdir_base = /tmp orte_allocation_required = 1 ## MPI behavior -mpi_leave_pinned = 1 +## Do NOT specify mpi_leave_pinned so system +## can figure out for itself whether or not +## it is supported and usable ## Protect looped collectives coll_sync_priority = 100 diff --git a/contrib/platform/lanl/tlcc/optimized-nopanasas.conf b/contrib/platform/lanl/tlcc/optimized-nopanasas.conf index bc49871983..32f177dc04 100644 --- a/contrib/platform/lanl/tlcc/optimized-nopanasas.conf +++ b/contrib/platform/lanl/tlcc/optimized-nopanasas.conf @@ -72,7 +72,9 @@ orte_tmpdir_base = /tmp orte_allocation_required = 1 ## MPI behavior -mpi_leave_pinned = 1 +## Do NOT specify mpi_leave_pinned so system +## can figure out for itself whether or not +## it is supported and usable ## Protect looped collectives coll_sync_priority = 100 diff --git a/contrib/platform/lanl/tlcc/optimized-panasas.conf b/contrib/platform/lanl/tlcc/optimized-panasas.conf index bc49871983..32f177dc04 100644 --- a/contrib/platform/lanl/tlcc/optimized-panasas.conf +++ b/contrib/platform/lanl/tlcc/optimized-panasas.conf @@ -72,7 +72,9 @@ orte_tmpdir_base = /tmp orte_allocation_required = 1 ## MPI behavior -mpi_leave_pinned = 1 +## Do NOT specify mpi_leave_pinned so system +## can figure out for itself whether or not +## it is supported and usable ## Protect looped collectives coll_sync_priority = 100