Hello community, here is the log from the commit of package mumps for openSUSE:Leap:15.2 checked in at 2020-05-07 19:26:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/mumps (Old) and /work/SRC/openSUSE:Leap:15.2/.mumps.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mumps" Thu May 7 19:26:47 2020 rev:4 rq:757679 version:5.2.1 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/mumps/mumps.changes 2020-01-15 15:31:36.606784049 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.mumps.new.2738/mumps.changes 2020-05-07 19:27:51.273551674 +0200 @@ -1,0 +2,50 @@ +Tue Dec 3 12:06:39 UTC 2019 - Egbert Eich <e...@suse.com> + +- Set %mpi_ver for scotch-openmpi +- Remove requires for libblacs from HPC builds which is not + required there. +- Add openmpi3 non-HPC build flavor. +- Remove libblacs as explicit dependency for HPC build. BLACS + is part of scalapack. + +------------------------------------------------------------------- +Fri Nov 29 22:10:30 UTC 2019 - Egbert Eich <e...@suse.com> + +- Add support for gcc7 builds for HPC. +- Add support for gcc8 and gcc9 builds for HPC (jsc#SLE-7766 & + jsc#SLE-8604). + +------------------------------------------------------------------- +Thu Nov 28 16:16:49 UTC 2019 - Egbert Eich <e...@suse.com> + +- Disable openmpi1 builds for SLE/Leap > 15.1. +- Enable openmpi3 builds for Leap and SLE > 15.1 (jsc#SLE-7773). + +------------------------------------------------------------------- +Mon Nov 25 21:52:36 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Reflect renaming of openmpi packages to openmpi1 in Tumbleweed, + fixes unresolvable packages. + +------------------------------------------------------------------- +Mon Sep 9 07:47:02 UTC 2019 - Ana Guerrero Lopez <aguerr...@suse.com> + +- Update Source0, file is gz and not bzip2 +- Use -ffat-lto-objects to provide proper static library. + +------------------------------------------------------------------- +Wed Aug 28 18:59:46 UTC 2019 - Ana Guerrero Lopez <aguerr...@suse.com> + +- Update to version 5.2.1 (jsc#SLE-9939) + * See ChangeLog file or at http://mumps.enseeiht.fr/index.php?page=dwnld +- Refresh patch: + * Makefiles-Serialize-libseq-libplat-mommond_mod-for-parallel-builds.patch +- Install the new binaries provided with the examples. + +------------------------------------------------------------------- +Wed Jul 17 09:42:01 UTC 2019 - Michel Normand <norm...@linux.vnet.ibm.com> + +- Add BuildRequires libopenblas-gnu-hpc >= 0.3.6 for hpc to avoid + to build when openblas library not available (ppc64) + +------------------------------------------------------------------- Old: ---- mumps-5.1.2.tar.bz2 New: ---- mumps-5.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mumps.spec ++++++ --- /var/tmp/diff_new_pack.12fAga/_old 2020-05-07 19:27:52.781554693 +0200 +++ /var/tmp/diff_new_pack.12fAga/_new 2020-05-07 19:27:52.785554700 +0200 @@ -1,7 +1,7 @@ # # spec file for package mumps # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,8 +19,10 @@ %global flavor @BUILD_FLAVOR@%{nil} %define pname mumps -%define ver 5.1.2 +%define ver 5.2.1 %define so_ver 5 +%define openblas_vers 0.3.6 +%global _lto_cflags %{_lto_cflags} -ffat-lto-objects %define PNAME %(echo %{pname} | tr [a-z] [A-Z]) %define _ver %(echo %{ver} | tr . _) @@ -30,13 +32,10 @@ ExclusiveArch: do_not_build %endif -%if 0%{?is_opensuse} || 0%{?is_backports} -%undefine DisOMPI1 -%undefine DisOMPI2 -%undefine DisOMPI3 -%else +%if 0%{?sle_version} >= 150200 %define DisOMPI1 ExclusiveArch: do_not_build -%undefine DisOMPI2 +%endif +%if !0%{?is_opensuse} && 0%{?sle_version:1} && 0%{?sle_version} < 150200 %define DisOMPI3 ExclusiveArch: do_not_build %endif @@ -53,7 +52,7 @@ %bcond_without scotch %endif -%if "%{flavor}" == "openmpi" +%if "%{flavor}" == "openmpi1" %define mpi_family openmpi %define mumps_f77_mpilibs -lmpi_mpifh -lmpi %define mpi_ver 1 @@ -67,15 +66,23 @@ %bcond_with hpc %endif +%if "%{flavor}" == "openmpi3" +%define mpi_family openmpi +%define mumps_f77_mpilibs -lmpi_mpifh -lmpi +%define mpi_ver 3 +%bcond_with hpc +%endif + %if "%{flavor}" == "mvapich2" %define mpi_family mvapich2 %define mumps_f77_mpilibs -lfmpich -lmpich %bcond_with hpc %endif -%if "%{flavor}" == "scotch-openmpi" +%if "%{flavor}" == "scotch-openmpi1" %define mpi_family openmpi %define mumps_f77_mpilibs -lmpi_mpifh -lmpi +%define mpi_ver 1 %bcond_with hpc %bcond_without scotch %endif @@ -103,9 +110,42 @@ %bcond_without scotch %endif +%if "%{flavor}" == "gnu-openmpi-hpc" +%{?DisOMPI1} +%undefine c_f_ver +# macro mpi is used by macros for master package +%global mpi_family openmpi +%define mumps_f77_mpilibs -lmpi_mpifh -lmpi +%define mpi_ver 1 +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu-openmpi2-hpc" +%{?DisOMPI2} +%undefine c_f_ver +# macro mpi is used by macros for master package +%global mpi_family openmpi +%define mumps_f77_mpilibs -lmpi_mpifh -lmpi +%define mpi_ver 2 +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu-openmpi3-hpc" +%{?DisOMPI3} +%undefine c_f_ver +# macro mpi is used by macros for master package +%global mpi_family openmpi +%define mumps_f77_mpilibs -lmpi_mpifh -lmpi +%define mpi_ver 3 +%bcond_without hpc +%endif + %if "%{flavor}" == "gnu-mvapich2-hpc" %undefine c_f_ver +# macro mpi is used by macros for master package %global mpi_family mvapich2 +%define mumps_f77_mpilibs -lfmpich -lmpich +%undefine mpi_ver %bcond_without hpc %endif @@ -115,9 +155,9 @@ %bcond_without hpc %endif -%if "%{flavor}" == "gnu-openmpi-hpc" +%if "%{flavor}" == "gnu7-openmpi-hpc" %{?DisOMPI1} -%undefine c_f_ver +%define c_f_ver 7 # macro mpi is used by macros for master package %global mpi_family openmpi %define mumps_f77_mpilibs -lmpi_mpifh -lmpi @@ -125,9 +165,9 @@ %bcond_without hpc %endif -%if "%{flavor}" == "gnu-openmpi2-hpc" +%if "%{flavor}" == "gnu7-openmpi2-hpc" %{?DisOMPI2} -%undefine c_f_ver +%define c_f_ver 7 # macro mpi is used by macros for master package %global mpi_family openmpi %define mumps_f77_mpilibs -lmpi_mpifh -lmpi @@ -135,9 +175,9 @@ %bcond_without hpc %endif -%if "%{flavor}" == "gnu-openmpi3-hpc" +%if "%{flavor}" == "gnu7-openmpi3-hpc" %{?DisOMPI3} -%undefine c_f_ver +%define c_f_ver 7 # macro mpi is used by macros for master package %global mpi_family openmpi %define mumps_f77_mpilibs -lmpi_mpifh -lmpi @@ -145,8 +185,8 @@ %bcond_without hpc %endif -%if "%{flavor}" == "gnu-mvapich2-hpc" -%undefine c_f_ver +%if "%{flavor}" == "gnu7-mvapich2-hpc" +%define c_f_ver 7 # macro mpi is used by macros for master package %global mpi_family mvapich2 %define mumps_f77_mpilibs -lfmpich -lmpich @@ -154,6 +194,102 @@ %bcond_without hpc %endif +%if "%{flavor}" == "gnu7-mpich-hpc" +%define c_f_ver 7 +%global mpi_family mpich +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu8-openmpi-hpc" +%{?DisOMPI1} +%define c_f_ver 8 +# macro mpi is used by macros for master package +%global mpi_family openmpi +%define mumps_f77_mpilibs -lmpi_mpifh -lmpi +%define mpi_ver 1 +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu8-openmpi2-hpc" +%{?DisOMPI2} +%define c_f_ver 8 +# macro mpi is used by macros for master package +%global mpi_family openmpi +%define mumps_f77_mpilibs -lmpi_mpifh -lmpi +%define mpi_ver 2 +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu8-openmpi3-hpc" +%{?DisOMPI3} +%define c_f_ver 8 +# macro mpi is used by macros for master package +%global mpi_family openmpi +%define mumps_f77_mpilibs -lmpi_mpifh -lmpi +%define mpi_ver 3 +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu8-mvapich2-hpc" +%define c_f_ver 8 +# macro mpi is used by macros for master package +%global mpi_family mvapich2 +%define mumps_f77_mpilibs -lfmpich -lmpich +%undefine mpi_ver +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu8-mpich-hpc" +%define c_f_ver 8 +%global mpi_family mpich +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu9-openmpi-hpc" +%{?DisOMPI1} +%define c_f_ver 9 +# macro mpi is used by macros for master package +%global mpi_family openmpi +%define mumps_f77_mpilibs -lmpi_mpifh -lmpi +%define mpi_ver 1 +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu9-openmpi2-hpc" +%{?DisOMPI2} +%define c_f_ver 9 +# macro mpi is used by macros for master package +%global mpi_family openmpi +%define mumps_f77_mpilibs -lmpi_mpifh -lmpi +%define mpi_ver 2 +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu9-openmpi3-hpc" +%{?DisOMPI3} +%define c_f_ver 9 +# macro mpi is used by macros for master package +%global mpi_family openmpi +%define mumps_f77_mpilibs -lmpi_mpifh -lmpi +%define mpi_ver 3 +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu9-mvapich2-hpc" +%define c_f_ver 9 +# macro mpi is used by macros for master package +%global mpi_family mvapich2 +%define mumps_f77_mpilibs -lfmpich -lmpich +%undefine mpi_ver +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu9-mpich-hpc" +%define c_f_ver 9 +%global mpi_family mpich +%bcond_without hpc +%endif + %ifarch i586 s390 ppc armv7l ExclusiveArch: do_not_build %endif @@ -164,8 +300,8 @@ %{?mpi_family:%{bcond_without mpi}}%{!?mpi_family:%{bcond_with mpi}} -# For compatibility package names -%if "%{mpi_family}" != "openmpi" || "%{mpi_ver}" != "1" +# openmpi 1 was called just "openmpi" in Leap 15.x/SLE15 +%if 0%{?suse_version} >= 1550 || "%{mpi_family}" != "openmpi" || "%{mpi_ver}" != "1" %define mpi_ext %{?mpi_ver} %endif @@ -214,8 +350,8 @@ Name: %{package_name} Version: %{ver} Release: 0 -Url: http://mumps.enseeiht.fr/ -Source0: http://mumps.enseeiht.fr/MUMPS_%{version}.tar.gz#/%{pname}-%{version}.tar.bz2 +URL: http://mumps.enseeiht.fr/ +Source0: http://mumps.enseeiht.fr/MUMPS_%{version}.tar.gz#/%{pname}-%{version}.tar.gz Source1: Makefile.inc Patch1: Makefiles-Serialize-libseq-libplat-mommond_mod-for-parallel-builds.patch %if %{without hpc} @@ -232,8 +368,8 @@ BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: %{mpi_family}%{?mpi_ver}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel BuildRequires: fdupes -BuildRequires: libblacs2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc-devel BuildRequires: libgomp1 +BuildRequires: libopenblas-%{compiler_family}-hpc >= %{openblas_vers} BuildRequires: libscalapack2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc-devel BuildRequires: suse-hpc %endif # hpc @@ -324,6 +460,9 @@ Requires: mumps-scotch-devel = %{version} Requires: ptscotch-%{mpi_family}%{?mpi_ext}-devel %endif + %if "%{mpi_family}%{?mpi_ext}" == "openmpi1" +Provides: %{pname}%{?scotch:-%{scotch}}-openmpi-devel + %endif %else # mpi Requires: blas-devel Requires: lapack-devel @@ -332,7 +471,6 @@ Recommends: gcc-fortran %else # hpc %hpc_requires_devel -Requires: libblacs2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc-devel Requires: libscalapack2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc-devel %endif @@ -442,7 +580,7 @@ %define C_C mpicc %define F_C mpif77 %define F_L mpif77 - %define SCALAP -lscalapack -lblacs + %define SCALAP -lscalapack %{!?with_hpc:-lblacs} %define MUMPS_LIBF77 %{!?with_hpc:-L%{my_libdir}} %{?mumps_f77_mpilibs} %define INCPAR %{!?with_hpc:-I%{my_incdir}} %define LIBPAR %{SCALAP} %{MUMPS_LIBF77} @@ -530,6 +668,7 @@ %endif install -m 755 examples/*simpletest %{buildroot}%{my_bindir} install -m 755 examples/c_example %{buildroot}%{my_bindir} +install -m 755 examples/*_save_restore %{buildroot}%{my_bindir} %if %{with mpi} %if %{without hpc} @@ -585,7 +724,7 @@ %endif # Don't want binaries in docdir -rm -rf examples/*.o examples/*simpletest examples/c_example examples/multiple_arithmetics_example +rm -rf examples/*.o examples/*simpletest examples/*_save_restore examples/c_example examples/multiple_arithmetics_example %if !%{with mpi} %post -n %{libname} -p /sbin/ldconfig ++++++ Makefiles-Serialize-libseq-libplat-mommond_mod-for-parallel-builds.patch ++++++ --- /var/tmp/diff_new_pack.12fAga/_old 2020-05-07 19:27:52.829554788 +0200 +++ /var/tmp/diff_new_pack.12fAga/_new 2020-05-07 19:27:52.829554788 +0200 @@ -81,12 +81,12 @@ $(MAKE) ARITH=z mumps_lib include $(topdir)/Makefile.inc -@@ -74,6 +74,8 @@ OBJS_COMMON_OTHER = \ - mumps_thread.o \ - mumps_save_restore_C.o - +@@ -78,6 +78,8 @@ + tools_common.o \ + sol_common.o + +common: $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER) + OBJS_MOD = \ + $(ARITH)ana_aux.o \ $(ARITH)ana_aux_par.o \ - $(ARITH)ana_lr.o\ ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.12fAga/_old 2020-05-07 19:27:52.849554828 +0200 +++ /var/tmp/diff_new_pack.12fAga/_new 2020-05-07 19:27:52.849554828 +0200 @@ -1,10 +1,11 @@ <multibuild> <package>serial</package> - <package>openmpi</package> + <package>openmpi1</package> <package>openmpi2</package> + <package>openmpi3</package> <package>mvapich2</package> <package>scotch-serial</package> - <package>scotch-openmpi</package> + <package>scotch-openmpi1</package> <package>scotch-openmpi2</package> <package>gnu-openmpi-hpc</package> <package>gnu-openmpi2-hpc</package>
