diff --git a/.gitignore b/.gitignore index d04a71d..c597842 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/openmpi-1.10.0.tar.bz2 +SOURCES/openmpi-1.10.3.tar.bz2 SOURCES/openmpi-1.6.4-clean.tar.xz diff --git a/.openmpi.metadata b/.openmpi.metadata index c533d70..9706f55 100644 --- a/.openmpi.metadata +++ b/.openmpi.metadata @@ -1,2 +1,2 @@ -683fecac252a6139fbf538188d8b35454425c412 SOURCES/openmpi-1.10.0.tar.bz2 +a3355a5c1c96cf9298ef48061d9db8c2fbd014ea SOURCES/openmpi-1.10.3.tar.bz2 24ec0fd3b82c72df9086e5b6b6be6d0a72f70892 SOURCES/openmpi-1.6.4-clean.tar.xz diff --git a/SOURCES/0001-openmpi-mca-params.conf-disable-psm2-MTL-by-default.patch b/SOURCES/0001-openmpi-mca-params.conf-disable-psm2-MTL-by-default.patch deleted file mode 100644 index 8667889..0000000 --- a/SOURCES/0001-openmpi-mca-params.conf-disable-psm2-MTL-by-default.patch +++ /dev/null @@ -1,32 +0,0 @@ -From fc36854fce10377e0d4e429d5a94c7e344e564d3 Mon Sep 17 00:00:00 2001 -From: Michal Schmidt -Date: Thu, 3 Sep 2015 17:24:28 +0200 -Subject: [PATCH] openmpi-mca-params.conf: disable psm2 MTL by default - -Workaround for: -https://bugzilla.redhat.com/show_bug.cgi?id=1259835 ---- - opal/etc/openmpi-mca-params.conf | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/opal/etc/openmpi-mca-params.conf b/opal/etc/openmpi-mca-params.conf -index 7a1f92367a..36f5bcd833 100644 ---- a/opal/etc/openmpi-mca-params.conf -+++ b/opal/etc/openmpi-mca-params.conf -@@ -56,3 +56,13 @@ - - # See "ompi_info --param all all" for a full listing of Open MPI MCA - # parameters available and their default values. -+ -+# Disable the psm2 MTL by default. -+# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1259835 -+# This avoids a conflict between libpsm2.so.2 and libpsm_infinipath.so.1. -+mtl = ^psm2 -+# If psm2 is needed, comment out the above line and uncomment -+# the following two lines. This will disable MCAs that are known to -+# depend on libpsm_infinipath.so.1: -+# mtl = ^psm,ofi -+# btl = ^usnic --- -2.4.3 - diff --git a/SPECS/openmpi.spec b/SPECS/openmpi.spec index ecde430..afc7f50 100644 --- a/SPECS/openmpi.spec +++ b/SPECS/openmpi.spec @@ -18,11 +18,11 @@ #global _cc_name_suffix -gcc %global majmin 1.10 -%global mainversion %{majmin}.0 +%global mainversion %{majmin}.3 Name: openmpi%{?_cc_name_suffix} Version: %{mainversion} -Release: 10%{?dist} +Release: 3%{?dist} Summary: Open Message Passing Interface Group: Development/Libraries License: BSD, MIT and Romio @@ -33,8 +33,6 @@ Source0: http://www.open-mpi.org/software/ompi/v%{majmin}/downloads/openmpi-%{m Source1: openmpi.module.in Source2: macros.openmpi.in -Patch1: 0001-openmpi-mca-params.conf-disable-psm2-MTL-by-default.patch - # openmpi-1.6.4-clean.tar.xz was generated by taking the upstream tarball # and removing license-incompatible files: # rm -r opal/mca/backtrace/darwin/MoreBacktrace @@ -72,6 +70,14 @@ Obsoletes: openmpi-psm Provides: mpi Requires: environment-modules +# Provides for compat with openmpi-1.10.0. +# See the comment about libmpi_usempi.so.1 in the install section. +%if 0%{?__isa_bits} == 64 +Provides: libmpi_usempi.so.1()(64bit) +%else +Provides: libmpi_usempi.so.1 +%endif + # Private openmpi libraries %global __provides_exclude_from ^%{_libdir}/(openmpi|compat-openmpi16)/lib/(lib(mca|o|v)|openmpi/).*\\.so(\\..*)?$ %global __requires_exclude ^lib(mca|ompi|open-(pal|rte|trace)|otf|vt|oshmem).*$ @@ -100,8 +106,7 @@ Contains development headers and libraries for openmpi Summary: Open MPI 1.6 compat library Group: Development/Libraries Version: 1.6.4 -# inherit the main package's release -Release: %{release} +Release: 10.3%{?dist} Provides: mpi Requires: environment-modules @@ -160,7 +165,6 @@ Contains development headers and libraries for compat-openmpi16 %prep %setup -q -n openmpi-%{mainversion} -b 100 -%patch1 -p1 cd .. cd openmpi-1.6.4 @@ -298,6 +302,12 @@ mkdir -p %{buildroot}/%{python_sitearch}/%{libname} #sed -i -e s/-ldl// -e s/-lhwloc// \ # %{buildroot}%{_libdir}/%{libname}/bin/orte_wrapper_script \ # %{buildroot}%{_libdir}/%{libname}/share/%{libname}/*-wrapper-data.txt + +# openmpi 1.10.2 bumped the soname of libmpi_usempi.so from .1 to .5, +# even though it only added new interfaces (MPI_Aint_{add,diff}), +# which was a compatible change. So it's OK to add a compat symlink: +ln -s libmpi_usempi.so.5 %{buildroot}/%{_libdir}/%{libname}/lib/libmpi_usempi.so.1 + cd .. %ifnarch s390 s390x @@ -362,29 +372,28 @@ cd .. %config(noreplace) %{_sysconfdir}/%{namearch}/* %{_libdir}/%{name}/bin/mpi[er]* %{_libdir}/%{name}/bin/ompi* -#%{_libdir}/%{name}/bin/opal-* %{_libdir}/%{name}/bin/opari %{_libdir}/%{name}/bin/orte* -%{_libdir}/%{name}/bin/osh* +%{_libdir}/%{name}/bin/oshmem_info +%{_libdir}/%{name}/bin/oshrun %{_libdir}/%{name}/bin/otf* -%{_libdir}/%{name}/bin/shmem* +%{_libdir}/%{name}/bin/shmemrun %{_libdir}/%{name}/lib/*.so.* %{_mandir}/%{namearch}/man1/mpi[er]* %{_mandir}/%{namearch}/man1/ompi* -#%{_mandir}/%{namearch}/man1/opal-* -%{_mandir}/%{namearch}/man1/orte* -%{_mandir}/%{namearch}/man1/oshmem* +%{_mandir}/%{namearch}/man1/orte[-dr_]* +%{_mandir}/%{namearch}/man1/oshmem_info* +%{_mandir}/%{namearch}/man1/oshrun* +%{_mandir}/%{namearch}/man1/shmemrun* %{_mandir}/%{namearch}/man7/ompi* %{_mandir}/%{namearch}/man7/orte* %{_libdir}/%{name}/lib/openmpi/* %{_sysconfdir}/modulefiles/mpi/%{namearch} -#%files common %dir %{_libdir}/%{name}/share %dir %{_libdir}/%{name}/share/openmpi %{_libdir}/%{name}/share/openmpi/doc %{_libdir}/%{name}/share/openmpi/amca-param-sets %{_libdir}/%{name}/share/openmpi/help*.txt -%{_libdir}/%{name}/share/openmpi/*-wrapper-data.txt %{_libdir}/%{name}/share/openmpi/mca-btl-openib-device-params.ini %{_libdir}/%{name}/share/openmpi/mca-coll-ml.config @@ -392,19 +401,23 @@ cd .. %dir %{_includedir}/%{namearch} %dir %{_libdir}/%{name}/share/vampirtrace %{_libdir}/%{name}/bin/mpi[cCf]* -%{_libdir}/%{name}/bin/vt* %{_libdir}/%{name}/bin/opal_* +%{_libdir}/%{name}/bin/orte[cCf]* +%{_libdir}/%{name}/bin/osh[cf]* +%{_libdir}/%{name}/bin/shmem[cf]* +%{_libdir}/%{name}/bin/vt* %{_includedir}/%{namearch}/* %{_libdir}/%{name}/lib/*.so %{_libdir}/%{name}/lib/lib*.a %{_libdir}/%{name}/lib/mpi.mod %{_mandir}/%{namearch}/man1/mpi[cCf]* +%{_mandir}/%{namearch}/man1/osh[cCf]* +%{_mandir}/%{namearch}/man1/shmem[cCf]* %{_mandir}/%{namearch}/man1/opal_* %{_mandir}/%{namearch}/man3/* %{_mandir}/%{namearch}/man7/opal* %{_libdir}/%{name}/share/openmpi/openmpi-valgrind.supp -%{_libdir}/%{name}/share/openmpi/mpi*.txt -%{_libdir}/%{name}/share/openmpi/orte*.txt +%{_libdir}/%{name}/share/openmpi/*-wrapper-data.txt %{_libdir}/%{name}/share/vampirtrace/* %{_sysconfdir}/rpm/macros.%{namearch} @@ -470,6 +483,20 @@ cd .. %endif %changelog +* Thu Aug 04 2016 Michal Schmidt - 1.10.3-3 +- Restore libmpi_usempi.so.1. +- Related: #1273175 + +* Tue Jul 05 2016 Michal Schmidt - 1.10.3-2 +- Rebuild against current libpsm2. +- Related: #1273175 + +* Fri Jun 17 2016 Michal Schmidt - 1.10.3-1 +- Update to upstream release 1.10.3. +- Stop excluding psm2 MTL by default. The psm/psm2 conflict has been resolved. +- Resolves: #1273175 +- Resolves: #1285292 + * Thu Sep 03 2015 Michal Schmidt - 1.10.0-10 - Remove psm2 package variant. Instead use MCA exclusion using config file. - Related: #947311