From 6df6211782f331a33a4a70747d51068bdee49bc4 Mon Sep 17 00:00:00 2001 From: eschnett Date: Tue, 25 Sep 2012 17:43:41 +0000 Subject: Upgrade to OpenMPI 1.6.2 git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/MPI/trunk@10 043a8217-7a68-40fe-abfd-36aa7d4fa6a8 --- configure.sh | 4 ++-- dist/default_outfile.diff | 33 +++++++++++++++++++++++++++++++++ dist/openmpi-1.6.2.tar.gz | Bin 0 -> 14766017 bytes dist/openmpi-1.6.tar.gz | Bin 14653874 -> 0 bytes 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 dist/default_outfile.diff create mode 100644 dist/openmpi-1.6.2.tar.gz delete mode 100644 dist/openmpi-1.6.tar.gz diff --git a/configure.sh b/configure.sh index c4a0372..946bbf8 100644 --- a/configure.sh +++ b/configure.sh @@ -75,8 +75,7 @@ then # Set locations THORN=MPI - NAME=openmpi-1.6 - #NAME=openmpi-1.6.1 + NAME=openmpi-1.6.2 SRCDIR=$(dirname $0) BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} if [ -z "${MPI_INSTALL_DIR}"]; then @@ -136,6 +135,7 @@ then echo "MPI: Unpacking archive..." pushd ${BUILD_DIR} ${TAR?} xzf ${SRCDIR}/dist/${NAME}.tar.gz + ${PATCH?} -p0 < ${SRCDIR}/dist/default_outfile.diff echo "MPI: Configuring..." cd ${NAME} diff --git a/dist/default_outfile.diff b/dist/default_outfile.diff new file mode 100644 index 0000000..bcb4171 --- /dev/null +++ b/dist/default_outfile.diff @@ -0,0 +1,33 @@ +diff -ru openmpi-1.6.2-orig/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp openmpi-1.6.2/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp +--- openmpi-1.6.2-orig/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp 2012-07-27 07:41:17.000000000 -0400 ++++ openmpi-1.6.2/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp 2012-09-25 12:09:57.000000000 -0400 +@@ -54,7 +54,7 @@ + " -V show OTF version \n", + " -i input file name \n", + " -o namestub of the output file \n", +-" (default: "DEFAULT_OUTFILE") \n", ++" (default: " DEFAULT_OUTFILE ") \n", + " -l \"\" a list of processes in quotes \n", + " to enable, i.e. keep in the copy, \n", + " e.g. '-l \"1,2 4-8 3\",10 12-20' \n", +diff -ru openmpi-1.6.2-orig/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c openmpi-1.6.2/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c +--- openmpi-1.6.2-orig/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c 2012-07-27 07:41:20.000000000 -0400 ++++ openmpi-1.6.2/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c 2012-09-25 12:09:57.000000000 -0400 +@@ -41,7 +41,7 @@ + " -h, --help show this help message \n", + " -V show OTF version \n", + " -o namestub of the output file \n", +-" (default: "DEFAULT_OUTFILE") \n", ++" (default: " DEFAULT_OUTFILE ") \n", + " -f max count of filehandles \n", + " (default: 100) \n", + " -n output stream count \n", +@@ -167,7 +167,7 @@ + printf( " no output file specified\n" ); + exit(1); + */ +- outputFile= strdup( DEFAULT_OUTFILE".otf" ); ++ outputFile= strdup( DEFAULT_OUTFILE ".otf" ); + } + + if ( maxfilehandles < 1 ) { diff --git a/dist/openmpi-1.6.2.tar.gz b/dist/openmpi-1.6.2.tar.gz new file mode 100644 index 0000000..e9a7bee Binary files /dev/null and b/dist/openmpi-1.6.2.tar.gz differ diff --git a/dist/openmpi-1.6.tar.gz b/dist/openmpi-1.6.tar.gz deleted file mode 100644 index 8a85548..0000000 Binary files a/dist/openmpi-1.6.tar.gz and /dev/null differ -- cgit v1.2.3