From 293b97e8d167876de31e695ecb32d260b506a1e0 Mon Sep 17 00:00:00 2001 From: eschnett Date: Thu, 4 Jul 2013 20:43:13 +0000 Subject: Update OpenMPI to 1.6.5 git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/MPI/trunk@35 043a8217-7a68-40fe-abfd-36aa7d4fa6a8 --- configure.sh | 5 +++-- dist/default_outfile-1.6.5.patch | 33 +++++++++++++++++++++++++++++++++ dist/default_outfile.patch | 33 --------------------------------- dist/openmpi-1.6.4.tar.gz | Bin 15478766 -> 0 bytes dist/openmpi-1.6.5.tar.gz | Bin 0 -> 15513056 bytes 5 files changed, 36 insertions(+), 35 deletions(-) create mode 100644 dist/default_outfile-1.6.5.patch delete mode 100644 dist/default_outfile.patch delete mode 100644 dist/openmpi-1.6.4.tar.gz create mode 100644 dist/openmpi-1.6.5.tar.gz diff --git a/configure.sh b/configure.sh index 1738d9b..8c5e0c5 100755 --- a/configure.sh +++ b/configure.sh @@ -87,7 +87,8 @@ then # Set locations THORN=MPI - NAME=openmpi-1.6.4 + NAME=openmpi-1.6.5 + #NAME=openmpi-1.7.1 SRCDIR=$(dirname $0) BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} if [ -z "${MPI_INSTALL_DIR}"]; then @@ -153,7 +154,7 @@ then echo "MPI: Unpacking archive..." pushd ${BUILD_DIR} ${TAR?} xzf ${SRCDIR}/dist/${NAME}.tar.gz - ${PATCH?} -p0 < ${SRCDIR}/dist/default_outfile.patch + ${PATCH?} -p0 < ${SRCDIR}/dist/default_outfile-1.6.5.patch echo "MPI: Configuring..." cd ${NAME} diff --git a/dist/default_outfile-1.6.5.patch b/dist/default_outfile-1.6.5.patch new file mode 100644 index 0000000..539fee7 --- /dev/null +++ b/dist/default_outfile-1.6.5.patch @@ -0,0 +1,33 @@ +diff -ru openmpi-1.6.5.orig/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp openmpi-1.6.5/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp +--- openmpi-1.6.5.orig/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp 2012-07-27 07:41:17.000000000 -0400 ++++ openmpi-1.6.5/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp 2013-02-25 12:59:21.000000000 -0500 +@@ -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.5.orig/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c openmpi-1.6.5/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c +--- openmpi-1.6.5.orig/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c 2012-07-27 07:41:20.000000000 -0400 ++++ openmpi-1.6.5/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c 2013-02-25 13:00:03.000000000 -0500 +@@ -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/default_outfile.patch b/dist/default_outfile.patch deleted file mode 100644 index baf794c..0000000 --- a/dist/default_outfile.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ru openmpi-1.6.4.orig/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp openmpi-1.6.4/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp ---- openmpi-1.6.4.orig/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp 2012-07-27 07:41:17.000000000 -0400 -+++ openmpi-1.6.4/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp 2013-02-25 12:59:21.000000000 -0500 -@@ -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.4.orig/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c openmpi-1.6.4/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c ---- openmpi-1.6.4.orig/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c 2012-07-27 07:41:20.000000000 -0400 -+++ openmpi-1.6.4/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c 2013-02-25 13:00:03.000000000 -0500 -@@ -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.4.tar.gz b/dist/openmpi-1.6.4.tar.gz deleted file mode 100644 index 461cfd3..0000000 Binary files a/dist/openmpi-1.6.4.tar.gz and /dev/null differ diff --git a/dist/openmpi-1.6.5.tar.gz b/dist/openmpi-1.6.5.tar.gz new file mode 100644 index 0000000..627e346 Binary files /dev/null and b/dist/openmpi-1.6.5.tar.gz differ -- cgit v1.2.3