rpms/openmpi
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 1.7.5

Browse Source
This commit is contained in:
Orion Poplawski 2014-07-17 14:35:52 -06:00
parent 629d43e397
commit 86b118c390
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
openmpi-wrapper.patch Normal file
View File

@ -0,0 +1,24 @@
diff -up openmpi-1.8.2rc1/oshmem/tools/wrappers/shmemcc-wrapper-data.txt.in.wrapper openmpi-1.8.2rc1/oshmem/tools/wrappers/shmemcc-wrapper-data.txt.in
--- openmpi-1.8.2rc1/oshmem/tools/wrappers/shmemcc-wrapper-data.txt.in.wrapper 2014-07-11 12:11:56.000000000 -0600
+++ openmpi-1.8.2rc1/oshmem/tools/wrappers/shmemcc-wrapper-data.txt.in 2014-07-17 14:26:03.695430679 -0600
@@ -29,7 +29,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS
# intentionally only link in the MPI libraries (ORTE, OPAL, etc. are
# pulled in implicitly) because we intend MPI applications to only use
# the MPI API.
-libs=-loshmem -lmpi @OMPI_WRAPPER_EXTRA_LIBS@
+libs=-loshmem -lmpi
libs_static=-loshmem -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
dyn_lib_file=libsohmem.@OPAL_DYN_LIB_SUFFIX@
static_lib_file=liboshmem.a
diff -up openmpi-1.8.2rc1/oshmem/tools/wrappers/shmemfort-wrapper-data.txt.in.wrapper openmpi-1.8.2rc1/oshmem/tools/wrappers/shmemfort-wrapper-data.txt.in
--- openmpi-1.8.2rc1/oshmem/tools/wrappers/shmemfort-wrapper-data.txt.in.wrapper 2014-07-11 12:11:56.000000000 -0600
+++ openmpi-1.8.2rc1/oshmem/tools/wrappers/shmemfort-wrapper-data.txt.in 2014-07-17 14:23:57.148841562 -0600
@@ -28,7 +28,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS
# intentionally only link in the SHMEM and MPI libraries (ORTE, OPAL,
# etc. are pulled in implicitly) because we intend MPI applications to
# only use the SHMEM and MPI APIs.
-libs=-loshmem -lmpi_mpifh -lmpi @OMPI_WRAPPER_EXTRA_LIBS@
+libs=-loshmem -lmpi_mpifh -lmpi
libs_static=-loshmem -lmpi_mpifh -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
dyn_lib_file=liboshmem.@OPAL_DYN_LIB_SUFFIX@
static_lib_file=liboshmem.a

9
openmpi.spec
View File

@ -22,7 +22,7 @@
Name: openmpi%{?_cc_name_suffix} Name: openmpi%{?_cc_name_suffix}
Version: 1.8.1 Version: 1.8.1
Release: 2%{?dist} Release: 3%{?dist}
Summary: Open Message Passing Interface Summary: Open Message Passing Interface
Group: Development/Libraries Group: Development/Libraries
License: BSD, MIT and Romio License: BSD, MIT and Romio
@ -34,6 +34,9 @@ Source1: openmpi.module.in
Source2: macros.openmpi Source2: macros.openmpi
# Patch to use system ltdl for tests # Patch to use system ltdl for tests
Patch1: openmpi-ltdl.patch Patch1: openmpi-ltdl.patch
# Fix shmem wrappers from adding extra libs
# https://svn.open-mpi.org/trac/ompi/ticket/4796
Patch2: openmpi-wrapper.patch
BuildRequires: gcc-gfortran BuildRequires: gcc-gfortran
#sparc64 and aarch64 don't have valgrind #sparc64 and aarch64 don't have valgrind
@ -112,6 +115,7 @@ Contains development wrapper for compiling Java with openmpi.
%prep %prep
%setup -q -n openmpi-%{version} %setup -q -n openmpi-%{version}
%patch1 -p1 -b .ltdl %patch1 -p1 -b .ltdl
%patch2 -p1 -b .wrapper
# Make sure we don't use the local libltdl library # Make sure we don't use the local libltdl library
rm -r opal/libltdl rm -r opal/libltdl
@ -238,6 +242,9 @@ make check
%changelog %changelog
* Thu Jul 17 2014 Orion Poplawski <orion@cora.nwra.com> 1.8.1-3
- Add patch to prevent shmem wrappers from adding extra libs
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-2 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild