diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 252d0f250a..1982623726 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -55,10 +55,6 @@ EXTRA_DIST = \ platform/lanl/rr-class/debug-master.conf \ platform/lanl/rr-class/optimized-master \ platform/lanl/rr-class/optimized-master.conf \ - platform/lanl/rr-class/debug-slave \ - platform/lanl/rr-class/debug-slave.conf \ - platform/lanl/rr-class/optimized-slave \ - platform/lanl/rr-class/optimized-slave.conf \ platform/lanl/rr-class/debug-panasas-nocell \ platform/lanl/rr-class/debug-panasas-nocell.conf \ platform/lanl/rr-class/debug-nopanasas-nocell \ diff --git a/contrib/platform/lanl/rr-class/cross-debug-slave b/contrib/platform/lanl/rr-class/cross-debug-slave index 544c28efee..bad57f4ded 100644 --- a/contrib/platform/lanl/rr-class/cross-debug-slave +++ b/contrib/platform/lanl/rr-class/cross-debug-slave @@ -18,7 +18,7 @@ enable_ft_thread=no enable_per_user_config_files=no enable_script_wrapper_compilers=yes enable_io_romio=no -enable_mca_no_build=crs,routed-linear,routed-radix,routed-binomial,routed-direct,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,btl-openib,btl-sm,filem,plm-tm +enable_mca_no_build=crs,routed-linear,routed-radix,routed-binomial,routed-direct,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,btl-openib,btl-sm,filem,plm-tm,pml-csum enable_contrib_no_build=libnbc,vt with_tm=no with_openib=no diff --git a/contrib/platform/lanl/rr-class/cross-optimized-slave b/contrib/platform/lanl/rr-class/cross-optimized-slave index b670ec7f63..b530e03fea 100644 --- a/contrib/platform/lanl/rr-class/cross-optimized-slave +++ b/contrib/platform/lanl/rr-class/cross-optimized-slave @@ -18,7 +18,7 @@ enable_ft_thread=no enable_per_user_config_files=no enable_script_wrapper_compilers=yes enable_io_romio=no -enable_mca_no_build=crs,routed-linear,routed-radix,routed-binomial,routed-direct,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,btl-openib,btl-sm,filem,plm-tm +enable_mca_no_build=crs,routed-linear,routed-radix,routed-binomial,routed-direct,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,btl-openib,btl-sm,filem,plm-tm,pml-csum enable_contrib_no_build=libnbc,vt with_tm=no with_openib=no diff --git a/contrib/platform/lanl/rr-class/debug-master b/contrib/platform/lanl/rr-class/debug-master index 786c1be22c..12031f13d7 100644 --- a/contrib/platform/lanl/rr-class/debug-master +++ b/contrib/platform/lanl/rr-class/debug-master @@ -16,7 +16,7 @@ enable_mpi_cxx_seek=yes enable_cxx_exceptions=no enable_ft_thread=no enable_per_user_config_files=no -enable_mca_no_build=crs,routed-direct,routed-linear,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,filem +enable_mca_no_build=crs,routed-direct,routed-linear,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,filem,pml-csum enable_contrib_no_build=libnbc,vt with_tm=/opt/PBS with_openib=/opt/ofed diff --git a/contrib/platform/lanl/rr-class/debug-master.conf b/contrib/platform/lanl/rr-class/debug-master.conf index 66ed7fd7c8..194f8a5c11 100644 --- a/contrib/platform/lanl/rr-class/debug-master.conf +++ b/contrib/platform/lanl/rr-class/debug-master.conf @@ -75,7 +75,6 @@ orte_allocation_required = 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 coll_sync_priority = 100 diff --git a/contrib/platform/lanl/rr-class/debug-slave b/contrib/platform/lanl/rr-class/debug-slave deleted file mode 100644 index 17e6c159c9..0000000000 --- a/contrib/platform/lanl/rr-class/debug-slave +++ /dev/null @@ -1,35 +0,0 @@ -enable_dlopen=no -enable_mem_debug=no -enable_mem_profile=no -enable_debug_symbols=no -enable_binaries=yes -enable_heterogeneous=yes -enable_debug=yes -enable_shared=no -enable_static=yes -enable_memchecker=no -enable_ipv6=no -enable_mpi_f77=no -enable_mpi_f90=no -enable_mpi_cxx=no -enable_mpi_cxx_seek=no -enable_cxx_exceptions=no -enable_ft_thread=no -enable_per_user_config_files=no -enable_script_wrapper_compilers=yes -enable_io_romio=no -enable_mca_no_build=crs,routed-linear,routed-radix,routed-binomial,routed-direct,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,btl-openib,btl-sm,filem,plm-tm -enable_contrib_no_build=libnbc,vt -with_tm=no -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" -with_wrapper_ldflags="-m64" -with_wrapper_cflags="-m64" -with_wrapper_cxxflags="-m64" diff --git a/contrib/platform/lanl/rr-class/debug-slave.conf b/contrib/platform/lanl/rr-class/debug-slave.conf deleted file mode 100644 index 2c7ca21e66..0000000000 --- a/contrib/platform/lanl/rr-class/debug-slave.conf +++ /dev/null @@ -1,84 +0,0 @@ -# -# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana -# University Research and Technology -# Corporation. All rights reserved. -# Copyright (c) 2004-2005 The University of Tennessee and The University -# of Tennessee Research Foundation. All rights -# reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. -# Copyright (c) 2004-2005 The Regents of the University of California. -# All rights reserved. -# Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# - -# This is the default system-wide MCA parameters defaults file. -# Specifically, the MCA parameter "mca_param_files" defaults to a -# value of -# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf" -# (this file is the latter of the two). So if the default value of -# mca_param_files is not changed, this file is used to set system-wide -# MCA parameters. This file can therefore be used to set system-wide -# default MCA parameters for all users. Of course, users can override -# these values if they want, but this file is an excellent location -# for setting system-specific MCA parameters for those users who don't -# know / care enough to investigate the proper values for them. - -# Note that this file is only applicable where it is visible (in a -# filesystem sense). Specifically, MPI processes each read this file -# during their startup to determine what default values for MCA -# parameters should be used. mpirun does not bundle up the values in -# this file from the node where it was run and send them to all nodes; -# the default value decisions are effectively distributed. Hence, -# these values are only applicable on nodes that "see" this file. If -# $sysconf is a directory on a local disk, it is likely that changes -# to this file will need to be propagated to other nodes. If $sysconf -# is a directory that is shared via a networked filesystem, changes to -# this file will be visible to all nodes that share this $sysconf. - -# The format is straightforward: one per line, mca_param_name = -# rvalue. Quoting is ignored (so if you use quotes or escape -# characters, they'll be included as part of the value). For example: - -# Disable run-time MPI parameter checking -# mpi_param_check = 0 - -# Note that the value "~/" will be expanded to the current user's home -# directory. For example: - -# Change component loading path -# component_path = /usr/local/lib/openmpi:~/my_openmpi_components - -# See "ompi_info --param all all" for a full listing of Open MPI MCA -# parameters available and their default values. -# - -# Basic behavior to smooth startup -mca_component_show_load_errors = 0 -orte_abort_timeout = 10 -opal_set_max_sys_limits = 1 - -## Protect the shared file systems -orte_no_session_dirs = /panfs,/scratch,/users,/usr/projects -orte_tmpdir_base = /tmp - -## Add the interface for out-of-band communication -## and set it up -oob_tcp_if_include=eth0 -oob_tcp_peer_retries = 10 -oob_tcp_disable_family = IPv6 -oob_tcp_listen_mode = listen_thread -oob_tcp_sndbuf = 32768 -oob_tcp_rcvbuf = 32768 - -## Define the MPI interconnects -btl = tcp,self - -## Setup MPI options -mpi_show_handle_leaks = 0 -mpi_warn_on_fork = 1 diff --git a/contrib/platform/lanl/rr-class/optimized-master b/contrib/platform/lanl/rr-class/optimized-master index 31dcddab63..01caa2bc2c 100644 --- a/contrib/platform/lanl/rr-class/optimized-master +++ b/contrib/platform/lanl/rr-class/optimized-master @@ -16,7 +16,7 @@ enable_mpi_cxx_seek=yes enable_cxx_exceptions=no enable_ft_thread=no enable_per_user_config_files=no -enable_mca_no_build=crs,routed-direct,routed-linear,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,filem +enable_mca_no_build=crs,routed-direct,routed-linear,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,filem,pml-csum enable_contrib_no_build=libnbc,vt with_tm=/opt/PBS with_openib=/opt/ofed diff --git a/contrib/platform/lanl/rr-class/optimized-master.conf b/contrib/platform/lanl/rr-class/optimized-master.conf index 66ed7fd7c8..194f8a5c11 100644 --- a/contrib/platform/lanl/rr-class/optimized-master.conf +++ b/contrib/platform/lanl/rr-class/optimized-master.conf @@ -75,7 +75,6 @@ orte_allocation_required = 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 coll_sync_priority = 100 diff --git a/contrib/platform/lanl/rr-class/optimized-slave b/contrib/platform/lanl/rr-class/optimized-slave deleted file mode 100644 index 48fc13213e..0000000000 --- a/contrib/platform/lanl/rr-class/optimized-slave +++ /dev/null @@ -1,35 +0,0 @@ -enable_dlopen=no -enable_mem_debug=no -enable_mem_profile=no -enable_debug_symbols=no -enable_binaries=yes -enable_heterogeneous=yes -enable_debug=no -enable_shared=no -enable_static=yes -enable_memchecker=no -enable_ipv6=no -enable_mpi_f77=no -enable_mpi_f90=no -enable_mpi_cxx=no -enable_mpi_cxx_seek=no -enable_cxx_exceptions=no -enable_ft_thread=no -enable_per_user_config_files=no -enable_script_wrapper_compilers=yes -enable_io_romio=no -enable_mca_no_build=crs,routed-linear,routed-radix,routed-binomial,routed-direct,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,pml-cm,btl-openib,btl-sm,filem,plm-tm -enable_contrib_no_build=libnbc,vt -with_tm=no -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" -with_wrapper_ldflags="-m64" -with_wrapper_cflags="-m64" -with_wrapper_cxxflags="-m64" diff --git a/contrib/platform/lanl/rr-class/optimized-slave.conf b/contrib/platform/lanl/rr-class/optimized-slave.conf deleted file mode 100644 index 2c7ca21e66..0000000000 --- a/contrib/platform/lanl/rr-class/optimized-slave.conf +++ /dev/null @@ -1,84 +0,0 @@ -# -# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana -# University Research and Technology -# Corporation. All rights reserved. -# Copyright (c) 2004-2005 The University of Tennessee and The University -# of Tennessee Research Foundation. All rights -# reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. -# Copyright (c) 2004-2005 The Regents of the University of California. -# All rights reserved. -# Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# - -# This is the default system-wide MCA parameters defaults file. -# Specifically, the MCA parameter "mca_param_files" defaults to a -# value of -# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf" -# (this file is the latter of the two). So if the default value of -# mca_param_files is not changed, this file is used to set system-wide -# MCA parameters. This file can therefore be used to set system-wide -# default MCA parameters for all users. Of course, users can override -# these values if they want, but this file is an excellent location -# for setting system-specific MCA parameters for those users who don't -# know / care enough to investigate the proper values for them. - -# Note that this file is only applicable where it is visible (in a -# filesystem sense). Specifically, MPI processes each read this file -# during their startup to determine what default values for MCA -# parameters should be used. mpirun does not bundle up the values in -# this file from the node where it was run and send them to all nodes; -# the default value decisions are effectively distributed. Hence, -# these values are only applicable on nodes that "see" this file. If -# $sysconf is a directory on a local disk, it is likely that changes -# to this file will need to be propagated to other nodes. If $sysconf -# is a directory that is shared via a networked filesystem, changes to -# this file will be visible to all nodes that share this $sysconf. - -# The format is straightforward: one per line, mca_param_name = -# rvalue. Quoting is ignored (so if you use quotes or escape -# characters, they'll be included as part of the value). For example: - -# Disable run-time MPI parameter checking -# mpi_param_check = 0 - -# Note that the value "~/" will be expanded to the current user's home -# directory. For example: - -# Change component loading path -# component_path = /usr/local/lib/openmpi:~/my_openmpi_components - -# See "ompi_info --param all all" for a full listing of Open MPI MCA -# parameters available and their default values. -# - -# Basic behavior to smooth startup -mca_component_show_load_errors = 0 -orte_abort_timeout = 10 -opal_set_max_sys_limits = 1 - -## Protect the shared file systems -orte_no_session_dirs = /panfs,/scratch,/users,/usr/projects -orte_tmpdir_base = /tmp - -## Add the interface for out-of-band communication -## and set it up -oob_tcp_if_include=eth0 -oob_tcp_peer_retries = 10 -oob_tcp_disable_family = IPv6 -oob_tcp_listen_mode = listen_thread -oob_tcp_sndbuf = 32768 -oob_tcp_rcvbuf = 32768 - -## Define the MPI interconnects -btl = tcp,self - -## Setup MPI options -mpi_show_handle_leaks = 0 -mpi_warn_on_fork = 1