Hello community, here is the log from the commit of package mpitests for openSUSE:Factory checked in at 2018-08-24 17:10:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mpitests (Old) and /work/SRC/openSUSE:Factory/.mpitests.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mpitests" Fri Aug 24 17:10:41 2018 rev:5 rq:631027 version:3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/mpitests/mpitests.changes 2018-07-09 13:29:18.450737103 +0200 +++ /work/SRC/openSUSE:Factory/.mpitests.new/mpitests.changes 2018-08-24 17:10:49.786551049 +0200 @@ -1,0 +2,6 @@ +Wed Aug 22 14:49:57 UTC 2018 - [email protected] + +- Fix compatibility for SLE12* +- Sync changelog with SLES12SP3 + +------------------------------------------------------------------- @@ -112,0 +119,5 @@ +- Drop associated patches: + - mpitests-link_to_libm.patch + - mpitests-order_of_evaluation.patch + - mpitests-codecleanup.patch + - mpitests-rpm_opt_flags.patch @@ -135,0 +147,5 @@ + +------------------------------------------------------------------- +Wed Apr 26 10:06:16 UTC 2017 - [email protected] + +- Build against openmpi-1.10. bsc#1035326 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mpitests.spec ++++++ --- /var/tmp/diff_new_pack.nsXyJi/_old 2018-08-24 17:10:50.330551697 +0200 +++ /var/tmp/diff_new_pack.nsXyJi/_new 2018-08-24 17:10:50.334551701 +0200 @@ -42,15 +42,16 @@ %define imb_ver 2018.1 %define mpi_home %{hpc_mpi_home %flavor} %define implem_list_dir %{_datadir}/mpitests/implem.d/ +%define sles_pre_15 (0%{?sle_version} > 120000 && 0%{?sle_version} < 150000) Name: mpitests%{pack_suff} %if "%{flavor}" == "" Summary: MPI Benchmarks common files -License: BSD-3-Clause and CPL-1.0 +License: BSD-3-Clause AND CPL-1.0 Group: Development/Languages/Other %else Summary: MPI Benchmarks and tests for %{flavor} -License: BSD-3-Clause and CPL-1.0 +License: BSD-3-Clause AND CPL-1.0 Group: Development/Languages/Other %endif Version: 3.2 @@ -65,7 +66,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dos2unix BuildRequires: gcc-c++ +# suse-hpc is not available for SLE < 15 +%if 0%{?is_opensuse} || 0%{?sle_version} >= 150000 BuildRequires: suse-hpc +%endif %if "%{flavor}" != "" BuildRequires: %{flavor} BuildRequires: %{flavor}-devel @@ -74,18 +78,60 @@ Requires: mpitests = %{version} %endif -%if "%{flavor}" == "mvapich2" || "%{flavor}" == "mvapich2-gnu-hpc" +%if "%{flavor}" == "mvapich2" ExcludeArch: %{arm} %endif -%if "%{flavor}" == "mvapich2-psm" || "%{flavor}" == "mvapich2-psm-gnu-hpc" + +%if "%{flavor}" == "mvapich2-gnu-hpc" +%if %{sles_pre_15} +# Disable hpc builds for SLE12 +ExclusiveArch: do_not_build +%endif +ExcludeArch: %{arm} +%endif + +%if "%{flavor}" == "mvapich2-psm" ExclusiveArch: %ix86 x86_64 %endif -%if "%{flavor}" == "mvapich2-psm2" || "%{flavor}" == "mvapich2-psm2-gnu-hpc" + +%if "%{flavor}" == "mvapich2-psm-gnu-hpc" +%if %{sles_pre_15} +# Disable hpc builds for SLE12 +ExclusiveArch: do_not_build +%else +ExclusiveArch: %ix86 x86_64 +%endif +%endif + +%if "%{flavor}" == "mvapich2-psm2" ExclusiveArch: x86_64 %endif + +%if "%{flavor}" == "mvapich2-psm2-gnu-hpc" +%if %{sles_pre_15} +# Disable hpc builds for SLE12 +ExclusiveArch: do_not_build +%else +ExclusiveArch: x86_64 +%endif +%endif + +%if "%{flavor}" == "openmpi1-gnu-hpc" +%if %{sles_pre_15} +# Disable hpc builds for SLE12 +ExclusiveArch: do_not_build +%endif +%endif + %if "%{flavor}" == "openmpi2" || "%{flavor}" == "openmpi2-gnu-hpc" +%if %{sles_pre_15} +# Disable openmpi2 builds for SLE12 +ExclusiveArch: do_not_build +%else ExcludeArch: ppc64 %endif +%endif + %if "%{flavor}" == "openmpi3" || "%{flavor}" == "openmpi3-gnu-hpc" %if !0%{?is_opensuse} #OpenMPI3 is not available in SLE, so do not build these flavors unless @@ -98,6 +144,13 @@ ExcludeArch: ppc64 %endif +# Disable mpich builds for SLE12 as it is not available +%if "%{flavor}" == "mpich-ofi" || "%{flavor}" == "mpich" || "%{flavor}" == "mpich-ofi-gnu-hpc" || "%{flavor}" == "mpich-gnu-hpc" +%if %{sles_pre_15} +ExclusiveArch: do_not_build +%endif +%endif + %description Set of popular MPI benchmarks: IMB v%{imb_ver} OSU benchmarks ver %{osu_ver}
