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

EL7 fixes

Browse Source
This commit is contained in:
Orion Poplawski 2019-02-02 21:59:58 -07:00
parent 8cf4509374
commit 393d6abd66
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
openmpi.spec
View File

@ -51,7 +51,10 @@ BuildRequires: hwloc-devel
# So configure can find lstopo # So configure can find lstopo
BuildRequires: hwloc-gui BuildRequires: hwloc-gui
BuildRequires: java-devel BuildRequires: java-devel
# Old libevent causes issues
%if !0%{?el7}
BuildRequires: libevent-devel BuildRequires: libevent-devel
%endif
%ifnarch s390 s390x %ifnarch s390 s390x
BuildRequires: libfabric-devel BuildRequires: libfabric-devel
BuildRequires: papi-devel BuildRequires: papi-devel
@ -68,14 +71,16 @@ BuildRequires: libpsm2-devel
%endif %endif
BuildRequires: torque-devel BuildRequires: torque-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
%if !0%{?el7}
BuildRequires: rpm-mpi-hooks BuildRequires: rpm-mpi-hooks
%endif
Provides: mpi Provides: mpi
%if 0%{?rhel} %if 0%{?rhel}
# Need this for /etc/profile.d/modules.sh
Requires: environment-modules Requires: environment-modules
%else
Requires: environment(modules)
%endif %endif
Requires: environment(modules)
# openmpi currently requires ssh to run # openmpi currently requires ssh to run
# https://svn.open-mpi.org/trac/ompi/ticket/4228 # https://svn.open-mpi.org/trac/ompi/ticket/4228
Requires: openssh-clients Requires: openssh-clients
@ -98,7 +103,9 @@ Summary: Development files for openmpi
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release}, gcc-gfortran Requires: %{name} = %{version}-%{release}, gcc-gfortran
Provides: mpi-devel Provides: mpi-devel
%if !0%{?el7}
Requires: rpm-mpi-hooks Requires: rpm-mpi-hooks
%endif
%description devel %description devel
Contains development headers and libraries for openmpi. Contains development headers and libraries for openmpi.
@ -167,8 +174,10 @@ OpenMPI support for Python 3.
--enable-memchecker \ --enable-memchecker \
%endif %endif
--with-hwloc=/usr \ --with-hwloc=/usr \
%if !0%{?el7}
--with-libevent=external \ --with-libevent=external \
--with-pmix=external \ --with-pmix=external \
%endif
CC=%{opt_cc} CXX=%{opt_cxx} \ CC=%{opt_cc} CXX=%{opt_cxx} \
LDFLAGS='%{__global_ldflags}' \ LDFLAGS='%{__global_ldflags}' \
CFLAGS="%{?opt_cflags} %{!?opt_cflags:$RPM_OPT_FLAGS}" \ CFLAGS="%{?opt_cflags} %{!?opt_cflags:$RPM_OPT_FLAGS}" \
@ -252,6 +261,9 @@ make check
%{_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*
%if 0%{?el7}
%{_libdir}/%{name}/lib/pmix/
%endif
%{_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_]*
@ -271,6 +283,9 @@ make check
%ifnarch s390 %{arm} %ifnarch s390 %{arm}
%{_libdir}/%{name}/share/openmpi/mca-btl-openib-device-params.ini %{_libdir}/%{name}/share/openmpi/mca-btl-openib-device-params.ini
%endif %endif
%if 0%{?el7}
%{_libdir}/%{name}/share/pmix/
%endif
%files devel %files devel
%dir %{_includedir}/%{namearch} %dir %{_includedir}/%{namearch}
@ -319,7 +334,7 @@ make check
* Sat Dec 15 2018 Orion Poplawski <orion@nwra.com> - 3.1.3-1 * Sat Dec 15 2018 Orion Poplawski <orion@nwra.com> - 3.1.3-1
- Update to 3.1.3 - Update to 3.1.3
- Drop ppc64le patch fixed upstream - Drop ppc64le patch fixed upstream
- Use external libevent and pmix - Use external libevent and pmix, except on EL7
- Fix EPEL7 builds - Fix EPEL7 builds
* Wed Nov 28 2018 Orion Poplawski <orion@nwra.com> - 2.1.6-0.1.rc1 * Wed Nov 28 2018 Orion Poplawski <orion@nwra.com> - 2.1.6-0.1.rc1