Hello community, here is the log from the commit of package hypre for openSUSE:Factory checked in at 2019-12-02 11:29:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hypre (Old) and /work/SRC/openSUSE:Factory/.hypre.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hypre" Mon Dec 2 11:29:48 2019 rev:5 rq:752515 version:2.18.2 Changes: -------- --- /work/SRC/openSUSE:Factory/hypre/hypre.changes 2019-10-02 11:58:04.351158275 +0200 +++ /work/SRC/openSUSE:Factory/.hypre.new.4691/hypre.changes 2019-12-02 11:32:56.998515456 +0100 @@ -1,0 +2,29 @@ +Fri Nov 29 20:50:04 UTC 2019 - Egbert Eich <eich@suse.com> + +- Add support for gcc7. +- Add support for gcc8 and gcc9 (jsc#SLE-7766 & jsc#SLE-8609). + +------------------------------------------------------------------- +Thu Nov 28 16:25:34 UTC 2019 - Egbert Eich <eich@suse.com> + +- Update to 2.18.2: + * Fixed mixedint bugs. + * Ported BoomerAMG setup to run on GPUs. Only a subset of setup phase + features are currently available. + * Updated CMake to support more of the features available in configure/make. + * Added RecomputeResidual options to several hybrid solvers. + * Various bug fixes. +- Disable openmpi1 builds for SLE/Leap > 15.1. +- Adapt build for openmpi1 to reflect naming change on Factory. +- Enable openmpi3 builds for Leap and SLE > 15.1 (jsc#SLE-7773). +- hypre_CMakeLists.patch refreshed and replaced by: + Fix-library-version-numbering.patch +- Fix-empty-elseif-in-CMakeLists.txt.patch: + Fix empty elseif() in CMake file. +- Use full package version to identify .so version: + INSTALL.md states that "The hypre team currently does nothing to ensure + application binary interface (ABI) compatibility. As a result, all release + (major, minor, or patch) should be treated as incompatible." +- Replaced -DHYPRE_SEQUENTIAL by -DHYPRE_WITH_MPI + +------------------------------------------------------------------- Old: ---- hypre-2.17.0.tar.gz hypre_CMakeLists.patch New: ---- Fix-empty-elseif-in-CMakeLists.txt.patch Fix-library-version-numbering.patch hypre-2.18.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hypre.spec ++++++ --- /var/tmp/diff_new_pack.bIXgYo/_old 2019-12-02 11:33:01.142513538 +0100 +++ /var/tmp/diff_new_pack.bIXgYo/_new 2019-12-02 11:33:01.170513525 +0100 @@ -1,7 +1,7 @@ # # spec file for package hypre # -# 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 @@ -17,22 +17,19 @@ %global flavor @BUILD_FLAVOR@%{?nil} -%define ver 2.17.0 -%define _ver 2_17_0 -%define somver 0 -%define sover %{somver}.2.6 +%define ver 2.18.2 +%define _ver 2_18_2 +%define somver %{_ver} +%define sover %{ver} # Base package name %define pname hypre %define PNAME %(echo %{pname} | tr [a-z] [A-Z]) -%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 @@ -120,6 +117,129 @@ %{?DisOMPI3} %endif +%if "%{flavor}" == "gnu7-mvapich2-hpc" +%define c_f_ver 7 +%define mpi_family mvapich2 +%define compiler_family gnu +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu7-mpich-hpc" +%define c_f_ver 7 +%define mpi_family mpich +%define compiler_family gnu +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu7-openmpi-hpc" +%define c_f_ver 7 +%define compiler_family gnu +%define mpi_family openmpi +%define mpi_vers 1 +%bcond_without hpc +%{?DisOMPI1} +%endif + +%if "%{flavor}" == "gnu7-openmpi2-hpc" +%define c_f_ver 7 +%define compiler_family gnu +%define mpi_family openmpi +%define mpi_vers 2 +%bcond_without hpc +%{?DisOMPI2} +%endif + +%if "%{flavor}" == "gnu7-openmpi3-hpc" +%define c_f_ver 7 +%define compiler_family gnu +%define mpi_family openmpi +%define mpi_vers 3 +%bcond_without hpc +%{?DisOMPI3} +%endif + +%if "%{flavor}" == "gnu8-mvapich2-hpc" +%define c_f_ver 8 +%define mpi_family mvapich2 +%define compiler_family gnu +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu8-mpich-hpc" +%define c_f_ver 8 +%define mpi_family mpich +%define compiler_family gnu +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu8-openmpi-hpc" +%define c_f_ver 8 +%define compiler_family gnu +%define mpi_family openmpi +%define mpi_vers 1 +%bcond_without hpc +%{?DisOMPI1} +%endif + +%if "%{flavor}" == "gnu8-openmpi2-hpc" +%define c_f_ver 8 +%define compiler_family gnu +%define mpi_family openmpi +%define mpi_vers 2 +%bcond_without hpc +%{?DisOMPI2} +%endif + +%if "%{flavor}" == "gnu8-openmpi3-hpc" +%define c_f_ver 8 +%define compiler_family gnu +%define mpi_family openmpi +%define mpi_vers 3 +%bcond_without hpc +%{?DisOMPI3} +%endif + +%if "%{flavor}" == "gnu9-mvapich2-hpc" +%define c_f_ver 9 +%define mpi_family mvapich2 +%define compiler_family gnu +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu9-mpich-hpc" +%define c_f_ver 9 +%define mpi_family mpich +%define compiler_family gnu +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu9-openmpi-hpc" +%define c_f_ver 9 +%define compiler_family gnu +%define mpi_family openmpi +%define mpi_vers 1 +%bcond_without hpc +%{?DisOMPI1} +%endif + +%if "%{flavor}" == "gnu9-openmpi2-hpc" +%define c_f_ver 9 +%define compiler_family gnu +%define mpi_family openmpi +%define mpi_vers 2 +%bcond_without hpc +%{?DisOMPI2} +%endif + +%if "%{flavor}" == "gnu9-openmpi3-hpc" +%define c_f_ver 9 +%define compiler_family gnu +%define mpi_family openmpi +%define mpi_vers 3 +%bcond_without hpc +%{?DisOMPI3} +%endif + # Don't build non-HPC on SLE %if !0%{?is_opensuse} && !0%{?with_hpc:1} ExclusiveArch: do_not_build @@ -128,7 +248,7 @@ %{?mpi_family:%{bcond_without mpi}}%{!?mpi_family:%{bcond_with mpi}} # For compatibility package names -%if "%{mpi_family}" != "openmpi" || "%{mpi_vers}" != "1" +%if "%{mpi_family}" != "openmpi" || "%{mpi_vers}" != "1" || 0%{?suse_version} > 1500 %define mpi_ext %{?mpi_vers} %endif @@ -166,10 +286,11 @@ Summary: Scalable algorithms for solving linear systems of equations License: Apache-2.0 OR MIT Group: Productivity/Scientific/Math -Url: https://www.llnl.gov/casc/hypre/ +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: hypre_CMakeLists.patch +Patch1: Fix-library-version-numbering.patch +Patch2: Fix-empty-elseif-in-CMakeLists.txt.patch # TODO : add babel #BuildRequires: babel-devel @@ -267,7 +388,8 @@ %prep %setup -q -n %{pname}-%{version} %patch0 -p0 -%patch1 -p1 +%patch1 -p2 +%patch2 -p2 %if %{without hpc} cat > %{_sourcedir}/baselibs.conf <<EOF %{libname} @@ -298,9 +420,9 @@ %endif -DHYPRE_SHARED=ON \ %if %{without mpi} - -DHYPRE_SEQUENTIAL=ON \ + -DHYPRE_WITH_MPI=OFF \ %else - -DHYPRE_SEQUENTIAL=OFF \ + -DHYPRE_WITH_MPI=ON \ %endif -DHYPRE_USING_HYPRE_BLAS=OFF \ -DHYPRE_USING_HYPRE_LAPACK=OFF \ ++++++ Fix-empty-elseif-in-CMakeLists.txt.patch ++++++ From: Egbert Eich <eich@suse.com> Date: Fri Nov 29 12:40:44 2019 +0100 Subject: Fix empty elseif() in CMakeLists.txt Patch-mainline: Not yet Git-commit: 230a4016068573af2cf33d9b5f0aec5129bdc79d References: Signed-off-by: Egbert Eich <eich@suse.com> --- hypre-2.18.1/src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hypre-2.18.1/src/CMakeLists.txt b/hypre-2.18.1/src/CMakeLists.txt index fda1ff4..b8b2761 100644 --- a/hypre-2.18.1/src/CMakeLists.txt +++ b/hypre-2.18.1/src/CMakeLists.txt @@ -101,13 +101,13 @@ endif() if (HYPRE_ENABLE_GLOBAL_PARTITION) set(HYPRE_NO_GLOBAL_PARTITION OFF CACHE BOOL "" FORCE) -elseif() +else() set(HYPRE_NO_GLOBAL_PARTITION ON CACHE BOOL "" FORCE) endif() if (HYPRE_WITH_MPI) set(HYPRE_SEQUENTIAL OFF CACHE BOOL "" FORCE) -elseif() +else() set(HYPRE_SEQUENTIAL ON CACHE BOOL "" FORCE) endif() ++++++ Fix-library-version-numbering.patch ++++++ From: Egbert Eich <eich@suse.com> Date: Fri Nov 29 13:14:06 2019 +0100 Subject: Fix library version numbering Patch-mainline: Not yet Git-commit: 1e62280e0eaa52761e04425d44da81865556baa7 References: Signed-off-by: Egbert Eich <eich@suse.com> --- hypre-2.18.2/src/CMakeLists.txt | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/hypre-2.18.2/src/CMakeLists.txt b/hypre-2.18.2/src/CMakeLists.txt index 8c09795..2b425f5 100644 --- a/hypre-2.18.2/src/CMakeLists.txt +++ b/hypre-2.18.2/src/CMakeLists.txt @@ -238,16 +238,6 @@ else () set (BUILD_SHARED_LIBS OFF CACHE INTERNAL "" FORCE) endif () -# Set MPI compile flags -if (NOT HYPRE_SEQUENTIAL) - find_package (MPI) - if ((MPI_C_FOUND) AND (NOT CMAKE_C_COMPILER STREQUAL MPI_C_COMPILER)) - include_directories (${MPI_C_INCLUDE_PATH}) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MPI_C_COMPILE_FLAGS}") - list(APPEND TPL_LIBRARIES ${MPI_C_LIBRARIES}) - endif () -endif (NOT HYPRE_SEQUENTIAL) - # Set OpenMP compile flags if (HYPRE_USING_OPENMP) find_package (OpenMP) @@ -300,6 +290,21 @@ add_library (HYPRE ${HYPRE_SOURCES} ${HYPRE_HEADERS} ${FEI_LIBS}) target_link_libraries(HYPRE PUBLIC ${TPL_LIBRARIES}) -install (TARGETS HYPRE DESTINATION lib) -install (FILES ${HYPRE_HEADERS} DESTINATION include) +# 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_package (MPI) + include_directories (${MPI_C_INCLUDE_PATH}) + if (MPI_COMPILE_FLAGS) + set_target_properties(HYPRE PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}") + endif() + if (MPI_LINK_FLAGS) + set_target_properties(HYPRE PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}") + endif() + list(APPEND TPL_LIBRARIES ${MPI_C_LIBRARIES}) +endif (NOT HYPRE_SEQUENTIAL) +install (TARGETS HYPRE DESTINATION lib${LIB_SUFFIX}) +install (FILES ${HYPRE_HEADERS} DESTINATION include/hypre) ++++++ hypre-2.17.0.tar.gz -> hypre-2.18.2.tar.gz ++++++ ++++ 98296 lines of diff (skipped)