Hello community, here is the log from the commit of package trilinos for openSUSE:Leap:15.2 checked in at 2020-05-07 19:26:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/trilinos (Old) and /work/SRC/openSUSE:Leap:15.2/.trilinos.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trilinos" Thu May 7 19:26:50 2020 rev:3 rq:757682 version:12.14.1 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/trilinos/trilinos.changes 2020-01-15 16:25:04.160640082 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.trilinos.new.2738/trilinos.changes 2020-05-07 19:30:49.553908435 +0200 @@ -1,0 +2,46 @@ +Tue Dec 3 10:12:12 UTC 2019 - Egbert Eich <[email protected]> + +- Add support for gcc8 builds for HPC. +- Add support for gcc8 and gcc9 builds for HPC (jsc#SLE-7766, + jsc#SLE-8604). + +------------------------------------------------------------------- +Thu Nov 28 16:20:55 UTC 2019 - Egbert Eich <[email protected]> + +- Disable openmpi1 builds for SLE/Leap > 15.1. +- Enable openmpi3 builds for Leap and SLE > 15.1 (jsc#SLE-7773). + +------------------------------------------------------------------- +Thu Oct 3 04:22:38 UTC 2019 - Michel Normand <[email protected]> + +- update _constraints for ppc64 for 22GB disk + to avoid out of disk space build error. + +------------------------------------------------------------------- +Wed Aug 28 12:41:02 UTC 2019 - Ana Guerrero Lopez <[email protected]> + +- Update to version 12.14.1. (jsc#SLE-8513) + Trilinos is composed of 60 different packages. To see the changes + you need to check the release notes of every package under packages/ +- Remove patches, upstream has fixed this problem in a different way + * Trilinos-trilinos-aarch64.patch + +------------------------------------------------------------------- +Wed Jul 17 10:12:17 UTC 2019 - Michel Normand <[email protected]> + +- Add BuildRequires libopenblas-gnu-hpc >= 0.3.6 for hpc to avoid + to build when openblas library not available (ppc64) + +------------------------------------------------------------------- +Sat Jul 6 20:44:20 UTC 2019 - Jan Engelhardt <[email protected]> + +- Update descriptions. + +------------------------------------------------------------------- +Fri Jul 5 09:47:57 UTC 2019 - Ana Guerrero Lopez <[email protected]> + +- Disable ePetra package. There is a incompatibility with OMP 4.0 and + GCC 9 that must be fixed. + More information at https://github.com/trilinos/Trilinos/issues/5390 + +------------------------------------------------------------------- Old: ---- Trilinos-trilinos-aarch64.patch trilinos-release-12-10-1.tar.gz New: ---- trilinos-release-12-14-1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trilinos.spec ++++++ --- /var/tmp/diff_new_pack.5FfRzk/_old 2020-05-07 19:30:51.429912190 +0200 +++ /var/tmp/diff_new_pack.5FfRzk/_new 2020-05-07 19:30:51.433912197 +0200 @@ -1,7 +1,7 @@ # # spec file for package trilinos # -# 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 @@ -15,29 +15,28 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %global flavor @BUILD_FLAVOR@%{nil} %bcond_with qt # Base package name %define pname trilinos -%define ver 12.10.1 -%define ver_exp 12-10-1 +%define ver 12.14.1 +%define ver_exp 12-14-1 %define so_ver 12 %define PNAME %(echo %{pname} | tr [a-z] [A-Z]) %define _ver %(echo %{ver} | tr . _) +%define openblas_vers 0.3.6 # Don't even try this package on 32bit # - some modules require pointers of bigger size ExcludeArch: i586 s390 s390x ppc armv7l -%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 !%{?is_opensuse} && 0%{?sle_version:1} && 0%{?sle_version} < 150200 %define DisOMPI3 ExclusiveArch: do_not_build %endif @@ -59,6 +58,7 @@ %endif %if "%{flavor}" == "openmpi" +%{?DisOMPI1} %undefine c_f_ver %global mpi_family openmpi %define mpi_ver 1 @@ -66,6 +66,7 @@ %endif %if "%{flavor}" == "openmpi2" +%{?DisOMPI2} %undefine c_f_ver %global mpi_family openmpi %define mpi_ver 2 @@ -73,6 +74,7 @@ %endif %if "%{flavor}" == "openmpi3" +%{?DisOMPI3} %undefine c_f_ver %global mpi_family openmpi %define mpi_ver 3 @@ -120,6 +122,129 @@ %{bcond_without hpc} %endif +%if "%{flavor}" == "gnu7-mvapich2-hpc" +%define c_f_ver 7 +%global mpi_family mvapich2 +%global compiler_family gnu +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu7-mpich-hpc" +%define c_f_ver 7 +%global mpi_family mpich +%global compiler_family gnu +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu7-openmpi-hpc" +%{?DisOMPI1} +%define c_f_ver 7 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 1 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu7-openmpi2-hpc" +%{?DisOMPI2} +%define c_f_ver 7 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 2 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu7-openmpi3-hpc" +%{?DisOMPI3} +%define c_f_ver 7 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 3 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu8-mvapich2-hpc" +%define c_f_ver 8 +%global mpi_family mvapich2 +%global compiler_family gnu +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu8-mpich-hpc" +%define c_f_ver 8 +%global mpi_family mpich +%global compiler_family gnu +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu8-openmpi-hpc" +%{?DisOMPI1} +%define c_f_ver 8 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 1 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu8-openmpi2-hpc" +%{?DisOMPI2} +%define c_f_ver 8 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 2 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu8-openmpi3-hpc" +%{?DisOMPI3} +%define c_f_ver 8 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 3 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu9-mvapich2-hpc" +%define c_f_ver 9 +%global mpi_family mvapich2 +%global compiler_family gnu +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu9-mpich-hpc" +%define c_f_ver 9 +%global mpi_family mpich +%global compiler_family gnu +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu9-openmpi-hpc" +%{?DisOMPI1} +%define c_f_ver 9 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 1 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu9-openmpi2-hpc" +%{?DisOMPI2} +%define c_f_ver 9 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 2 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu9-openmpi3-hpc" +%{?DisOMPI3} +%define c_f_ver 9 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 3 +%{bcond_without hpc} +%endif + %if "%{flavor}" == "documentation-hpc" %{bcond_without hpc} %{bcond_without doc} @@ -179,16 +304,15 @@ Version: %ver Release: 0 Summary: A collection of libraries of numerical algorithms -License: LGPL-2.0 +License: LGPL-2.0-only Group: Productivity/Scientific/Math -Url: http://trilinos.sandia.gov/index.html +URL: http://trilinos.sandia.gov/index.html Source0: https://github.com/trilinos/Trilinos/archive/trilinos-release-%{ver_exp}.tar.gz # PATCH-FIX-UPSTREAM trilinos-11.4.3-no-return-in-non-void.patch Patch0: trilinos-11.14.3-no-return-in-non-void.patch -Patch1: Trilinos-trilinos-aarch64.patch -BuildRequires: hwloc-devel BuildRequires: cmake >= 2.8 BuildRequires: fdupes +BuildRequires: hwloc-devel %if %{with qt} BuildRequires: libqt4-devel %endif @@ -205,16 +329,16 @@ BuildRequires: perl %else - %if %{with hpc} BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: %{mpi_family}%{?mpi_ext}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel # Fix this once boost is available as a HPC version BuildRequires: boost-devel #BuildRequires: boost-%%{compiler_family}-hpc-devel -BuildRequires: netcdf-%{compiler_family}-%{mpi_family}%{?mpi_ext}-hpc-devel BuildRequires: hdf5-%{compiler_family}-%{mpi_family}%{?mpi_ext}-hpc-devel +BuildRequires: libopenblas-%{compiler_family}-hpc >= %{openblas_vers} BuildRequires: libopenblas-%{compiler_family}-hpc-devel +BuildRequires: netcdf-%{compiler_family}-%{mpi_family}%{?mpi_ext}-hpc-devel #Requires: %libname = %version %hpc_requires %hpc_requires_devel @@ -231,8 +355,8 @@ BuildRequires: superlu-devel %if %{without mpi} BuildRequires: hdf5-devel -BuildRequires: scotch-devel BuildRequires: netcdf-devel +BuildRequires: scotch-devel BuildRequires: umfpack-devel %else BuildRequires: blacs-devel-headers @@ -265,9 +389,9 @@ %if %{without doc} %package -n %{libname} -Summary: Shared Libraries for %{package_name} -Group: System/Libraries +Summary: A collection of libraries of numerical algorithms # only used for HPC +Group: System/Libraries %if %{with hpc} Requires: %{compiler_family}%{?c_f_ver}-compilers-hpc Requires: %{mpi_family}%{?mpi_ver}-%{compiler_family}%{?c_f_ver}-hpc @@ -286,7 +410,7 @@ C++ using object-oriented techniques. All packages are self-contained, with the Trilinos top layer providing a common look-and-feel and infrastructure. -Shared Libraries. +This subpackage contains the shared libraries. %package devel Summary: Headers and development files for %{package_name} @@ -299,10 +423,10 @@ %if %{without mpi} Requires: hdf5-devel Requires: lapack-devel -Requires: scotch-devel Requires: libxml2-devel Requires: mumps-devel Requires: netcdf-devel +Requires: scotch-devel Requires: suitesparse-common-devel Requires: umfpack-devel %else @@ -320,8 +444,8 @@ # Fix this once boost is available as a HPC version #Requires: boost-%%{compiler_family}-hpc Requires: hdf5%{hpc_package_name_tail}-devel -Requires: netcdf%{hpc_package_name_tail}-devel Requires: libopenblas-%{compiler_family}-hpc-devel +Requires: netcdf%{hpc_package_name_tail}-devel #Requires: %libname = %version %endif # hpc @@ -332,7 +456,8 @@ C++ using object-oriented techniques. All packages are self-contained, with the Trilinos top layer providing a common look-and-feel and infrastructure. -Headers and libraries files for %{package_name} needed for development +This package contains the headers and libraries files for %{package_name} +needed for development. %if %{with hpc} @@ -345,7 +470,6 @@ %prep %setup -q -n Trilinos-trilinos-release-%{ver_exp} %patch0 -p1 -%patch1 -p1 %build # Fix this once boost is available as a HPC version @@ -390,6 +514,7 @@ -DTrilinos_VERBOSE_CONFIGURE:BOOL=ON \ -DTrilinos_ENABLE_ALL_PACKAGES:BOOL=OFF \ -DTrilinos_EXTRA_LINK_FLAGS:STRING="-lgfortran" \ + -DTrilinos_ENABLE_Epetra:BOOL=OFF \ -DTrilinos_ENABLE_Gtest:BOOL=OFF \ -DTrilinos_ENABLE_MueLu:BOOL=ON \ -DTrilinos_ENABLE_Phalanx:BOOL=ON \ @@ -470,7 +595,6 @@ %make_jobs cd .. - %install %{?with_hpc:%hpc_setup} %{?with_hpc:%hpc_setup_mpi} ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.5FfRzk/_old 2020-05-07 19:30:51.473912277 +0200 +++ /var/tmp/diff_new_pack.5FfRzk/_new 2020-05-07 19:30:51.477912285 +0200 @@ -1,7 +1,7 @@ <constraints> <hardware> <disk> - <size unit="G">19</size> + <size unit="G">24</size> </disk> <memory> <size unit="G">9</size> @@ -10,4 +10,14 @@ <size unit="G">7</size> </physicalmemory> </hardware> + <overwrite> + <conditions> + <arch>ppc64</arch> + </conditions> + <hardware> + <disk> + <size unit="G">22</size> + </disk> + </hardware> + </overwrite> </constraints> ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.5FfRzk/_old 2020-05-07 19:30:51.497912325 +0200 +++ /var/tmp/diff_new_pack.5FfRzk/_new 2020-05-07 19:30:51.501912333 +0200 @@ -4,6 +4,7 @@ <package>serial</package> <package>openmpi2</package> <package>gnu-openmpi2-hpc</package> + <package>gnu-openmpi3-hpc</package> <package>gnu-mvapich2-hpc</package> <package>gnu-mpich-hpc</package> </multibuild> ++++++ trilinos-release-12-10-1.tar.gz -> trilinos-release-12-14-1.tar.gz ++++++ /work/SRC/openSUSE:Leap:15.2/trilinos/trilinos-release-12-10-1.tar.gz /work/SRC/openSUSE:Leap:15.2/.trilinos.new.2738/trilinos-release-12-14-1.tar.gz differ: char 13, line 1
