update lanl platform files for XE6

This commit was SVN r27964.

contrib/platform/lanl/cray_xe6/cray-common

@@ -0,0 +1,34 @@
+# (c) 2012-2013 Los Alamos National Security, LLC. All rights reserved.
+# Common Cray XE/XK-6 options (used by all builds)
+
+# do not use IB verbs
+with_verbs=no
+
+# enable XPMEM enhanced shared memory (needs for Vader BTL)
+with_xpmem=/opt/cray/xpmem/0.1-2.0400.30792.5.6.gem
+
+# enable Cray PMI support
+with_pmi=/opt/cray/pmi/2.1.4-1.0000.8596.8.9.gem
+with_cray_pmi2_ext=yes
+
+# enable ugni btl
+with_ugni=/opt/cray/ugni/2.3-1.0400.4127.5.20.gem
+with_ugni_includedir=/opt/cray/gni-headers/default/include
+
+if test -e /opt/cray/alps/default ; then
+   # use default location for CLE4
+   with_alps=yes
+else
+   # set resource manager to alps for CLE 4.1 (change if using a different CLE)
+   with_alps=/opt/cray/xe-sysroot/4.1.40/usr
+   # the above directory is missing the libraries on the login nodes so use
+   # the copies from /usr/lib
+   with_alps_libdir=/usr/lib/alps
+fi
+
+with_tm=no
+with_slurm=no
+
+# rpath alps, pmi, uGNI, and xpmem libraries
+LDFLAGS="$LDFLAGS -Wl,-rpath=/usr/lib64/alps -Wl,-rpath=$with_pmi/lib64 -Wl,-rpath=$with_ugni/lib64 -Wl,-rpath=$with_xpmem/lib64"
+with_wrapper_ldflags="-Wl,-rpath=/usr/lib64/alps -Wl,-rpath=$with_pmi/lib64 -Wl,-rpath=$with_ugni/lib64 -Wl,-rpath=$with_xpmem/lib64"

contrib/platform/lanl/cray_xe6/debug-common

@@ -0,0 +1,40 @@
+enable_dlopen=no
+enable_mem_profile=no
+enable_binaries=yes
+enable_heterogeneous=no
+enable_shared=yes
+enable_static=yes
+enable_orte_static_ports=no
+enable_ipv6=no
+enable_mpi_fortran=yes
+
+# enable debugging
+enable_mem_debug=yes
+enable_debug_symbols=yes
+enable_picky=yes
+enable_debug=yes
+
+# disable c++ bindings (removed in MPI 3.0)
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_cxx_exceptions=no
+
+# disable fault tolerance thread
+enable_ft_thread=no
+
+enable_per_user_config_files=no
+enable_pty_support=no
+enable_mca_no_build=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,ras-simulator
+enable_contrib_no_build=libnbc,vt
+
+# enable direct calling for ob1
+enable_mca_direct=pml-ob1
+
+# enable development headers
+with_devel_headers=yes
+
+# enable ptmalloc (enables lazy deregistration)
+with_memory_manager=ptmalloc2
+
+# disable valgrind
+with_valgrind=no

contrib/platform/lanl/cray_xe6/debug-lustre

@@ -0,0 +1,20 @@
+# (c) 2012-2013 Los Alamos National Security, LLC. All rights reserved.
+# Open MPI configuration for Cielo/Cielito v1.7.x/1.8.x GNU compiler,
+# Lustre
+
+if test "$CC" = "cc" ; then
+   echo "ERROR: Open MPI should not be compiled with Cray's wrapper compilers (cc/CC/ftn)"
+   exit 1
+fi
+
+source cray-common
+source debug-common
+
+if test "$CC" = "icc" ; then
+   source intel-common
+else
+   source gnu-common
+fi
+
+# enable and Lustre in romio
+with_io_romio_flags="--with-file-system=ufs+nfs+lustre CFLAGS=-I/opt/cray/lustre-cray_gem_s/default/include"

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

@@ -70,10 +70,10 @@ orte_report_launch_progress = 1
 ess_base_stream_buffering = 1
 
 # Define timeout for daemons to report back during launch
-orte_startup_timeout = 600000
+orte_startup_timeout = 360
 
 ## Protect the shared file systems
-orte_no_session_dirs = /panfs,/scratch,/users,/usr/projects
+orte_no_session_dirs = /lustre,/panfs,/scratch,/lscratch,/users,/usr/projects
 orte_tmpdir_base = /var/tmp
 
 ## Require an allocation to run - protects the frontend
@@ -81,7 +81,7 @@ orte_tmpdir_base = /var/tmp
 orte_allocation_required = 1
 
 ## Deal with the allocator
-orte_strip_prefix_from_node_names = 1
+plm_base_strip_prefix_from_node_names = 1
 orte_retain_aliases = 1
 # 1st alias entry is the stripped node name,
 # 2nd is the unstripped one
@@ -105,9 +105,6 @@ oob_tcp_rcvbuf = 32768
 ## Define the MPI interconnects
 btl = self,vader,ugni
 
-## Setup Gemini 
-# TODO LANL
-
 ## Enable cpu affinity 
 hwloc_base_binding_policy = core 
 

contrib/platform/lanl/cray_xe6/debug-nopanasas

@@ -1,37 +0,0 @@
-enable_dlopen=no
-enable_mem_debug=yes
-enable_mem_profile=yes
-enable_debug_symbols=yes
-enable_binaries=yes
-enable_heterogeneous=no
-enable_picky=yes
-enable_debug=yes
-enable_shared=yes
-enable_static=yes
-enable_orte_static_ports=no
-enable_ipv6=no
-enable_mpi_fortran=yes
-enable_mpi_cxx=yes
-enable_mpi_cxx_seek=yes
-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,oob-ud
-enable_contrib_no_build=libnbc,vt
-with_verbs=no
-with_devel_headers=yes
-with_alps=yes
-with_xpmem=/opt/cray/xpmem/default
-with_pmi=/opt/cray/pmi/default
-with_cray_pmi2_ext=yes
-# enable ugni btl
-with_ugni=/opt/cray/ugni/default
-with_ugni_includedir=/opt/cray/gni-headers/default/include
-with_tm=no
-with_slurm=no
-with_io_romio_flags=--with-file-system=ufs+nfs
-with_memory_manager=ptmalloc2
-with_valgrind=no
-with_wrapper_cflags="-march=amdfam10"
-CFLAGS=-march=amdfam10

contrib/platform/lanl/cray_xe6/gnu-common

@@ -0,0 +1,11 @@
+# (c) 2012 Los Alamos National Security, LLC. All rights reserved.
+# Common GNU compiler optimization for Cray XE/XK-6 systems
+
+with_wrapper_cflags="$with_wrapper_cflags -march=native"
+with_wrapper_cxxflags="$with_wrapper_cxxflags -march=native"
+with_wrapper_fcflags="$with_wrapper_fcflags -march=native"
+with_wrapper_ffflags="$with_wrapper_ffflags -march=native"
+with_wrapper_casflags="$with_wrapper_casflags -march=native"
+
+# optimize this build of Open MPI
+CFLAGS="$CFLAGS -march=native -O2"

contrib/platform/lanl/cray_xe6/intel-common

@@ -0,0 +1,15 @@
+# (c) 2012 Los Alamos National Security, LLC. All rights reserved.
+# Common Intel compiler optimization for Cray XE/XK-6 systems
+
+with_wrapper_cflags="$with_wrapper_cflags -msse3"
+with_wrapper_cxxflags="$with_wrapper_cxxflags -msse3"
+with_wrapper_fcflags="$with_wrapper_fcflags -msse3"
+with_wrapper_ffflags="$with_wrapper_ffflags -msse3"
+with_wrapper_casflags="$with_wrapper_casflags -msse3"
+
+# optimize this build of Open MPI
+CFLAGS="$CFLAGS -msse3"
+CXXFLAGS="$CXXFLAGS -msse3"
+CC=icc
+CXX=icpc
+FTN=ifort

contrib/platform/lanl/cray_xe6/optimized-common

@@ -0,0 +1,47 @@
+enable_dlopen=no
+
+enable_mem_profile=no
+enable_binaries=yes
+
+enable_heterogeneous=no
+enable_shared=yes
+enable_static=yes
+
+enable_orte_static_ports=no
+
+enable_ipv6=no
+
+# enable fortran bindings
+enable_mpi_fortran=yes
+
+# disable debugging
+enable_mem_debug=no
+enable_debug_symbols=no
+enable_picky=no
+enable_debug=no
+
+# disable c++ bindings (removed in MPI 3.0)
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_cxx_exceptions=no
+
+# disable fault tolerance thread
+enable_ft_thread=no
+
+enable_per_user_config_files=no
+enable_pty_support=no
+enable_mca_no_build=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,ras-simulator,mpool-fake
+enable_mca_static=btl:ugni,btl:self,btl:vader,pml:ob1,coll:ml
+enable_contrib_no_build=libnbc,vt
+
+# enable direct calling for ob1
+enable_mca_direct=pml-ob1
+
+# enable development headers
+with_devel_headers=yes
+
+# enable ptmalloc (enables lazy deregistration)
+with_memory_manager=ptmalloc2
+
+# disable valgrind
+with_valgrind=no

contrib/platform/lanl/cray_xe6/optimized-lustre

@@ -0,0 +1,25 @@
+# (c) 2012-2013 Los Alamos National Security, LLC. All rights reserved.
+# Open MPI configuration for Cielo/Cielito v1.7.x/1.8.x GNU compiler,
+# Lustre
+
+if test "$CC" = "cc" ; then
+   echo "ERROR: Open MPI should not be compiled with Cray's wrapper compilers (cc/CC/ftn)"
+   exit 1
+fi
+
+source cray-common
+
+if test "$enable_debug" = "yes"; then
+   source debug-common
+else
+   source optimized-common
+fi
+
+if test "$CC" = "icc" ; then
+   source intel-common
+else
+   source gnu-common
+fi
+
+# enable and Lustre in romio
+with_io_romio_flags="--with-file-system=ufs+nfs+lustre CFLAGS=-I/opt/cray/lustre-cray_gem_s/default/include"

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

@@ -70,10 +70,10 @@ orte_report_launch_progress = 1
 ess_base_stream_buffering = 1
 
 # Define timeout for daemons to report back during launch
-orte_startup_timeout = 600000
+orte_startup_timeout = 360
 
 ## Protect the shared file systems
-orte_no_session_dirs = /panfs,/scratch,/users,/usr/projects
+orte_no_session_dirs = /lustre,/panfs,/scratch,/lscratch,/users,/usr/projects
 orte_tmpdir_base = /var/tmp
 
 ## Require an allocation to run - protects the frontend

contrib/platform/lanl/cray_xe6/optimized-nopanasas

@@ -1,37 +0,0 @@
-enable_dlopen=no
-enable_mem_debug=no
-enable_mem_profile=no
-enable_debug_symbols=no
-enable_binaries=yes
-enable_heterogeneous=no
-enable_picky=no
-enable_debug=no
-enable_shared=yes
-enable_orte_static_ports=no
-enable_static=yes
-enable_ipv6=no
-enable_mpi_fortran=yes
-enable_mpi_cxx=yes
-enable_mpi_cxx_seek=yes
-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,oob-ud
-enable_contrib_no_build=libnbc,vt
-with_verbs=no
-with_devel_headers=yes
-with_alps=yes
-with_xpmem=/opt/cray/xpmem/default
-with_pmi=/opt/cray/pmi/default
-with_cray_pmi2_ext=yes
-# enable ugni btl
-with_ugni=/opt/cray/ugni/default
-with_ugni_includedir=/opt/cray/gni-headers/default/include
-with_tm=no
-with_slurm=no
-with_io_romio_flags=--with-file-system=ufs+nfs
-with_memory_manager=ptmalloc2
-with_valgrind=no
-with_wrapper_cflags="-march=amdfam10"
-CFLAGS=-march=amdfam10