Merge branch '4.0'

Update to 4.0.1

Conflicts:
	.gitignore
	openmpi.spec
	sources
This commit is contained in:
Orion Poplawski 2019-04-28 14:01:07 -06:00
commit 2a99253c2c
3 changed files with 22 additions and 5 deletions

2
.gitignore vendored
View File

@ -42,3 +42,5 @@ openmpi-1.4.1-RH.tar.bz2
/openmpi-2.1.6.tar.bz2 /openmpi-2.1.6.tar.bz2
/openmpi-3.1.3.tar.bz2 /openmpi-3.1.3.tar.bz2
/openmpi-3.1.4.tar.bz2 /openmpi-3.1.4.tar.bz2
/openmpi-4.0.0.tar.bz2
/openmpi-4.0.1.tar.bz2

View File

@ -20,14 +20,14 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: openmpi%{?_cc_name_suffix} Name: openmpi%{?_cc_name_suffix}
Version: 3.1.4 Version: 4.0.1
Release: 1%{?dist} Release: 1%{?dist}
Summary: Open Message Passing Interface Summary: Open Message Passing Interface
License: BSD and MIT and Romio License: BSD and MIT and Romio
URL: http://www.open-mpi.org/ URL: http://www.open-mpi.org/
# We can't use %{name} here because of _cc_name_suffix # We can't use %{name} here because of _cc_name_suffix
Source0: https://www.open-mpi.org/software/ompi/v3.1/downloads/openmpi-%{version}.tar.bz2 Source0: https://www.open-mpi.org/software/ompi/v4.0/downloads/openmpi-%{version}.tar.bz2
Source1: openmpi.module.in Source1: openmpi.module.in
Source2: openmpi.pth.py2 Source2: openmpi.pth.py2
Source3: openmpi.pth.py3 Source3: openmpi.pth.py3
@ -68,6 +68,9 @@ BuildRequires: infinipath-psm-devel
BuildRequires: libpsm2-devel BuildRequires: libpsm2-devel
%endif %endif
BuildRequires: torque-devel BuildRequires: torque-devel
%ifarch aarch64 ppc64le x86_64
BuildRequires: ucx-devel
%endif
BuildRequires: zlib-devel BuildRequires: zlib-devel
%if !0%{?el7} %if !0%{?el7}
BuildRequires: rpm-mpi-hooks BuildRequires: rpm-mpi-hooks
@ -161,6 +164,7 @@ OpenMPI support for Python 3.
--enable-mpi-cxx \ --enable-mpi-cxx \
%endif %endif
--enable-mpi-java \ --enable-mpi-java \
--enable-mpi1-compatibility \
--with-sge \ --with-sge \
--with-valgrind \ --with-valgrind \
--enable-memchecker \ --enable-memchecker \
@ -245,10 +249,11 @@ make check
%{_libdir}/%{name}/bin/mpi[er]* %{_libdir}/%{name}/bin/mpi[er]*
%{_libdir}/%{name}/bin/ompi* %{_libdir}/%{name}/bin/ompi*
%{_libdir}/%{name}/bin/orte[-dr_]* %{_libdir}/%{name}/bin/orte[-dr_]*
%ifarch aarch64 ppc64le x86_64
%{_libdir}/%{name}/bin/oshmem_info %{_libdir}/%{name}/bin/oshmem_info
%{_libdir}/%{name}/bin/oshrun %{_libdir}/%{name}/bin/oshrun
%{_libdir}/%{name}/bin/prun
%{_libdir}/%{name}/bin/shmemrun %{_libdir}/%{name}/bin/shmemrun
%endif
%{_libdir}/%{name}/lib/*.so.40* %{_libdir}/%{name}/lib/*.so.40*
%{_libdir}/%{name}/lib/libmca*.so.41* %{_libdir}/%{name}/lib/libmca*.so.41*
%{_libdir}/%{name}/lib/libmca*.so.50* %{_libdir}/%{name}/lib/libmca*.so.50*
@ -258,10 +263,11 @@ make check
%{_mandir}/%{namearch}/man1/mpi[er]* %{_mandir}/%{namearch}/man1/mpi[er]*
%{_mandir}/%{namearch}/man1/ompi* %{_mandir}/%{namearch}/man1/ompi*
%{_mandir}/%{namearch}/man1/orte[-dr_]* %{_mandir}/%{namearch}/man1/orte[-dr_]*
%ifarch aarch64 ppc64le x86_64
%{_mandir}/%{namearch}/man1/oshmem_info* %{_mandir}/%{namearch}/man1/oshmem_info*
%{_mandir}/%{namearch}/man1/oshrun* %{_mandir}/%{namearch}/man1/oshrun*
%{_mandir}/%{namearch}/man1/prun*
%{_mandir}/%{namearch}/man1/shmemrun* %{_mandir}/%{namearch}/man1/shmemrun*
%endif
%{_mandir}/%{namearch}/man7/ompi_* %{_mandir}/%{namearch}/man7/ompi_*
%{_mandir}/%{namearch}/man7/opal_* %{_mandir}/%{namearch}/man7/opal_*
%{_mandir}/%{namearch}/man7/orte* %{_mandir}/%{namearch}/man7/orte*
@ -282,9 +288,13 @@ make check
%{_libdir}/%{name}/bin/mpi[cCf]* %{_libdir}/%{name}/bin/mpi[cCf]*
%{_libdir}/%{name}/bin/opal_* %{_libdir}/%{name}/bin/opal_*
%{_libdir}/%{name}/bin/orte[cCf]* %{_libdir}/%{name}/bin/orte[cCf]*
%ifarch aarch64 ppc64le x86_64
%{_libdir}/%{name}/bin/osh[cCf]* %{_libdir}/%{name}/bin/osh[cCf]*
%endif
%{_libdir}/%{name}/bin/profile2mat.pl %{_libdir}/%{name}/bin/profile2mat.pl
%ifarch aarch64 ppc64le x86_64
%{_libdir}/%{name}/bin/shmem[cCf]* %{_libdir}/%{name}/bin/shmem[cCf]*
%endif
%{_includedir}/%{namearch}/* %{_includedir}/%{namearch}/*
%{_fmoddir}/%{name}/ %{_fmoddir}/%{name}/
%{_libdir}/%{name}/lib/*.so %{_libdir}/%{name}/lib/*.so
@ -292,8 +302,10 @@ make check
%{_libdir}/%{name}/lib/pkgconfig/ %{_libdir}/%{name}/lib/pkgconfig/
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%{_mandir}/%{namearch}/man1/mpi[cCf]* %{_mandir}/%{namearch}/man1/mpi[cCf]*
%ifarch aarch64 ppc64le x86_64
%{_mandir}/%{namearch}/man1/osh[cCf]* %{_mandir}/%{namearch}/man1/osh[cCf]*
%{_mandir}/%{namearch}/man1/shmem[cCf]* %{_mandir}/%{namearch}/man1/shmem[cCf]*
%endif
%{_mandir}/%{namearch}/man1/opal_* %{_mandir}/%{namearch}/man1/opal_*
%{_mandir}/%{namearch}/man3/* %{_mandir}/%{namearch}/man3/*
%{_libdir}/%{name}/share/openmpi/openmpi-valgrind.supp %{_libdir}/%{name}/share/openmpi/openmpi-valgrind.supp
@ -320,6 +332,9 @@ make check
%changelog %changelog
* Sun Apr 28 2019 Orion Poplawski <orion@nwra.com> - 4.0.1-1
- Update to 4.0.1
* Sun Apr 28 2019 Orion Poplawski <orion@nwra.com> - 3.1.4-1 * Sun Apr 28 2019 Orion Poplawski <orion@nwra.com> - 3.1.4-1
- Update to 3.1.4 - Update to 3.1.4

View File

@ -1 +1 @@
SHA512 (openmpi-3.1.4.tar.bz2) = 5b4aafffc79fd85cb94a11a6e2fac563b142ac532191009eb35826c432ed3c391a6616e2ca92eacbf36137468eadb7c0f7ddc787034bc95c4214232ed5128338 SHA512 (openmpi-4.0.1.tar.bz2) = 09f35dc2e44b4f84aab9c5af9d81f90bbdb030e4d90800a5d3ffae88cb32b7faecc9bea0abb113da53c21f73e9d19db68f961f997bc47bdd28d83a87beee0731