diff --git a/.gitignore b/.gitignore index 265dd86..d04a71d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +SOURCES/openmpi-1.10.0.tar.bz2 SOURCES/openmpi-1.6.4-clean.tar.xz diff --git a/.openmpi.metadata b/.openmpi.metadata index b8ffce5..c533d70 100644 --- a/.openmpi.metadata +++ b/.openmpi.metadata @@ -1 +1,2 @@ +683fecac252a6139fbf538188d8b35454425c412 SOURCES/openmpi-1.10.0.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 new file mode 100644 index 0000000..8667889 --- /dev/null +++ b/SOURCES/0001-openmpi-mca-params.conf-disable-psm2-MTL-by-default.patch @@ -0,0 +1,32 @@ +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/SOURCES/macros.openmpi b/SOURCES/macros.openmpi deleted file mode 100644 index 9b114de..0000000 --- a/SOURCES/macros.openmpi +++ /dev/null @@ -1,7 +0,0 @@ -%_openmpi_load \ - . /etc/profile.d/modules.sh; \ - module load mpi/openmpi-%{_arch}; \ - export CFLAGS="$CFLAGS %{optflags}"; -%_openmpi_unload \ - . /etc/profile.d/modules.sh; \ - module unload mpi/openmpi-%{_arch}; diff --git a/SOURCES/macros.openmpi.in b/SOURCES/macros.openmpi.in new file mode 100644 index 0000000..7232d2f --- /dev/null +++ b/SOURCES/macros.openmpi.in @@ -0,0 +1,7 @@ +%_@MACRONAME@_load \ + . /etc/profile.d/modules.sh; \ + module load mpi/@MODULENAME@; \ + export CFLAGS="$CFLAGS %{optflags}"; +%_@MACRONAME@_unload \ + . /etc/profile.d/modules.sh; \ + module unload mpi/@MODULENAME@; diff --git a/SPECS/openmpi.spec b/SPECS/openmpi.spec index 570acf8..ecde430 100644 --- a/SPECS/openmpi.spec +++ b/SPECS/openmpi.spec @@ -17,43 +17,50 @@ # suffix in order to keep the names from conflicting. #global _cc_name_suffix -gcc +%global majmin 1.10 +%global mainversion %{majmin}.0 + Name: openmpi%{?_cc_name_suffix} -Version: 1.6.4 -Release: 5%{?dist} +Version: %{mainversion} +Release: 10%{?dist} Summary: Open Message Passing Interface Group: Development/Libraries License: BSD, MIT and Romio URL: http://www.open-mpi.org/ # We can't use %{name} here because of _cc_name_suffix -#Source0: http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-%{version}.tar.bz2 -# openmpi-%{version}-clean.tar.xz was generated by taking the upstream tarball +Source0: http://www.open-mpi.org/software/ompi/v%{majmin}/downloads/openmpi-%{mainversion}.tar.bz2 +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 -Source0: openmpi-%{version}-clean.tar.xz -Source1: openmpi.module.in -Source2: macros.openmpi +Source100: openmpi-1.6.4-clean.tar.xz # Patch to handle removed items -Patch0: openmpi-removed.patch +Patch100: openmpi-removed.patch # Patch to use system ltdl for tests -Patch1: openmpi-ltdl.patch +Patch101: openmpi-ltdl.patch # Learn configure about ppc64le -Patch2: openmpi-1.6.4-ppc64le.patch +Patch102: openmpi-1.6.4-ppc64le.patch # Backport of gcc atomics needed for AArch64 -Patch3: openmpi-1.6.4-aarch64.patch +Patch103: openmpi-1.6.4-aarch64.patch BuildRequires: gcc-gfortran #sparc 64 doesn't have valgrind -%ifnarch %{sparc} +%ifnarch %{sparc} s390 BuildRequires: valgrind-devel %endif BuildRequires: libibverbs-devel >= 1.1.3, opensm-devel > 3.3.0 -BuildRequires: librdmacm-devel libibcm-devel +BuildRequires: librdmacm-devel BuildRequires: hwloc-devel BuildRequires: python libtool-ltdl-devel BuildRequires: libesmtp-devel +BuildRequires: libfabric-devel %ifarch x86_64 -BuildRequires: infinipath-psm-devel +BuildRequires: infinipath-psm-devel libpsm2-devel %endif %ifarch ppc64le BuildRequires: automake @@ -65,13 +72,9 @@ Obsoletes: openmpi-psm Provides: mpi Requires: environment-modules -# s390 is unlikely to have the hardware we want, and some of the -devel -# packages we require aren't available there. -ExcludeArch: s390 s390x - # Private openmpi libraries -%global __provides_exclude_from %{_libdir}/openmpi/lib/(lib(mca|o|v)|openmpi/).*.so -%global __requires_exclude lib(mca|ompi|open-(pal|rte|trace)|otf|vt).* +%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).*$ %description Open MPI is an open source, freely available implementation of both the @@ -85,13 +88,48 @@ researchers. For more information, see http://www.open-mpi.org/ . %package devel Summary: Development files for openmpi Group: Development/Libraries -Requires: %{name} = %{version}-%{release}, gcc-gfortran +Requires: %{name} = %{mainversion}-%{release}, gcc-gfortran Provides: mpi-devel Obsoletes: openmpi-psm-devel %description devel Contains development headers and libraries for openmpi +%ifnarch s390 s390x +%package -n compat-openmpi16%{?_cc_name_suffix} +Summary: Open MPI 1.6 compat library +Group: Development/Libraries +Version: 1.6.4 +# inherit the main package's release +Release: %{release} +Provides: mpi +Requires: environment-modules + +%description -n compat-openmpi16%{?_cc_name_suffix} +Open MPI is an open source, freely available implementation of both the +MPI-1 and MPI-2 standards, combining technologies and resources from +several other projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI) in +order to build the best MPI library available. A completely new MPI-2 +compliant implementation, Open MPI offers advantages for system and +software vendors, application developers, and computer science +researchers. For more information, see http://www.open-mpi.org/ . + +This package provides compatibility for applications compiled with Open MPI +version 1.6. + +%package -n compat-openmpi16%{?_cc_name_suffix}-devel +Summary: Development files for compat-openmpi16 +Group: Development/Libraries +Version: 1.6.4 +Release: %{release} +Requires: compat-openmpi16%{?_cc_name_suffix}%{?_isa} = %{version}-%{release}, gcc-gfortran +Provides: mpi-devel + +%description -n compat-openmpi16%{?_cc_name_suffix}-devel +Contains development headers and libraries for compat-openmpi16 + +%endif + # When dealing with multilib installations, aka the ability to run either # i386 or x86_64 binaries on x86_64 machines, we install the native i386 # openmpi libs/compilers and the native x86_64 libs/compilers. Obviously, @@ -120,24 +158,71 @@ Contains development headers and libraries for openmpi %global modeflag -m64 %endif -# We set this to for convenience, since this is the unique dir we use for this -# particular package, version, compiler -%global namearch openmpi-%{_arch}%{?_cc_name_suffix} - %prep -%setup -q -n openmpi-%{version} -%patch0 -p1 -b .removed -%patch1 -p1 -b .ltdl +%setup -q -n openmpi-%{mainversion} -b 100 +%patch1 -p1 +cd .. + +cd openmpi-1.6.4 +%patch100 -p1 -b .removed +%patch101 -p1 -b .ltdl %ifarch ppc64le -%patch2 -p1 -b .ppc64le +%patch102 -p1 -b .ppc64le %endif %ifarch aarch64 -%patch3 -p1 -b .aarch64 +%patch103 -p1 -b .aarch64 %endif # Make sure we don't use the local libltdl library rm -r opal/libltdl +cd .. %build +# We set this to for convenience, since this is the unique dir we use for this +# particular package, version, compiler +%global variant openmpi +%global libname %{variant}%{?_cc_name_suffix} +%global namearch %{variant}-%{_arch}%{?_cc_name_suffix} + +# %%configure macro would change --prefix +./configure --prefix=%{_libdir}/%{libname} \ +%ifarch armv5tel + --build=armv5tel-redhat-linux-gnueabi \ + --host=armv5tel-redhat-linux-gnueabi \ +%endif + --mandir=%{_mandir}/%{namearch} \ + --includedir=%{_includedir}/%{namearch} \ + --sysconfdir=%{_sysconfdir}/%{namearch} \ + --disable-silent-rules \ + --with-verbs=/usr \ + --with-sge \ +%ifnarch %{sparc} s390 + --with-valgrind \ + --enable-memchecker \ +%endif +%ifarch aarch64 + --enable-builtin-atomics \ +%endif + --with-hwloc=/usr \ + --with-libltdl=/usr \ + --with-wrapper-cflags="%{?modeflag}" \ + --with-wrapper-cxxflags="%{?modeflag}" \ + --with-wrapper-fcflags="%{?modeflag}" \ + CC=%{opt_cc} CXX=%{opt_cxx} \ + LDFLAGS='-Wl,-z,noexecstack' \ + CFLAGS="%{?opt_cflags} %{!?opt_cflags:$RPM_OPT_FLAGS}" \ + CXXFLAGS="%{?opt_cxxflags} %{!?opt_cxxflags:$RPM_OPT_FLAGS}" \ + FC=%{opt_fc} FCFLAGS="%{?opt_fcflags} %{!?opt_fcflags:$RPM_OPT_FLAGS}" + +make %{?_smp_mflags} +cd .. + +%ifnarch s390 s390x +%global variant compat-openmpi16 +%global libname %{variant}%{?_cc_name_suffix} +%global namearch %{variant}-%{_arch}%{?_cc_name_suffix} + +cd openmpi-1.6.4 + %ifarch ppc64le # learn autotools about new arch cp -p %{_datadir}/automake-*/config.{guess,sub} ./config/ @@ -145,9 +230,8 @@ cp -p %{_datadir}/automake-*/config.{guess,sub} ./ompi/mca/io/romio/romio/confdb cp -p %{_datadir}/automake-*/config.{guess,sub} ./ompi/contrib/vt/vt/config/ cp -p %{_datadir}/automake-*/config.{guess,sub} ./ompi/contrib/vt/vt/extlib/otf/config/ %endif - # %%configure macro would change --prefix -./configure --prefix=%{_libdir}/%{name} \ +./configure --prefix=%{_libdir}/%{libname} \ %ifarch armv5tel --build=armv5tel-redhat-linux-gnueabi \ --host=armv5tel-redhat-linux-gnueabi \ @@ -159,7 +243,7 @@ cp -p %{_datadir}/automake-*/config.{guess,sub} ./ompi/contrib/vt/vt/extlib/otf/ --enable-opal-multi-threads \ --with-openib=/usr \ --with-sge \ -%ifnarch %{sparc} +%ifnarch %{sparc} s390 --with-valgrind \ --enable-memchecker \ %endif @@ -181,38 +265,90 @@ cp -p %{_datadir}/automake-*/config.{guess,sub} ./ompi/contrib/vt/vt/extlib/otf/ F77=%{opt_f77} FFLAGS="%{?opt_fflags} %{!?opt_fflags:$RPM_OPT_FLAGS}" make %{?_smp_mflags} +cd .. +%endif %install +%global variant openmpi +%global libname %{variant}%{?_cc_name_suffix} +%global namearch %{variant}-%{_arch}%{?_cc_name_suffix} + +make install DESTDIR=%{buildroot} +rm -fr %{buildroot}%{_libdir}/%{libname}/lib/pkgconfig +find %{buildroot}%{_libdir}/%{libname}/lib -name \*.la | xargs rm +find %{buildroot}%{_mandir}/%{namearch} -type f | xargs gzip -9 +ln -s mpicc.1.gz %{buildroot}%{_mandir}/%{namearch}/man1/mpiCC.1.gz +rm -f %{buildroot}%{_mandir}/%{namearch}/man1/mpiCC.1 +rm -f %{buildroot}%{_mandir}/%{namearch}/man1/orteCC.1* +rm -f %{buildroot}%{_libdir}/%{libname}/share/vampirtrace/doc/opari/lacsi01.ps.gz +mkdir %{buildroot}%{_mandir}/%{namearch}/man{2,4,5,6,8,9,n} + +# Make the environment-modules file +mkdir -p %{buildroot}%{_sysconfdir}/modulefiles/mpi +# Since we're doing our own substitution here, use our own definitions. +sed 's#@LIBDIR@#'%{_libdir}/%{libname}'#g;s#@ETCDIR@#'%{_sysconfdir}/%{namearch}'#g;s#@FMODDIR@#'%{_fmoddir}/%{namearch}'#g;s#@INCDIR@#'%{_includedir}/%{namearch}'#g;s#@MANDIR@#'%{_mandir}/%{namearch}'#g;s#@PYSITEARCH@#'%{python_sitearch}/%{libname}'#g;s#@COMPILER@#%{variant}-'%{_arch}%{?_cc_name_suffix}'#g;s#@SUFFIX@#'%{?_cc_name_suffix}'_%{variant}#g' < %SOURCE1 > %{buildroot}%{_sysconfdir}/modulefiles/mpi/%{namearch} +# make the rpm config file +mkdir -p %{buildroot}/%{_sysconfdir}/rpm +LIBNAME="%{libname}" +# do not expand _arch +sed "s#@MACRONAME@#${LIBNAME//-/_}#g;s#@MODULENAME@#%{variant}-%%{_arch}%{?_cc_name_suffix}#" < %SOURCE2 > %{buildroot}/%{_sysconfdir}/rpm/macros.%{namearch} +mkdir -p %{buildroot}/%{_fmoddir}/%{namearch} +mkdir -p %{buildroot}/%{python_sitearch}/%{libname} +# Remove extraneous wrapper link libraries (bug 814798) +#sed -i -e s/-ldl// -e s/-lhwloc// \ +# %{buildroot}%{_libdir}/%{libname}/bin/orte_wrapper_script \ +# %{buildroot}%{_libdir}/%{libname}/share/%{libname}/*-wrapper-data.txt +cd .. + +%ifnarch s390 s390x +%global variant compat-openmpi16 +%global libname %{variant}%{?_cc_name_suffix} +%global namearch %{variant}-%{_arch}%{?_cc_name_suffix} + +cd openmpi-1.6.4 make install DESTDIR=%{buildroot} -rm -fr %{buildroot}%{_libdir}/%{name}/lib/pkgconfig -find %{buildroot}%{_libdir}/%{name}/lib -name \*.la | xargs rm +rm -fr %{buildroot}%{_libdir}/%{libname}/lib/pkgconfig +find %{buildroot}%{_libdir}/%{libname}/lib -name \*.la | xargs rm find %{buildroot}%{_mandir}/%{namearch} -type f | xargs gzip -9 ln -s mpicc.1.gz %{buildroot}%{_mandir}/%{namearch}/man1/mpiCC.1.gz rm -f %{buildroot}%{_mandir}/%{namearch}/man1/mpiCC.1 rm -f %{buildroot}%{_mandir}/%{namearch}/man1/orteCC.1* -rm -f %{buildroot}%{_libdir}/%{name}/share/vampirtrace/doc/opari/lacsi01.ps.gz +rm -f %{buildroot}%{_libdir}/%{libname}/share/vampirtrace/doc/opari/lacsi01.ps.gz mkdir %{buildroot}%{_mandir}/%{namearch}/man{2,4,5,6,8,9,n} # Make the environment-modules file mkdir -p %{buildroot}%{_sysconfdir}/modulefiles/mpi # Since we're doing our own substitution here, use our own definitions. -sed 's#@LIBDIR@#'%{_libdir}/%{name}'#g;s#@ETCDIR@#'%{_sysconfdir}/%{namearch}'#g;s#@FMODDIR@#'%{_fmoddir}/%{namearch}'#g;s#@INCDIR@#'%{_includedir}/%{namearch}'#g;s#@MANDIR@#'%{_mandir}/%{namearch}'#g;s#@PYSITEARCH@#'%{python_sitearch}/%{name}'#g;s#@COMPILER@#openmpi-'%{_arch}%{?_cc_name_suffix}'#g;s#@SUFFIX@#'%{?_cc_name_suffix}'_openmpi#g' < %SOURCE1 > %{buildroot}%{_sysconfdir}/modulefiles/mpi/%{namearch} +sed 's#@LIBDIR@#'%{_libdir}/%{libname}'#g;s#@ETCDIR@#'%{_sysconfdir}/%{namearch}'#g;s#@FMODDIR@#'%{_fmoddir}/%{namearch}'#g;s#@INCDIR@#'%{_includedir}/%{namearch}'#g;s#@MANDIR@#'%{_mandir}/%{namearch}'#g;s#@PYSITEARCH@#'%{python_sitearch}/%{libname}'#g;s#@COMPILER@#%{variant}-'%{_arch}%{?_cc_name_suffix}'#g;s#@SUFFIX@#'%{?_cc_name_suffix}'_%{variant}#g' < %SOURCE1 > %{buildroot}%{_sysconfdir}/modulefiles/mpi/%{namearch} # make the rpm config file mkdir -p %{buildroot}/%{_sysconfdir}/rpm -cp %SOURCE2 %{buildroot}/%{_sysconfdir}/rpm/macros.%{namearch} +LIBNAME="%{libname}" +# do not expand _arch +sed "s#@MACRONAME@#${LIBNAME//-/_}#g;s#@MODULENAME@#%{variant}-%%{_arch}%{?_cc_name_suffix}#" < %SOURCE2 > %{buildroot}/%{_sysconfdir}/rpm/macros.%{namearch} mkdir -p %{buildroot}/%{_fmoddir}/%{namearch} -mkdir -p %{buildroot}/%{python_sitearch}/openmpi%{?_cc_name_suffix} +mkdir -p %{buildroot}/%{python_sitearch}/%{libname} # Remove extraneous wrapper link libraries (bug 814798) sed -i -e s/-ldl// -e s/-lhwloc// \ - %{buildroot}%{_libdir}/%{name}/bin/orte_wrapper_script \ - %{buildroot}%{_libdir}/%{name}/share/%{name}/*-wrapper-data.txt + %{buildroot}%{_libdir}/%{libname}/bin/orte_wrapper_script \ + %{buildroot}%{_libdir}/%{libname}/share/%{name}/*-wrapper-data.txt +cd .. +%endif %check make check +cd .. + +%ifnarch s390 s390x +cd openmpi-1.6.4 +make check +cd .. +%endif +%global variant openmpi +%global libname %{variant}%{?_cc_name_suffix} +%global namearch %{variant}-%{_arch}%{?_cc_name_suffix} %files -%defattr(-,root,root,-) %dir %{_libdir}/%{name} %dir %{_sysconfdir}/%{namearch} %dir %{_libdir}/%{name}/bin @@ -229,12 +365,15 @@ make check #%{_libdir}/%{name}/bin/opal-* %{_libdir}/%{name}/bin/opari %{_libdir}/%{name}/bin/orte* +%{_libdir}/%{name}/bin/osh* %{_libdir}/%{name}/bin/otf* +%{_libdir}/%{name}/bin/shmem* %{_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}/man7/ompi* %{_mandir}/%{namearch}/man7/orte* %{_libdir}/%{name}/lib/openmpi/* @@ -245,10 +384,11 @@ make check %{_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 %files devel -%defattr(-,root,root,-) %dir %{_includedir}/%{namearch} %dir %{_libdir}/%{name}/share/vampirtrace %{_libdir}/%{name}/bin/mpi[cCf]* @@ -268,7 +408,100 @@ make check %{_libdir}/%{name}/share/vampirtrace/* %{_sysconfdir}/rpm/macros.%{namearch} +%ifnarch s390 s390x +%global variant compat-openmpi16 +%global libname %{variant}%{?_cc_name_suffix} +%global namearch %{variant}-%{_arch}%{?_cc_name_suffix} + +%files -n compat-openmpi16%{?_cc_name_suffix} +%dir %{_libdir}/%{libname} +%dir %{_sysconfdir}/%{namearch} +%dir %{_libdir}/%{libname}/bin +%dir %{_libdir}/%{libname}/lib +%dir %{_libdir}/%{libname}/lib/openmpi +%dir %{_mandir}/%{namearch} +%dir %{_mandir}/%{namearch}/man* +%dir %{_fmoddir}/%{namearch} +%dir %{_sysconfdir}/modulefiles/mpi +%dir %{python_sitearch}/%{libname} +%config(noreplace) %{_sysconfdir}/%{namearch}/* +%{_libdir}/%{libname}/bin/mpi[er]* +%{_libdir}/%{libname}/bin/ompi* +#%{_libdir}/%{libname}/bin/opal-* +%{_libdir}/%{libname}/bin/opari +%{_libdir}/%{libname}/bin/orte* +%{_libdir}/%{libname}/bin/otf* +%{_libdir}/%{libname}/lib/*.so.* +%{_mandir}/%{namearch}/man1/mpi[er]* +%{_mandir}/%{namearch}/man1/ompi* +#%{_mandir}/%{namearch}/man1/opal-* +%{_mandir}/%{namearch}/man1/orte* +%{_mandir}/%{namearch}/man7/ompi* +%{_mandir}/%{namearch}/man7/orte* +%{_libdir}/%{libname}/lib/openmpi/* +%{_sysconfdir}/modulefiles/mpi/%{namearch} +#%files common +%dir %{_libdir}/%{libname}/share +%dir %{_libdir}/%{libname}/share/openmpi +%{_libdir}/%{libname}/share/openmpi/doc +%{_libdir}/%{libname}/share/openmpi/amca-param-sets +%{_libdir}/%{libname}/share/openmpi/help*.txt +%{_libdir}/%{libname}/share/openmpi/mca-btl-openib-device-params.ini + +%files -n compat-openmpi16%{?_cc_name_suffix}-devel +%dir %{_includedir}/%{namearch} +%dir %{_libdir}/%{libname}/share/vampirtrace +%{_libdir}/%{libname}/bin/mpi[cCf]* +%{_libdir}/%{libname}/bin/vt* +%{_libdir}/%{libname}/bin/opal_* +%{_includedir}/%{namearch}/* +%{_libdir}/%{libname}/lib/*.so +%{_libdir}/%{libname}/lib/lib*.a +%{_libdir}/%{libname}/lib/mpi.mod +%{_mandir}/%{namearch}/man1/mpi[cCf]* +%{_mandir}/%{namearch}/man1/opal_* +%{_mandir}/%{namearch}/man3/* +%{_mandir}/%{namearch}/man7/opal* +%{_libdir}/%{libname}/share/openmpi/openmpi-valgrind.supp +%{_libdir}/%{libname}/share/openmpi/mpi*.txt +%{_libdir}/%{libname}/share/openmpi/orte*.txt +%{_libdir}/%{libname}/share/vampirtrace/* +%{_sysconfdir}/rpm/macros.%{namearch} +%endif + %changelog +* Thu Sep 03 2015 Michal Schmidt - 1.10.0-10 +- Remove psm2 package variant. Instead use MCA exclusion using config file. +- Related: #947311 +- Related: #1173305 + +* Tue Sep 01 2015 Michal Schmidt - 1.10.0-8 +- Differentiate MPI_COMPILER and MPI_SUFFIX in the variants. +- Related: #947311 +- Related: #1173305 + +* Mon Aug 31 2015 Michal Schmidt - 1.10.0-6 +- Avoid macro expansion in old changelog entry. +- Related: #947311 +- Related: #1173305 + +* Fri Aug 28 2015 Michal Schmidt - 1.10.0-4 +- Disambiguate names of rpm macros among the built variants. +- Use --with-verbs instead of the deprecated synonym --with-openib. +- Related: #947311 +- Related: #1173305 + +* Thu Aug 27 2015 Michal Schmidt - 1.10.0-3 +- Workaround psm vs psm2 conflict by having two separate packages. +- Related: #947311 +- Related: #1173305 + +* Tue Aug 25 2015 Michal Schmidt - 1.10.0-1 +- New upstream release v1.10. +- Added 1.6 compat package. +- Resolves: #947311 +- Resolves: #1173305 + * Fri Sep 12 2014 Dan Horák - 1.6.4-5 - add support for aarch64 (backport by Marcin Juszkiewicz) - Resolves: #1132244 @@ -390,7 +623,7 @@ make check - Adjust the files entries for share/openmpi/mpi* - Add files entry for share/openmpi/orte*.txt -* Sat Sep 05 2010 Dennis Gilmore - 1.4.1-7 +* Sun Sep 05 2010 Dennis Gilmore - 1.4.1-7 - disable valgrind support on sparc arches * Sat Jul 24 2010 David Malcolm - 1.4.1-6 @@ -435,8 +668,8 @@ make check - Create and own man* directories for use by dependent packages. * Wed Sep 16 2009 Jay Fenlason - 1.3.3-5 -- Move the module file from %{_datadir}/Modules/modulefiles/%{namearch} to - %{_sysconfdir}/modulefiles/%{namearch} where it belongs. +- Move the module file from %%{_datadir}/Modules/modulefiles/%%{namearch} to + %%{_sysconfdir}/modulefiles/%%{namearch} where it belongs. - Have the -devel subpackage own the man1 and man7 directories for completeness. - Add a blank line before the clean section. - Remove --enable-mpirun-prefix-by-default from configure.