rpm/mvapich2
SHA256
1
0
Fork 0
forked from pool/mvapich2
Code Pull Requests Activity

- Have mvapich2 and mvapich2-psm conflicts between them

Browse Source 
- Cleanup spec file
- Remove mvapich2-testsuite RPM

OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=8
This commit is contained in:
Nicolas Morey-Chaisemartin 2017-06-14 13:16:46 +00:00 committed by Git OBS Bridge
parent 1da650a287
commit c79ce5aa4c
4 changed files with 82 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
mvapich2-psm.spec
View File

@ -23,6 +23,15 @@
# mvapich2-testuite. # # mvapich2-testuite. #
# # # #
############################################################################# #############################################################################
%if "%{name}" == "mvapich2-psm"
%define alt_pack mvapich2
%else
%define alt_pack mvapich2-psm
%endif
%define _prefix /usr/%_lib/mpi/gcc/mvapich2
%define _libexecdir %{_prefix}/%{_lib}
%define _benchmarkdir %{_libexecdir}/osu-micro-benchmarks
Name: mvapich2-psm Name: mvapich2-psm
Summary: OSU MVAPICH2 MPI package Summary: OSU MVAPICH2 MPI package
@ -58,9 +67,6 @@ BuildRequires: mpi-selector
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: sysfsutils BuildRequires: sysfsutils
BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-devel
# mvapich needs asm/timex.h which seems to be missing from the glibc kernel headers
#ExcludeArch: aarch64 armv7hl
%if "%{name}" == "mvapich2-psm" %if "%{name}" == "mvapich2-psm"
ExclusiveArch: %ix86 x86_64 ExclusiveArch: %ix86 x86_64
BuildRequires: infinipath-psm-devel BuildRequires: infinipath-psm-devel
@ -70,16 +76,13 @@ BuildRequires: libpsm2-devel
%endif %endif
Requires: mpi-selector Requires: mpi-selector
Conflicts: %{alt_pack}
%define _prefix /usr/%_lib/mpi/gcc/mvapich2
%define _libexecdir %{_prefix}/%{_lib}
%define _benchmarkdir %{_libexecdir}/osu-micro-benchmarks
%description %description
This is an MPI-3 implementation which includes all MPI-1 features. It This is an MPI-3 implementation which includes all MPI-1 features. It
is based on MPICH2 and MVICH. is based on MPICH2 and MVICH.
%if "%{name}" == "mvapich2" || "%{name}" == "mvapich2-psm" %if "%{name}" != "mvapich2-testsuite"
%package devel %package devel
Summary: OSU MVAPICH2 MPI package Summary: OSU MVAPICH2 MPI package
@ -88,6 +91,7 @@ Requires: %{name} = %{version}
Requires: libibumad-devel Requires: libibumad-devel
Requires: libibverbs-devel Requires: libibverbs-devel
Requires: librdmacm-devel Requires: librdmacm-devel
Conflicts: %{alt_pack}-devel
%if "%{name}" == "mvapich2-psm" %if "%{name}" == "mvapich2-psm"
Requires: infinipath-psm-devel Requires: infinipath-psm-devel
%ifarch x86_64 %ifarch x86_64
@ -105,6 +109,7 @@ is based on MPICH2 and MVICH.
Summary: OSU MVAPICH2 MPI package - static libraries Summary: OSU MVAPICH2 MPI package - static libraries
Group: Development/Libraries/Parallel Group: Development/Libraries/Parallel
Requires: %{name}-devel = %{version} Requires: %{name}-devel = %{version}
Conflicts: %{alt_pack}-devel-static
%description devel-static %description devel-static
This is an MPI-3 implementation which includes all MPI-1 and MPI-2 features. It This is an MPI-3 implementation which includes all MPI-1 and MPI-2 features. It
@ -121,7 +126,8 @@ cp /usr/share/automake*/config.* .
%build %build
#./autogen.sh #./autogen.sh
%configure --prefix=%_prefix --libdir=%_libdir --mandir=%_mandir --sysconfdir=%_sysconfdir --libexecdir=%{_libexecdir} \ %configure --prefix=%_prefix --libdir=%_libdir --mandir=%_mandir \
--sysconfdir=%_sysconfdir --libexecdir=%{_libexecdir} \
%if "%{name}" == "mvapich2-psm" %if "%{name}" == "mvapich2-psm"
--with-device=ch3:psm \ --with-device=ch3:psm \
%endif %endif
@ -147,21 +153,15 @@ rm -f %{buildroot}%{_libdir}/libfmpich.la \
%{buildroot}%{_libdir}/libmpi.la \ %{buildroot}%{_libdir}/libmpi.la \
%{buildroot}%{_libdir}/libmpicxx.la \ %{buildroot}%{_libdir}/libmpicxx.la \
%{buildroot}%{_libdir}/libmpifort.la %{buildroot}%{_libdir}/libmpifort.la
%if "%{name}" == "mvapich2-testsuite"
rm -rf %{buildroot}%{_libdir}/pkgconfig
rm -rf %{buildroot}%{_includedir}
rm -rf %{buildroot}%{_mandir}/man3/*
rm -rf %{buildroot}%{_libdir}/*.so
rm -rf %{buildroot}%{_libdir}/pkgconfig/mvapich2.pc
rm -rf %{buildroot}%{_libdir}/pkgconfig/openpa.pc
rm -rf %{buildroot}%{_libdir}/*.a
%endif
install -m 0644 COPYRIGHT* %{buildroot}%{_datadir}/doc/mvapich2 install -m 0644 COPYRIGHT* %{buildroot}%{_datadir}/doc/mvapich2
install -m 0644 CHANGE* %{buildroot}%{_datadir}/doc/mvapich2 install -m 0644 CHANGE* %{buildroot}%{_datadir}/doc/mvapich2
%if "%{name}" == "mvapich2-testsuite"
# Remove everything from testsuite package
# It is all contained by mvapich2 packages
rm -rf %{buildroot}/*
%endif
%if "%{name}" != "mvapich2-testsuite" %if "%{name}" != "mvapich2-testsuite"
mkdir -p %{buildroot}/usr/share/modules/gnu-mvapich2 mkdir -p %{buildroot}/usr/share/modules/gnu-mvapich2
@ -187,7 +187,6 @@ cat << EOF > %{buildroot}/usr/share/modules/gnu-mvapich2/.version
set ModulesVersion "%{version}" set ModulesVersion "%{version}"
EOF EOF
%endif
%post %post
/sbin/ldconfig /sbin/ldconfig
@ -209,9 +208,7 @@ EOF
%dir %{_prefix} %dir %{_prefix}
%dir %{_bindir} %dir %{_bindir}
%dir %{_datadir} %dir %{_datadir}
%if "%{name}" == "mvapich2" || "%{name}" == "mvapich2-psm"
%dir /usr/share/modules %dir /usr/share/modules
%endif
%if "%{name}" == "mvapich2" %if "%{name}" == "mvapich2"
%dir %{_includedir} %dir %{_includedir}
%endif %endif
@ -222,13 +219,10 @@ EOF
%dir %{_libexecdir} %dir %{_libexecdir}
%{_bindir}/* %{_bindir}/*
%{_libexecdir}/osu-micro-benchmarks %{_libexecdir}/osu-micro-benchmarks
%if "%{name}" == "mvapich2" || "%{name}" == "mvapich2-psm"
/usr/share/modules/gnu-mvapich2 /usr/share/modules/gnu-mvapich2
%endif
%{_mandir}/man1/* %{_mandir}/man1/*
%{_libdir}/*.so.* %{_libdir}/*.so.*
%if "%{name}" == "mvapich2" || "%{name}" == "mvapich2-psm"
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_libdir}/pkgconfig %dir %{_libdir}/pkgconfig
@ -242,6 +236,10 @@ EOF
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/*.a %{_libdir}/*.a
%else # mvapich2-testsuite
# Nothing to package here.
%endif %endif
%changelog %changelog

52
mvapich2-testsuite.spec
View File

@ -23,6 +23,15 @@
# mvapich2-testuite. # # mvapich2-testuite. #
# # # #
############################################################################# #############################################################################
%if "%{name}" == "mvapich2-psm"
%define alt_pack mvapich2
%else
%define alt_pack mvapich2-psm
%endif
%define _prefix /usr/%_lib/mpi/gcc/mvapich2
%define _libexecdir %{_prefix}/%{_lib}
%define _benchmarkdir %{_libexecdir}/osu-micro-benchmarks
Name: mvapich2-testsuite Name: mvapich2-testsuite
Summary: OSU MVAPICH2 MPI package Summary: OSU MVAPICH2 MPI package
@ -58,9 +67,6 @@ BuildRequires: mpi-selector
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: sysfsutils BuildRequires: sysfsutils
BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-devel
# mvapich needs asm/timex.h which seems to be missing from the glibc kernel headers
#ExcludeArch: aarch64 armv7hl
%if "%{name}" == "mvapich2-psm" %if "%{name}" == "mvapich2-psm"
ExclusiveArch: %ix86 x86_64 ExclusiveArch: %ix86 x86_64
BuildRequires: infinipath-psm-devel BuildRequires: infinipath-psm-devel
@ -70,16 +76,13 @@ BuildRequires: libpsm2-devel
%endif %endif
Requires: mpi-selector Requires: mpi-selector
Conflicts: %{alt_pack}
%define _prefix /usr/%_lib/mpi/gcc/mvapich2
%define _libexecdir %{_prefix}/%{_lib}
%define _benchmarkdir %{_libexecdir}/osu-micro-benchmarks
%description %description
This is an MPI-3 implementation which includes all MPI-1 features. It This is an MPI-3 implementation which includes all MPI-1 features. It
is based on MPICH2 and MVICH. is based on MPICH2 and MVICH.
%if "%{name}" == "mvapich2" || "%{name}" == "mvapich2-psm" %if "%{name}" != "mvapich2-testsuite"
%package devel %package devel
Summary: OSU MVAPICH2 MPI package Summary: OSU MVAPICH2 MPI package
@ -88,6 +91,7 @@ Requires: %{name} = %{version}
Requires: libibumad-devel Requires: libibumad-devel
Requires: libibverbs-devel Requires: libibverbs-devel
Requires: librdmacm-devel Requires: librdmacm-devel
Conflicts: %{alt_pack}-devel
%if "%{name}" == "mvapich2-psm" %if "%{name}" == "mvapich2-psm"
Requires: infinipath-psm-devel Requires: infinipath-psm-devel
%ifarch x86_64 %ifarch x86_64
@ -105,6 +109,7 @@ is based on MPICH2 and MVICH.
Summary: OSU MVAPICH2 MPI package - static libraries Summary: OSU MVAPICH2 MPI package - static libraries
Group: Development/Libraries/Parallel Group: Development/Libraries/Parallel
Requires: %{name}-devel = %{version} Requires: %{name}-devel = %{version}
Conflicts: %{alt_pack}-devel-static
%description devel-static %description devel-static
This is an MPI-3 implementation which includes all MPI-1 and MPI-2 features. It This is an MPI-3 implementation which includes all MPI-1 and MPI-2 features. It
@ -121,7 +126,8 @@ cp /usr/share/automake*/config.* .
%build %build
#./autogen.sh #./autogen.sh
%configure --prefix=%_prefix --libdir=%_libdir --mandir=%_mandir --sysconfdir=%_sysconfdir --libexecdir=%{_libexecdir} \ %configure --prefix=%_prefix --libdir=%_libdir --mandir=%_mandir \
--sysconfdir=%_sysconfdir --libexecdir=%{_libexecdir} \
%if "%{name}" == "mvapich2-psm" %if "%{name}" == "mvapich2-psm"
--with-device=ch3:psm \ --with-device=ch3:psm \
%endif %endif
@ -147,21 +153,15 @@ rm -f %{buildroot}%{_libdir}/libfmpich.la \
%{buildroot}%{_libdir}/libmpi.la \ %{buildroot}%{_libdir}/libmpi.la \
%{buildroot}%{_libdir}/libmpicxx.la \ %{buildroot}%{_libdir}/libmpicxx.la \
%{buildroot}%{_libdir}/libmpifort.la %{buildroot}%{_libdir}/libmpifort.la
%if "%{name}" == "mvapich2-testsuite"
rm -rf %{buildroot}%{_libdir}/pkgconfig
rm -rf %{buildroot}%{_includedir}
rm -rf %{buildroot}%{_mandir}/man3/*
rm -rf %{buildroot}%{_libdir}/*.so
rm -rf %{buildroot}%{_libdir}/pkgconfig/mvapich2.pc
rm -rf %{buildroot}%{_libdir}/pkgconfig/openpa.pc
rm -rf %{buildroot}%{_libdir}/*.a
%endif
install -m 0644 COPYRIGHT* %{buildroot}%{_datadir}/doc/mvapich2 install -m 0644 COPYRIGHT* %{buildroot}%{_datadir}/doc/mvapich2
install -m 0644 CHANGE* %{buildroot}%{_datadir}/doc/mvapich2 install -m 0644 CHANGE* %{buildroot}%{_datadir}/doc/mvapich2
%if "%{name}" == "mvapich2-testsuite"
# Remove everything from testsuite package
# It is all contained by mvapich2 packages
rm -rf %{buildroot}/*
%endif
%if "%{name}" != "mvapich2-testsuite" %if "%{name}" != "mvapich2-testsuite"
mkdir -p %{buildroot}/usr/share/modules/gnu-mvapich2 mkdir -p %{buildroot}/usr/share/modules/gnu-mvapich2
@ -187,7 +187,6 @@ cat << EOF > %{buildroot}/usr/share/modules/gnu-mvapich2/.version
set ModulesVersion "%{version}" set ModulesVersion "%{version}"
EOF EOF
%endif
%post %post
/sbin/ldconfig /sbin/ldconfig
@ -209,9 +208,7 @@ EOF
%dir %{_prefix} %dir %{_prefix}
%dir %{_bindir} %dir %{_bindir}
%dir %{_datadir} %dir %{_datadir}
%if "%{name}" == "mvapich2" || "%{name}" == "mvapich2-psm"
%dir /usr/share/modules %dir /usr/share/modules
%endif
%if "%{name}" == "mvapich2" %if "%{name}" == "mvapich2"
%dir %{_includedir} %dir %{_includedir}
%endif %endif
@ -222,13 +219,10 @@ EOF
%dir %{_libexecdir} %dir %{_libexecdir}
%{_bindir}/* %{_bindir}/*
%{_libexecdir}/osu-micro-benchmarks %{_libexecdir}/osu-micro-benchmarks
%if "%{name}" == "mvapich2" || "%{name}" == "mvapich2-psm"
/usr/share/modules/gnu-mvapich2 /usr/share/modules/gnu-mvapich2
%endif
%{_mandir}/man1/* %{_mandir}/man1/*
%{_libdir}/*.so.* %{_libdir}/*.so.*
%if "%{name}" == "mvapich2" || "%{name}" == "mvapich2-psm"
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_libdir}/pkgconfig %dir %{_libdir}/pkgconfig
@ -242,6 +236,10 @@ EOF
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/*.a %{_libdir}/*.a
%else # mvapich2-testsuite
# Nothing to package here.
%endif %endif
%changelog %changelog

7
mvapich2.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jun 14 10:01:07 UTC 2017 - nmoreychaisemartin@suse.com
- Have mvapich2 and mvapich2-psm conflicts between them
- Cleanup spec file
- Remove mvapich2-testsuite RPM
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 8 13:55:32 UTC 2017 - nmoreychaisemartin@suse.com Thu Jun 8 13:55:32 UTC 2017 - nmoreychaisemartin@suse.com

52
mvapich2.spec
View File

@ -23,6 +23,15 @@
# mvapich2-testuite. # # mvapich2-testuite. #
# # # #
############################################################################# #############################################################################
%if "%{name}" == "mvapich2-psm"
%define alt_pack mvapich2
%else
%define alt_pack mvapich2-psm
%endif
%define _prefix /usr/%_lib/mpi/gcc/mvapich2
%define _libexecdir %{_prefix}/%{_lib}
%define _benchmarkdir %{_libexecdir}/osu-micro-benchmarks
Name: mvapich2 Name: mvapich2
Summary: OSU MVAPICH2 MPI package Summary: OSU MVAPICH2 MPI package
@ -58,9 +67,6 @@ BuildRequires: mpi-selector
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: sysfsutils BuildRequires: sysfsutils
BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-devel
# mvapich needs asm/timex.h which seems to be missing from the glibc kernel headers
#ExcludeArch: aarch64 armv7hl
%if "%{name}" == "mvapich2-psm" %if "%{name}" == "mvapich2-psm"
ExclusiveArch: %ix86 x86_64 ExclusiveArch: %ix86 x86_64
BuildRequires: infinipath-psm-devel BuildRequires: infinipath-psm-devel
@ -70,16 +76,13 @@ BuildRequires: libpsm2-devel
%endif %endif
Requires: mpi-selector Requires: mpi-selector
Conflicts: %{alt_pack}
%define _prefix /usr/%_lib/mpi/gcc/mvapich2
%define _libexecdir %{_prefix}/%{_lib}
%define _benchmarkdir %{_libexecdir}/osu-micro-benchmarks
%description %description
This is an MPI-3 implementation which includes all MPI-1 features. It This is an MPI-3 implementation which includes all MPI-1 features. It
is based on MPICH2 and MVICH. is based on MPICH2 and MVICH.
%if "%{name}" == "mvapich2" || "%{name}" == "mvapich2-psm" %if "%{name}" != "mvapich2-testsuite"
%package devel %package devel
Summary: OSU MVAPICH2 MPI package Summary: OSU MVAPICH2 MPI package
@ -88,6 +91,7 @@ Requires: %{name} = %{version}
Requires: libibumad-devel Requires: libibumad-devel
Requires: libibverbs-devel Requires: libibverbs-devel
Requires: librdmacm-devel Requires: librdmacm-devel
Conflicts: %{alt_pack}-devel
%if "%{name}" == "mvapich2-psm" %if "%{name}" == "mvapich2-psm"
Requires: infinipath-psm-devel Requires: infinipath-psm-devel
%ifarch x86_64 %ifarch x86_64
@ -105,6 +109,7 @@ is based on MPICH2 and MVICH.
Summary: OSU MVAPICH2 MPI package - static libraries Summary: OSU MVAPICH2 MPI package - static libraries
Group: Development/Libraries/Parallel Group: Development/Libraries/Parallel
Requires: %{name}-devel = %{version} Requires: %{name}-devel = %{version}
Conflicts: %{alt_pack}-devel-static
%description devel-static %description devel-static
This is an MPI-3 implementation which includes all MPI-1 and MPI-2 features. It This is an MPI-3 implementation which includes all MPI-1 and MPI-2 features. It
@ -121,7 +126,8 @@ cp /usr/share/automake*/config.* .
%build %build
#./autogen.sh #./autogen.sh
%configure --prefix=%_prefix --libdir=%_libdir --mandir=%_mandir --sysconfdir=%_sysconfdir --libexecdir=%{_libexecdir} \ %configure --prefix=%_prefix --libdir=%_libdir --mandir=%_mandir \
--sysconfdir=%_sysconfdir --libexecdir=%{_libexecdir} \
%if "%{name}" == "mvapich2-psm" %if "%{name}" == "mvapich2-psm"
--with-device=ch3:psm \ --with-device=ch3:psm \
%endif %endif
@ -147,21 +153,15 @@ rm -f %{buildroot}%{_libdir}/libfmpich.la \
%{buildroot}%{_libdir}/libmpi.la \ %{buildroot}%{_libdir}/libmpi.la \
%{buildroot}%{_libdir}/libmpicxx.la \ %{buildroot}%{_libdir}/libmpicxx.la \
%{buildroot}%{_libdir}/libmpifort.la %{buildroot}%{_libdir}/libmpifort.la
%if "%{name}" == "mvapich2-testsuite"
rm -rf %{buildroot}%{_libdir}/pkgconfig
rm -rf %{buildroot}%{_includedir}
rm -rf %{buildroot}%{_mandir}/man3/*
rm -rf %{buildroot}%{_libdir}/*.so
rm -rf %{buildroot}%{_libdir}/pkgconfig/mvapich2.pc
rm -rf %{buildroot}%{_libdir}/pkgconfig/openpa.pc
rm -rf %{buildroot}%{_libdir}/*.a
%endif
install -m 0644 COPYRIGHT* %{buildroot}%{_datadir}/doc/mvapich2 install -m 0644 COPYRIGHT* %{buildroot}%{_datadir}/doc/mvapich2
install -m 0644 CHANGE* %{buildroot}%{_datadir}/doc/mvapich2 install -m 0644 CHANGE* %{buildroot}%{_datadir}/doc/mvapich2
%if "%{name}" == "mvapich2-testsuite"
# Remove everything from testsuite package
# It is all contained by mvapich2 packages
rm -rf %{buildroot}/*
%endif
%if "%{name}" != "mvapich2-testsuite" %if "%{name}" != "mvapich2-testsuite"
mkdir -p %{buildroot}/usr/share/modules/gnu-mvapich2 mkdir -p %{buildroot}/usr/share/modules/gnu-mvapich2
@ -187,7 +187,6 @@ cat << EOF > %{buildroot}/usr/share/modules/gnu-mvapich2/.version
set ModulesVersion "%{version}" set ModulesVersion "%{version}"
EOF EOF
%endif
%post %post
/sbin/ldconfig /sbin/ldconfig
@ -209,9 +208,7 @@ EOF
%dir %{_prefix} %dir %{_prefix}
%dir %{_bindir} %dir %{_bindir}
%dir %{_datadir} %dir %{_datadir}
%if "%{name}" == "mvapich2" || "%{name}" == "mvapich2-psm"
%dir /usr/share/modules %dir /usr/share/modules
%endif
%if "%{name}" == "mvapich2" %if "%{name}" == "mvapich2"
%dir %{_includedir} %dir %{_includedir}
%endif %endif
@ -222,13 +219,10 @@ EOF
%dir %{_libexecdir} %dir %{_libexecdir}
%{_bindir}/* %{_bindir}/*
%{_libexecdir}/osu-micro-benchmarks %{_libexecdir}/osu-micro-benchmarks
%if "%{name}" == "mvapich2" || "%{name}" == "mvapich2-psm"
/usr/share/modules/gnu-mvapich2 /usr/share/modules/gnu-mvapich2
%endif
%{_mandir}/man1/* %{_mandir}/man1/*
%{_libdir}/*.so.* %{_libdir}/*.so.*
%if "%{name}" == "mvapich2" || "%{name}" == "mvapich2-psm"
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_libdir}/pkgconfig %dir %{_libdir}/pkgconfig
@ -242,6 +236,10 @@ EOF
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/*.a %{_libdir}/*.a
%else # mvapich2-testsuite
# Nothing to package here.
%endif %endif
%changelog %changelog