From 6ddfe94fdb0f1286fd73661d8e09ccae8e6d82a0 Mon Sep 17 00:00:00 2001 From: eschnett Date: Sat, 25 Apr 2015 19:52:51 +0000 Subject: Update OpenMPI to version 1.8.4 git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/MPI/trunk@61 043a8217-7a68-40fe-abfd-36aa7d4fa6a8 --- dist/cuda_build_fix__svn29754 | 35 ----------------------------------- dist/default_outfile-1.6.5.patch | 33 --------------------------------- dist/openmpi-1.6.5.tar.gz | Bin 15513056 -> 0 bytes dist/openmpi-1.8.4.tar.gz | Bin 0 -> 19928908 bytes src/build.pl | 6 ++---- src/detect.pl | 8 ++++++-- 6 files changed, 8 insertions(+), 74 deletions(-) delete mode 100644 dist/cuda_build_fix__svn29754 delete mode 100644 dist/default_outfile-1.6.5.patch delete mode 100644 dist/openmpi-1.6.5.tar.gz create mode 100644 dist/openmpi-1.8.4.tar.gz diff --git a/dist/cuda_build_fix__svn29754 b/dist/cuda_build_fix__svn29754 deleted file mode 100644 index 5447ddc..0000000 --- a/dist/cuda_build_fix__svn29754 +++ /dev/null @@ -1,35 +0,0 @@ -Index: ompi/contrib/vt/vt/vtlib/vt_cudart.c -=================================================================== ---- ompi/contrib/vt/vt/vtlib/vt_cudart.c (revision 29753) -+++ ompi/contrib/vt/vt/vtlib/vt_cudart.c (revision 29754) -@@ -2722,7 +2722,10 @@ - /* get an already created unused event */ - kernel->evt = vtDev->evtbuf_pos; - -- if(!vt_cupti_events_enabled){ -+#if defined(VT_CUPTI_EVENTS) -+ if(!vt_cupti_events_enabled) -+#endif -+ { - /* increment buffers */ - vtDev->evtbuf_pos++; - vtDev->buf_pos += sizeof(VTCUDAKernel); -Index: ompi/contrib/vt/vt/ChangeLog -=================================================================== ---- ompi/contrib/vt/vt/ChangeLog (revision 29753) -+++ ompi/contrib/vt/vt/ChangeLog (revision 29754) -@@ -3,6 +3,8 @@ - - removed non-posix call to length(array) in AWK script for generating - the C MPI wrapper functions - - fixed potential buffer overflow when reading the filter file -+ - fixed build error when the CUDA runtime API wrapper are enabled and -+ CUPTI is disabled - - enabled access to CUPTI counters for CUDA tracing via CUPTI - - enabled GPU memory usage tracing independent of the CUDA API - - enabled recording of CUDA synchronization and implicit synchronization in - -Property changes on: ompi/contrib/vt/vt -___________________________________________________________________ -Modified: svn:mergeinfo - Merged /vendor/vampirtrace/current:r29732-29753 - diff --git a/dist/default_outfile-1.6.5.patch b/dist/default_outfile-1.6.5.patch deleted file mode 100644 index 539fee7..0000000 --- a/dist/default_outfile-1.6.5.patch +++ /dev/null @@ -1,33 +0,0 @@ -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/openmpi-1.6.5.tar.gz b/dist/openmpi-1.6.5.tar.gz deleted file mode 100644 index 627e346..0000000 Binary files a/dist/openmpi-1.6.5.tar.gz and /dev/null differ diff --git a/dist/openmpi-1.8.4.tar.gz b/dist/openmpi-1.8.4.tar.gz new file mode 100644 index 0000000..a7dbdfc Binary files /dev/null and b/dist/openmpi-1.8.4.tar.gz differ diff --git a/src/build.pl b/src/build.pl index 58ab021..d3c383b 100644 --- a/src/build.pl +++ b/src/build.pl @@ -7,7 +7,7 @@ $/ = undef; # Set locations my $THORN = "MPI"; -my $NAME = "openmpi-1.6.5"; +my $NAME = "openmpi-1.8.4"; my $INSTALL_DIR = undef; my $BUILD_DIR = undef; my $SRCDIR = $0; @@ -58,11 +58,9 @@ error("${INSTALL_DIR} is not executable.",8) unless(-x ${INSTALL_DIR}); print "MPI: Unpacking archive...\n"; chdir(${BUILD_DIR}); system("$ENV{TAR} xzf ${SRCDIR}/../dist/${NAME}.tar.gz") == 0 or die; -system("$ENV{PATCH} -p0 < ${SRCDIR}/../dist/default_outfile-1.6.5.patch") == 0 or die; -chdir(${NAME}); -system("$ENV{PATCH} -p0 < ${SRCDIR}/../dist/cuda_build_fix__svn29754") == 0 or die; print "MPI: Configuring...\n"; +chdir(${NAME}); # Cannot have a memory manager with a static library on some systems # (e.g. Linux); see # diff --git a/src/detect.pl b/src/detect.pl index 1180ffe..73fa33c 100644 --- a/src/detect.pl +++ b/src/detect.pl @@ -124,7 +124,7 @@ if ($mpi_build and !$mpi_info_set) { # Set locations my $THORN = "MPI"; - my $NAME = "openmpi-1.6.5"; + my $NAME = "openmpi-1.8.4"; my $INSTALL_DIR = undef; my $BUILD_DIR = undef; my $SRCDIR = $0; @@ -142,7 +142,11 @@ if ($mpi_build and !$mpi_info_set) { $ENV{MPI_DIR} = $mpi_dir; $ENV{MPI_INC_DIRS} = "$mpi_dir/include"; $ENV{MPI_LIB_DIRS} = "$mpi_dir/lib"; - $ENV{MPI_LIBS} = "mpi"; + my $mpi_fortranlibs = ''; + if ($ENV{F90} ne 'none') { + $mpi_fortranlibs = "mpi_usempif08 mpi_usempi_ignore_tkr mpi_mpifh"; + } + $ENV{MPI_LIBS} = "$mpi_fortranlibs mpi_cxx mpi open-rte open-pal"; } else { my $THORN = "MPI"; my $DONE_FILE = "$ENV{SCRATCH_BUILD}/done/${THORN}"; -- cgit v1.2.3