Remove any reference to VampirTrace in the platform files.

2015-01-22 08:04:08 +01:00 · 2015-01-22 08:04:08 +01:00 · d01c5160df
--- a/contrib/platform/embedded/debug
+++ b/contrib/platform/embedded/debug
@ -17,7 +17,7 @@ enable_cxx_exceptions=no
 enable_ft_thread=no
 enable_per_user_config_files=no
 enable_mca_no_build=crs,carto,maffinity,paffinity,pstat,filem,grpcomm-basic,grpcomm-hier,rmaps-rank_file,rmaps-seq,rmaps-topo,routed-binomial,routed-linear,routed-radix,routed-slave,snapc
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 with_devel_headers=yes
 with_alps=no
 with_ftb=no
--- a/contrib/platform/embedded/optimized
+++ b/contrib/platform/embedded/optimized
@ -17,7 +17,7 @@ enable_cxx_exceptions=no
 enable_ft_thread=no
 enable_per_user_config_files=no
 enable_mca_no_build=crs,carto,maffinity,paffinity,pstat,filem,grpcomm-basic,grpcomm-hier,rmaps-rank_file,rmaps-seq,rmaps-topo,routed-binomial,routed-linear,routed-radix,routed-slave,snapc
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 with_devel_headers=yes
 with_alps=no
 with_ftb=no
--- a/contrib/platform/hadoop/cisco
+++ b/contrib/platform/hadoop/cisco
@ -20,7 +20,6 @@ enable_per_user_config_files=no
 enable_script_wrapper_compilers=no
 enable_orterun_prefix_by_default=yes
 enable_io_romio=no
-enable_vt=no
 enable_mca_no_build=carto,crs,memchecker,snapc,crcp,paffinity,filem,sstore,compress,rml-ftrm
 with_memory_manager=no
 with_tm=no
--- a/contrib/platform/hadoop/linux
+++ b/contrib/platform/hadoop/linux
@ -18,7 +18,6 @@ enable_mpi_cxx_seek=no
 enable_cxx_exceptions=no
 enable_mpi_java=yes
 enable_io_romio=no
-enable_vt=no
 enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm
 with_memory_manager=no
 with_tm=no
--- a/contrib/platform/hadoop/mac
+++ b/contrib/platform/hadoop/mac
@ -15,7 +15,6 @@ enable_mpi_cxx=no
 enable_mpi_cxx_seek=no
 enable_mpi_java=yes
 enable_memchecker=no
-enable_vt=no
 enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm
 with_memory_manager=no
 with_devel_headers=yes
--- a/contrib/platform/ibm/debug-power6-gcc
+++ b/contrib/platform/ibm/debug-power6-gcc
@ -2,7 +2,7 @@ enable_mem_debug=yes
 enable_debug_symbols=yes
 enable_debug=yes
 enable_mem_profile=no
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 enable_ft_thread=no
 with_verbs=/usr 
 CXXFLAGS="-m64 -mcpu=power6 -mtune=power6 -O0 -g3 -ggdb" 
--- a/contrib/platform/ibm/debug-power7-gcc
+++ b/contrib/platform/ibm/debug-power7-gcc
@ -2,7 +2,7 @@ enable_mem_debug=yes
 enable_debug_symbols=yes
 enable_debug=yes
 enable_mem_profile=no
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 enable_ft_thread=no
 with_verbs=/usr 
 CXXFLAGS="-m64 -mcpu=power7 -mtune=power7 -O0 -g3 -ggdb" 
--- a/contrib/platform/ibm/debug-ppc32-gcc
+++ b/contrib/platform/ibm/debug-ppc32-gcc
@ -2,7 +2,7 @@ enable_mem_debug=yes
 enable_debug_symbols=yes
 enable_debug=yes
 enable_mem_profile=no
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 enable_ft_thread=no
 with_verbs=/usr 
 CXXFLAGS="-m32 -mcpu=powerpc64 -mtune=powerpc64 -O0 -g3 -ggdb" 
--- a/contrib/platform/ibm/debug-ppc64-gcc
+++ b/contrib/platform/ibm/debug-ppc64-gcc
@ -2,7 +2,7 @@ enable_mem_debug=yes
 enable_debug_symbols=yes
 enable_debug=yes
 enable_mem_profile=no
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 enable_ft_thread=no
 with_verbs=/usr 
 CXXFLAGS="-m64 -mcpu=powerpc64 -mtune=powerpc64 -O0 -g3 -ggdb" 
--- a/contrib/platform/ibm/optimized-power6-gcc
+++ b/contrib/platform/ibm/optimized-power6-gcc
@ -1,7 +1,7 @@
 enable_mem_debug=no
 enable_mem_profile=no
 enable_debug=no
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 enable_ft_thread=no
 with_verbs=/usr 
 enable_shared=yes
--- a/contrib/platform/ibm/optimized-power7-gcc
+++ b/contrib/platform/ibm/optimized-power7-gcc
@ -1,7 +1,7 @@
 enable_mem_debug=no
 enable_mem_profile=no
 enable_debug=no
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 enable_ft_thread=no
 with_verbs=/usr 
 enable_shared=yes
--- a/contrib/platform/ibm/optimized-ppc32-gcc
+++ b/contrib/platform/ibm/optimized-ppc32-gcc
@ -1,7 +1,7 @@
 enable_mem_debug=no
 enable_mem_profile=no
 enable_debug=no
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 enable_ft_thread=no
 with_verbs=/usr 
 enable_shared=yes
--- a/contrib/platform/ibm/optimized-ppc64-gcc
+++ b/contrib/platform/ibm/optimized-ppc64-gcc
@ -1,7 +1,7 @@
 enable_mem_debug=no
 enable_mem_profile=no
 enable_debug=no
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 enable_ft_thread=no
 with_verbs=/usr 
 enable_shared=yes
--- a/contrib/platform/intel/bend/linux
+++ b/contrib/platform/intel/bend/linux
@ -17,8 +17,7 @@ enable_mpi_cxx_seek=no
 enable_cxx_exceptions=no
 enable_mpi_java=yes
 enable_io_romio=no
-enable_vt=no
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 with_memory_manager=no
 with_tm=no
 with_devel_headers=yes
--- a/contrib/platform/intel/bend/linux-optimized
+++ b/contrib/platform/intel/bend/linux-optimized
@ -18,9 +18,8 @@ enable_mpi_cxx_seek=no
 enable_cxx_exceptions=no
 enable_mpi_java=yes
 enable_io_romio=no
-enable_vt=no
 enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 with_memory_manager=no
 with_tm=no
 with_devel_headers=yes
--- a/contrib/platform/intel/bend/mac
+++ b/contrib/platform/intel/bend/mac
@ -17,9 +17,8 @@ enable_mpi_fortran=yes
 enable_mpi_cxx=no
 enable_mpi_cxx_seek=no
 enable_memchecker=no
-enable_vt=no
 enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 with_memory_manager=no
 with_devel_headers=yes
 with_xgrid=no
--- a/contrib/platform/intel/bend/mac-optimized
+++ b/contrib/platform/intel/bend/mac-optimized
@ -16,9 +16,8 @@ enable_mpi_cxx=no
 enable_mpi_cxx_seek=no
 enable_mpi_java=yes
 enable_memchecker=no
-enable_vt=no
 enable_mca_no_build=crs,memchecker,snapc,crcp,rml-ftrm,filem-rsh
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 with_memory_manager=no
 with_devel_headers=yes
 with_xgrid=no
--- a/contrib/platform/iu/odin/debug
+++ b/contrib/platform/iu/odin/debug
@ -11,7 +11,7 @@ enable_shared=yes
 enable_static=no
 with_slurm=yes
 with_pmi=yes
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 enable_visibility=yes
 enable_ipv6=no
 enable_mpi_fortran=no
--- a/contrib/platform/iu/odin/debug-nopmi
+++ b/contrib/platform/iu/odin/debug-nopmi
@ -16,7 +16,7 @@ enable_shared=yes
 enable_static=no
 with_slurm=yes
 with_pmi=no
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 enable_visibility=yes
 enable_memchecker=no
 enable_ipv6=no
--- a/contrib/platform/iu/odin/optimized
+++ b/contrib/platform/iu/odin/optimized
@ -12,7 +12,7 @@ enable_debug=no
 enable_shared=yes
 enable_static=no
 with_slurm=yes
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 enable_visibility=yes
 enable_memchecker=no
 enable_ipv6=no
--- a/contrib/platform/iu/odin/static
+++ b/contrib/platform/iu/odin/static
@ -16,7 +16,7 @@ enable_debug=yes
 enable_shared=no
 enable_static=yes
 with_slurm=yes
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 enable_visibility=yes
 enable_memchecker=no
 enable_ipv6=no
--- a/contrib/platform/lanl/cray_xe6/debug-common
+++ b/contrib/platform/lanl/cray_xe6/debug-common
@ -25,7 +25,7 @@ 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_contrib_no_build=libnbc

 # enable direct calling for ob1
 enable_mca_direct=pml-ob1
--- a/contrib/platform/lanl/cray_xe6/optimized-common
+++ b/contrib/platform/lanl/cray_xe6/optimized-common
@ -32,7 +32,7 @@ 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_contrib_no_build=libnbc

 # enable direct calling for ob1
 enable_mca_direct=pml-ob1
--- a/contrib/platform/lanl/macosx-dynamic
+++ b/contrib/platform/lanl/macosx-dynamic
@ -9,7 +9,7 @@ enable_picky=yes
 enable_debug=yes
 enable_shared=yes
 enable_static=no
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 with_xgrid=no
 enable_io_romio=no
 enable_ipv6=no
--- a/contrib/platform/lanl/macosx-dynamic-java
+++ b/contrib/platform/lanl/macosx-dynamic-java
@ -9,7 +9,7 @@ enable_picky=yes
 enable_debug=yes
 enable_shared=yes
 enable_static=no
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 with_xgrid=no
 enable_io_romio=no
 enable_ipv6=no
--- a/contrib/platform/lanl/macosx-dynamic-optimized
+++ b/contrib/platform/lanl/macosx-dynamic-optimized
@ -9,7 +9,7 @@ enable_picky=yes
 enable_debug=no
 enable_shared=yes
 enable_static=no
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 with_xgrid=no
 enable_io_romio=no
 enable_ipv6=no
--- a/contrib/platform/lanl/macosx-static-leopard
+++ b/contrib/platform/lanl/macosx-static-leopard
@ -10,7 +10,7 @@ enable_debug=yes
 enable_shared=no
 enable_static=yes
 with_wrapper_ldflags=-Wl,-search_paths_first
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 with_xgrid=no
 enable_io_romio=no
 enable_memchecker=no
--- a/contrib/platform/lanl/macosx-static-tiger
+++ b/contrib/platform/lanl/macosx-static-tiger
@ -9,7 +9,7 @@ enable_picky=yes
 enable_debug=yes
 enable_shared=no
 enable_static=yes
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 with_xgrid=no
 enable_io_romio=no
 enable_memchecker=no
--- a/contrib/platform/ornl/ornl_configure.gnu
+++ b/contrib/platform/ornl/ornl_configure.gnu
@ -37,7 +37,6 @@ fi
  host_alias=x86_64-cray-linux-gnu \
  --enable-ltdl-convenience --no-recursion" \
  --with-alps=yes \
-  --with-contrib-vt-flags="--with-platform=linux" \
 --prefix="$SW_INSTALL_ROOT/$VER" | tee build.log

 #gmake all install | tee -a build.log
--- a/contrib/platform/ornl/ornl_configure.pgi
+++ b/contrib/platform/ornl/ornl_configure.pgi
@ -83,7 +83,6 @@ $SRC_DIR/configure \
 	--with-platform=${SRC_DIR}/contrib/platform/${PLATFORM} \
 	--with-io-romio-flags="host_alias=${ID} build_alias=${JD} \
 		--enable-ltdl-convenience --no-recursion" \
-	--with-contrib-vt-flags="--with-platform=linux" \
 	--with-wrapper-cflags="${SCI_INC}" \
 	--with-wrapper-ldflags="-Bstatic ${SCI_LIB} ${BASE_LPATHS}" \
 	--with-wrapper-libs="-lsci_quadcore" \
--- a/contrib/platform/ornl/ornl_configure_self_contained
+++ b/contrib/platform/ornl/ornl_configure_self_contained
@ -97,7 +97,7 @@ esac


 # If further packages should be disabled, insert
-#   --enable-contrib-no-build=vt --disable-mpi-cxx --disable-io-romio \
+#   --disable-mpi-cxx --disable-io-romio \

 $SRCDIR/configure \
   --prefix=$PREFIX \
@ -107,7 +107,6 @@ $SRCDIR/configure \
   --enable-mca-no-build=maffinity-first_use,maffinity-libnuma,ess-cnos,ess-slurm,ess-slurmd,filem-rsh,grpcomm-cnos,plm-rsh,plm-rshd,plm-slurm,pml-dr,btl-tcp,notifier-twitter,notifier-smtp,pml-csum,pml-v,vprotocol-pessimist,dpm-orte \
   --with-wrapper-ldflags="-L${PE_DIR}/lib/snos64 -L${SE_DIR}/lib/snos64 -L/opt/xt-mpt/default/lib/snos64/ ${WRAPPER_LDFLAGS}" \
   --with-wrapper-libs="-lpct -lalpslli -lalpsutil -lportals -lpthread -lm" \
-   --enable-contrib-no-build=vt \
   ${COMPILER_FLAGS} \
   CPPFLAGS="-DNDEBUG -I${PE_DIR}/include ${CPPFLAGS}" \
   CFLAGS="${CFLAGS}" \
--- a/contrib/platform/redstorm
+++ b/contrib/platform/redstorm
@ -7,7 +7,7 @@ enable_dlopen=no
 with_portals_config=redstorm
 with_memory_manager=none
 enable_mca_no_build=paffinity,maffinity,debugger,notifier,btl-sm,coll-hierarch,coll-sm,common-sm,mpool-sm,pml-dr,pml-v
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 with_rte_support=no
 enable_heterogeneous=no
 enable_pty_support=no
--- a/contrib/platform/snl/kitten
+++ b/contrib/platform/snl/kitten
@ -2,7 +2,7 @@ enable_static=yes
 enable_shared=no
 enable_dlopen=no
 enable_mca_no_build=if,compress,crs,pml-bfo,pml-crcpw,pml-csum,pml-dr,pml-v,vprotocol,btl-tcp
-enable_contrib_no_build=vt
+enable_contrib_no_build=
 enable_heterogeneous=no
 enable_pty_support=no
 enable_mem_debug=no
--- a/contrib/platform/snl/portals4-m5
+++ b/contrib/platform/snl/portals4-m5
@ -4,7 +4,7 @@ with_threads=no
 enable_dlopen=no
 with_memory_manager=no
 enable_mca_no_build=carto,compress,crs,maffinity,paffinity,debugger,notifier,bml,btl,coll-hierarch,coll-sm,common-sm,mpool,pml-bfo,pml-csum,pml-dr,pml-ob1,osc-rdma,rcache,vprotocol,btl
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 with_rte_support=no
 enable_heterogeneous=no
 enable_pty_support=no
--- a/contrib/platform/snl/portals4-orte
+++ b/contrib/platform/snl/portals4-orte
@ -1,6 +1,6 @@
 with_memory_manager=no
 enable_mca_no_build=bml,btl,coll-hierarch,coll-sm,common-sm,mpool,pml-bfo,pml-csum,pml-dr,pml-ob1,osc-rdma,rcache,vprotocol
-enable_contrib_no_build=libnbc,vt
+enable_contrib_no_build=libnbc
 enable_heterogeneous=no
 enable_mem_debug=no
 enable_mem_profile=no
--- a/contrib/platform/utk/cray_xc30_darter
+++ b/contrib/platform/utk/cray_xc30_darter
@ -9,7 +9,7 @@ enable_debug=no
 enable_debug_symbols=no
 #enable_pretty_print_stacktrace=no
 with_valgrind=no
-enable_contrib_no_build=vt
+enable_contrib_no_build=

 # Extensions and language bindings
 enable_io_romio=yes