LANL: update XE-6 platform files

This commit was SVN r26394.

contrib/platform/lanl/cray_xe6/debug-nopanasas

@@ -16,7 +16,7 @@ enable_cxx_exceptions=yes
 enable_ft_thread=no
 enable_per_user_config_files=no
 enable_pty_support=no
-enable_mca_no_build=carto,crs,filem,routed-linear,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,ess-cnos,grpcomm-cnos,plm-rsh,btl-tcp
+enable_mca_no_build=carto,crs,filem,routed-linear,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,ess-cnos,grpcomm-cnos,plm-rsh,btl-tcp,oob-ud
 enable_contrib_no_build=libnbc,vt
 with_openib=no
 with_devel_headers=yes

contrib/platform/lanl/cray_xe6/debug-nopanasas.conf

@@ -66,8 +66,11 @@ orte_abort_timeout = 10
 opal_set_max_sys_limits = 1
 orte_report_launch_progress = 1
 
+# Set line buffering for stdout/stderr
+ess_base_stream_buffering = 1
+
 # Define timeout for daemons to report back during launch
-orte_startup_timeout = 1000
+orte_startup_timeout = 600000
 
 ## Protect the shared file systems
 orte_no_session_dirs = /panfs,/scratch,/users,/usr/projects
@@ -96,8 +99,7 @@ oob_tcp_sndbuf = 32768
 oob_tcp_rcvbuf = 32768
 
 ## Define the MPI interconnects
-# TODO LANL: update
-btl = self,vader,ugni 
+btl = self,vader,ugni
 
 ## Setup Gemini 
 # TODO LANL

contrib/platform/lanl/cray_xe6/optimized-nopanasas

@@ -16,7 +16,7 @@ enable_cxx_exceptions=yes
 enable_ft_thread=no
 enable_per_user_config_files=no
 enable_pty_support=no
-enable_mca_no_build=carto,crs,filem,routed-linear,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,ess-cnos,grpcomm-cnos,plm-rsh,btl-tcp
+enable_mca_no_build=carto,crs,filem,routed-linear,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,ess-cnos,grpcomm-cnos,plm-rsh,btl-tcp,oob-ud
 enable_contrib_no_build=libnbc,vt
 with_openib=no
 with_devel_headers=yes

contrib/platform/lanl/cray_xe6/optimized-nopanasas.conf

@@ -66,8 +66,11 @@ orte_abort_timeout = 10
 opal_set_max_sys_limits = 1
 orte_report_launch_progress = 1
 
+# Set line buffering for stdout/stderr
+ess_base_stream_buffering = 1
+
 # Define timeout for daemons to report back during launch
-orte_startup_timeout = 1000
+orte_startup_timeout = 600000
 
 ## Protect the shared file systems
 orte_no_session_dirs = /panfs,/scratch,/users,/usr/projects