Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package hypre for openSUSE:Factory checked
in at 2021-01-30 13:56:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hypre (Old)
and /work/SRC/openSUSE:Factory/.hypre.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hypre"
Sat Jan 30 13:56:14 2021 rev:11 rq:867883 version:2.20.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/hypre/hypre.changes 2020-10-08
13:13:50.595262557 +0200
+++ /work/SRC/openSUSE:Factory/.hypre.new.28504/hypre.changes 2021-01-30
13:56:27.634044586 +0100
@@ -1,0 +2,43 @@
+Fri Jan 29 12:24:00 UTC 2021 - Egbert Eich <e...@suse.com>
+
+- Make cmake files installation non-conflicting.
+
+-------------------------------------------------------------------
+Fri Jan 29 10:25:10 UTC 2021 - Egbert Eich <e...@suse.com>
+
+- Fix hypre package conflicts for non HPC packages.
+
+-------------------------------------------------------------------
+Thu Jan 28 16:58:42 UTC 2021 - Egbert Eich <e...@suse.com>
+
+- Change 'Requires:' to other HPC packages to %requires_eq to depend
+ on the exact version. This should take care of HPC packages ignoring
+ proper ABI versioning.
+
+-------------------------------------------------------------------
+Mon Jan 25 15:20:57 UTC 2021 - Ana Guerrero Lopez <aguerr...@suse.com>
+
+- Update to 2.20.0
+ * New matrix-based interpolation routines for AMG (CPU and GPU)
+ * Added GPU support for aggressive coarsening in AMG
+ * New AMG-DD solver
+ * Improved distributed sparse matrix-matrix and triple-matrix product
+ performance on GPUs
+ * IJMatrix/Vector assembly on GPUs (with pointers to GPU memory)
+ * Updated caliper usage
+ * Separated C and C++ headers
+ * Updated to support superlu-dist version to 6.3.1
+ * Moved reference manual API to online documentation
+ * New AMG features to keep specified F-points and/or C-points.
+ * Added GPU support for AMG setup and several interpolation approaches.
+ * New parallel ILU solvers and smoothers.
+ * New MGR features.
+ * Added several interpolation routines based on matrix-matrix interpolations.
+ * Various bug fixes.
+- Remove patch merged by upstream
+ * Fix-empty-elseif-in-CMakeLists.txt.patch
+- Rework patch following upstream changes
+ * Fix-library-version-numbering.patch Patch removed
+ * Add-library-version.patch Patch added
+
+-------------------------------------------------------------------
Old:
----
Fix-empty-elseif-in-CMakeLists.txt.patch
Fix-library-version-numbering.patch
hypre-2.18.2.tar.gz
New:
----
Add-library-version.patch
hypre-2.20.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hypre.spec ++++++
--- /var/tmp/diff_new_pack.6qILPF/_old 2021-01-30 13:56:28.138046960 +0100
+++ /var/tmp/diff_new_pack.6qILPF/_new 2021-01-30 13:56:28.142046979 +0100
@@ -1,7 +1,7 @@
#
# spec file for package hypre
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,8 +17,8 @@
%global flavor @BUILD_FLAVOR@%{?nil}
-%define ver 2.18.2
-%define _ver 2_18_2
+%define ver 2.20.0
+%define _ver 2_20_0
%define somver %{_ver}
%define sover %{ver}
@@ -356,28 +356,31 @@
%if %{without hpc}
%if %{without mpi}
- %define my_prefix %_prefix
- %define my_bindir %_bindir
- %define my_libdir %_libdir
- %define my_incdir %_includedir
+ %global my_bindir %_bindir
+ %global _incdir %{_prefix}/include/
%else
- %global my_suffix -%{?mpi_family}%{?mpi_ext}
- %global my_prefix %{_libdir}/mpi/gcc/%{mpi_family}%{?mpi_ext}
- %global my_bindir %{my_prefix}/bin
- %global my_libdir %{my_prefix}/%{_lib}/
- %global my_incdir %{my_prefix}/include/
- %global my_datadir %{my_prefix}/share/
+ %global _bindir %_bindir
+ %global _defaultlicensedir %_defaultlicensedir
+ %global _prefix %{_libdir}/mpi/gcc/%{mpi_family}%{?mpi_ext}
+ %global _suffix -%{?mpi_family}%{?mpi_ext}
+ %global my_bindir %{_prefix}/bin
+ %global _libdir %{_prefix}/%{_lib}/
+ %global _incdir %{_prefix}/include/
%endif
%if 0%{!?package_name:1}
- %define package_name %pname%{?my_suffix}
+ %define package_name %pname%{?_suffix}
%endif
- %define libname lib%{PNAME}%{somver}%{?my_suffix}
+ %define libname lib%{PNAME}%{somver}%{?_suffix}
%else # with hpc
%{hpc_init %{?compiler_family:-c %compiler_family %{?c_f_ver:-v %{c_f_ver}}}
%{?with_mpi:-m {%mpi_family}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}}
- %define my_prefix %hpc_prefix
+# Nail these down before changing _prefix
+ %global hpc_base %hpc_base
+ %global _bindir %_bindir
+ %global _defaultlicensedir %_defaultlicensedir
+ %define _prefix %hpc_prefix
%define my_bindir %hpc_bindir
- %define my_libdir %hpc_libdir
- %define my_incdir %hpc_includedir
+ %define _libdir %hpc_libdir
+ %define _incdir %hpc_includedir
%define package_name %{hpc_package_name %_ver}
%define libname lib%{PNAME}%{hpc_package_name_tail %{?_ver}}
%endif
@@ -391,8 +394,7 @@
URL: https://www.llnl.gov/casc/hypre/
Source:
https://github.com/hypre-space/hypre/archive/v%{version}.tar.gz#/hypre-%{version}.tar.gz
Patch0: hypre_Makefile_examples.patch
-Patch1: Fix-library-version-numbering.patch
-Patch2: Fix-empty-elseif-in-CMakeLists.txt.patch
+Patch1: Add-library-version.patch
# TODO : add babel
#BuildRequires: babel-devel
@@ -431,8 +433,8 @@
Group: System/Libraries
%if %{with hpc}
%hpc_requires
-Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc
-Requires: libsuperlu%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc
+%{requires_eq libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc}
+%{requires_eq libsuperlu%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc}
Requires: lua-lmod >= 7.6.1
%endif
@@ -453,8 +455,8 @@
Requires: lapack-devel
Requires: superlu-devel
%else
-Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel
-Requires: superlu%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel
+%{requires_eq libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel}
+%{requires_eq superlu%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel}
%hpc_requires_devel
%endif
@@ -491,13 +493,13 @@
%prep
%setup -q -n %{pname}-%{version}
%patch0 -p0
-%patch1 -p2
-%patch2 -p2
+%patch1 -p0
+
%if %{without hpc}
cat > %{_sourcedir}/baselibs.conf <<EOF
%{libname}
%{libname}-devel
- requires %{?my_suffix}-<targettype>
+ requires %{?_suffix}-<targettype>
requires "%{libname}-<targettype> = <version>"
EOF
%endif
@@ -544,15 +546,6 @@
cd src/
%cmake_install
-# move libaries arround for mpi builds
- %if %{without hpc}
- %if %{with mpi}
-mkdir -pv %{buildroot}%{my_libdir}
-mv -v %{buildroot}/usr/%{_lib}/*.so* %{buildroot}%{my_libdir}
-mv -v %{buildroot}/usr/include %{buildroot}%{my_incdir}
- %endif
- %endif
-
%if %{with hpc}
%{hpc_write_pkgconfig -n %{pname} -l %{PNAME}}
@@ -603,7 +596,7 @@
EOF
%endif
-%fdupes -s %{buildroot}%{my_prefix}
+%fdupes -s %{buildroot}%{_prefix}
%endif # build_all
%if %{without hpc} && %{without mpi}
@@ -611,10 +604,10 @@
%postun -n %{libname} -p /sbin/ldconfig
%else
%post -n %{libname}
-/sbin/ldconfig -N %{my_libdir}
+/sbin/ldconfig -N %{_libdir}
%postun -n %{libname}
-/sbin/ldconfig -N %{my_libdir}
+/sbin/ldconfig -N %{_libdir}
%{?with_hpc:%hpc_module_delete_if_default}
%endif
@@ -622,17 +615,18 @@
%files -n %{libname}
%{?hpc_dirs}
%{?hpc_modules_files}
-%{my_libdir}/*.so.*
+%{_libdir}/*.so.*
%files devel
%if %{with hpc}
%{?hpc_dirs}
%{hpc_pkgconfig_file}
%endif
+%{_libdir}/cmake
%license COPYRIGHT LICENSE-APACHE LICENSE-MIT NOTICE
%doc CHANGELOG README.md INSTALL.md
-%{my_incdir}%{?!with_hpc:/%{pname}}
-%{my_libdir}/*.so
+%{_incdir}%{?!with_hpc:/%{pname}}
+%{_libdir}/*.so
%endif # build_all
%if %{with install_doc}
++++++ Add-library-version.patch ++++++
From: Ana Guerrero Lopez <aguerr...@suse.com>
Date: Add library version number
Patch-mainline:
Subject: Mon Jan 25 15:20:57 UTC 2021
Based in a previous patch by Egbert Eich <e...@suse.com>
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -246,6 +246,9 @@
set (BUILD_SHARED_LIBS OFF CACHE INTERNAL "" FORCE)
endif ()
+# Here HYPRE_MINOR == HYPRE_MAJOR == HYPRE_VERSION
+set_target_properties(HYPRE PROPERTIES VERSION ${HYPRE_VERSION} SOVERSION
${HYPRE_VERSION})
+
# Set MPI compile flags
if (NOT HYPRE_SEQUENTIAL)
find_program (MPIEXEC_EXECUTABLE NAMES mpiexec mpirun)
@@ -302,7 +305,7 @@
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-install (FILES ${HYPRE_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+install (FILES ${HYPRE_HEADERS} DESTINATION
"${CMAKE_INSTALL_INCLUDEDIR}/hypre")
include (CMakePackageConfigHelpers)
write_basic_package_version_file (
++++++ hypre-2.18.2.tar.gz -> hypre-2.20.0.tar.gz ++++++
++++ 190390 lines of diff (skipped)
