From bd0f110163f8b5463af3eb607fab1d990a642b13740bb375b2af11d87d505e59 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Mon, 31 Aug 2020 11:45:37 +0000 Subject: [PATCH 1/2] Accepting request 827732 from home:michel_mno:branches:science - Call %limit_build macro in spec to avoid oom build failure for ppc64le and aarch64 - Add _constraints with default 5GB min physicalmemory and 7GB for ppc64/ppc64le OBS-URL: https://build.opensuse.org/request/show/827732 OBS-URL: https://build.opensuse.org/package/show/science/suitesparse?expand=0&rev=27 --- _constraints | 18 ++++++++++++++++++ suitesparse.changes | 8 ++++++++ suitesparse.spec | 8 ++++++++ 3 files changed, 34 insertions(+) create mode 100644 _constraints diff --git a/_constraints b/_constraints new file mode 100644 index 0000000..c9d6a5c --- /dev/null +++ b/_constraints @@ -0,0 +1,18 @@ + + + + 5 + + + + + ppc64 + ppc64le + + + + 7 + + + + diff --git a/suitesparse.changes b/suitesparse.changes index 781e6b5..d1d05dc 100644 --- a/suitesparse.changes +++ b/suitesparse.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Aug 18 15:52:29 UTC 2020 - Michel Normand + +- Call %limit_build macro in spec to avoid oom build failure + for ppc64le and aarch64 +- Add _constraints with default 5GB min physicalmemory + and 7GB for ppc64/ppc64le + ------------------------------------------------------------------- Thu Mar 19 22:49:23 UTC 2020 - Christoph G diff --git a/suitesparse.spec b/suitesparse.spec index 09377c0..609fcfc 100644 --- a/suitesparse.spec +++ b/suitesparse.spec @@ -46,6 +46,7 @@ BuildRequires: cmake BuildRequires: gcc-fortran BuildRequires: lapack-devel BuildRequires: m4 +BuildRequires: memory-constraints BuildRequires: metis-devel BuildRequires: tbb-devel %if %{with openblas} @@ -579,6 +580,13 @@ rm SPQR/Doc/spqr.pdf %patch775418 -p1 %build +%ifarch ppc64le aarch64 +%define limitbuild 1500 +%limit_build -m %{limitbuild} +%define JOBS %{jobs} +%define _lto_cflags -flto=%{jobs} +%endif + %global _lto_cflags %{_lto_cflags} -ffat-lto-objects %if 0%{?suse_version} < 1500 export CC=gcc-7 From 49d134c4d6924b63ec35244059a85266deed538487ee0540b56571f6c6f881ad Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 1 Sep 2020 08:02:40 +0000 Subject: [PATCH 2/2] Accepting request 830981 from home:pmonrealgonzalez:branches:science - Update to SuiteSparse 5.8.1 * SLIP_LU v1.0.2: resolved issue #51: build error with clang 10 * GraphBLAS v3.3.3: bug fix (GraphBLAS issue #13) * SLIP_LU v1.0.1 added: for solving Ax=b exactly. Requires the GNU GMP and MPRF libraries. * GraphBLAS v3.3.1: see the GraphBLAS/Doc/Changlog * replaced UFget with ssget: affects nearly all packages: UMFPACK, KLU, CHOLMOD, CXSparse/CSparse, etc, but their version numbers are left unchanged since it affects the MATLAB tests only, not the compiled libraries. * ssget v2.2.0: better URL redirects * updates to SuiteSparse build system OBS-URL: https://build.opensuse.org/request/show/830981 OBS-URL: https://build.opensuse.org/package/show/science/suitesparse?expand=0&rev=28 --- SuiteSparse-5.7.1.tar.gz | 3 --- SuiteSparse-5.8.1.tar.gz | 3 +++ suitesparse.changes | 16 ++++++++++++++ suitesparse.spec | 47 ++++++++++++++++++++++++++++++++++++---- 4 files changed, 62 insertions(+), 7 deletions(-) delete mode 100644 SuiteSparse-5.7.1.tar.gz create mode 100644 SuiteSparse-5.8.1.tar.gz diff --git a/SuiteSparse-5.7.1.tar.gz b/SuiteSparse-5.7.1.tar.gz deleted file mode 100644 index dfbcc43..0000000 --- a/SuiteSparse-5.7.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ba5add1663d51a1b6fb128b50fe869b497f3096765ff7f8212f0ede044b9557 -size 56927356 diff --git a/SuiteSparse-5.8.1.tar.gz b/SuiteSparse-5.8.1.tar.gz new file mode 100644 index 0000000..a313115 --- /dev/null +++ b/SuiteSparse-5.8.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06726e471fbaa55f792578f9b4ab282ea9d008cf39ddcc3b42b73400acddef40 +size 58819633 diff --git a/suitesparse.changes b/suitesparse.changes index d1d05dc..ce813e0 100644 --- a/suitesparse.changes +++ b/suitesparse.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Sep 1 07:36:34 UTC 2020 - Pedro Monreal + +- Update to SuiteSparse 5.8.1 + * SLIP_LU v1.0.2: resolved issue #51: build error with clang 10 + * GraphBLAS v3.3.3: bug fix (GraphBLAS issue #13) + * SLIP_LU v1.0.1 added: for solving Ax=b exactly. Requires + the GNU GMP and MPRF libraries. + * GraphBLAS v3.3.1: see the GraphBLAS/Doc/Changlog + * replaced UFget with ssget: affects nearly all packages: + UMFPACK, KLU, CHOLMOD, CXSparse/CSparse, etc, + but their version numbers are left unchanged since it affects + the MATLAB tests only, not the compiled libraries. + * ssget v2.2.0: better URL redirects + * updates to SuiteSparse build system + ------------------------------------------------------------------- Tue Aug 18 15:52:29 UTC 2020 - Michel Normand diff --git a/suitesparse.spec b/suitesparse.spec index 609fcfc..835f521 100644 --- a/suitesparse.spec +++ b/suitesparse.spec @@ -26,9 +26,9 @@ Name: suitesparse Summary: A collection of sparse matrix libraries License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Version: 5.7.1 +Version: 5.8.1 Release: 0 -URL: http://faculty.cse.tamu.edu/davis/suitesparse.html +URL: https://people.engr.tamu.edu/davis/suitesparse.html Source0: https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v%{version}.tar.gz#/SuiteSparse-%{version}.tar.gz Source2: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE build_csparse_shared.patch -- Build CSparse as a shared library @@ -44,10 +44,12 @@ BuildRequires: gcc-c++ >= 4.9 BuildRequires: chrpath BuildRequires: cmake BuildRequires: gcc-fortran +BuildRequires: gmp-devel BuildRequires: lapack-devel BuildRequires: m4 BuildRequires: memory-constraints BuildRequires: metis-devel +BuildRequires: mpfr-devel BuildRequires: tbb-devel %if %{with openblas} BuildRequires: openblas-devel @@ -60,16 +62,17 @@ BuildRequires: openblas-devel %define colamdver 2.9.6 %define csparsever 3.2.0 %define cxsparsever 3.2.0 -%define graphblasver 3.2.0 +%define graphblasver 3.3.3 %define kluver 1.3.9 %define ldlver 2.2.6 %define mongoosever 2.0.3 %define rbiover 2.2.6 +%define slipluver 1.0.2 %define spqrver 2.0.9 %define umfpackver 5.7.8 # Your need define even it's just the same as main package # or the %%build loop will override %%version with umfpack's version. -%define configver 5.7.1 +%define configver 5.8.1 %define csparsemajor %(echo "%{csparsever}" | cut -d "." -f1) %define amdlib %(echo "libamd%{amdver}" | cut -d "." -f1) %define btflib %(echo "libbtf%{btfver}" | cut -d "." -f1) @@ -84,6 +87,7 @@ BuildRequires: openblas-devel %define ldllib %(echo "libldl%{ldlver}" | cut -d "." -f1) %define mongooselib %(echo "libmongoose%{mongoosever}" | cut -d "." -f1) %define rbiolib %(echo "librbio%{rbiover}" | cut -d "." -f1) +%define sliplulib %(echo "libsliplu%{slipluver}" | cut -d "." -f1) %define spqrlib %(echo "libspqr%{spqrver}" | cut -d "." -f1) %define umfpacklib %(echo "libumfpack%{umfpackver}" | cut -d "." -f1) %define configlib %(echo "libsuitesparseconfig%{configver}" | cut -d "." -f1) @@ -116,6 +120,7 @@ Requires: %{klulib} = %{kluver} Requires: %{ldllib} = %{ldlver} Requires: %{mongooselib} = %{mongoosever} Requires: %{rbiolib} = %{rbiover} +Requires: %{sliplulib} = %{slipluver} Requires: %{spqrlib} = %{spqrver} Requires: %{umfpacklib} = %{umfpackver} Requires: metis-devel @@ -160,6 +165,8 @@ Provides: libmongoose-devel = %{mongoosever} Obsoletes: libmongoose-devel < %{mongoosever} Provides: librbio-devel = %{rbiover} Obsoletes: librbio-devel < %{rbiover} +Provides: libsliplu-devel = %{slipluver} +Obsoletes: libsliplu-devel < %{slipluver} Provides: libspqr-devel = %{spqrver} Obsoletes: libspqr-devel < %{spqrver} Provides: libumfpack-devel = %{umfpackver} @@ -484,6 +491,27 @@ Version 2.0+ is written in C. RBio is part of the SuiteSparse sparse matrix suite. +%package -n %{sliplulib} +Version: %{slipluver} +Release: 0 +Summary: SLIP LU, A Sparse Left-Looking Integer Preserving LU Factorization +License: GPL-2.0-or-later +Group: System/Libraries +Provides: %(echo "libsliplu-%{slipluver}" | tr . _) = %{version} +Obsoletes: %(echo "libsliplu-%{slipluver}" | tr . _) < %{version} + +%description -n %{sliplulib} +SLIP LU is software package used to solve a sparse systems of linear equations +exactly using the Sparse Left-looking Integer-Preserving LU factorization. + +SLIP LU solves a sparse system of linear equations using a given input +matrix and right hand side vector file. This code can output the final +solution to a user specified output file in either double precision or +full precision rational numbers. If you intend to use SLIP LU within +another program, refer to examples for help with this. + +SLIP LU is part of the SuiteSparse sparse matrix suite. + %package -n %{spqrlib} Version: %{spqrver} Release: 0 @@ -697,6 +725,9 @@ popd %post -n %{rbiolib} -p /sbin/ldconfig %postun -n %{rbiolib} -p /sbin/ldconfig +%post -n %{sliplulib} -p /sbin/ldconfig +%postun -n %{sliplulib} -p /sbin/ldconfig + %post -n %{spqrlib} -p /sbin/ldconfig %postun -n %{spqrlib} -p /sbin/ldconfig @@ -779,6 +810,7 @@ popd %doc GraphBLAS/Doc/GraphBLAS_UserGuide.pdf %license GraphBLAS/Doc/ChangeLog GraphBLAS/Doc/License.txt %{_libdir}/libgraphblas.so.* +%{_libdir}/libgraphblasdemo.so.* %files -n %{klulib} %doc KLU/README.txt @@ -812,6 +844,13 @@ popd %license RBio/Doc/License.txt RBio/Doc/gpl.txt %{_libdir}/librbio.so.* +%files -n %{sliplulib} +%doc SLIP_LU/README.md +%doc SLIP_LU/Doc/SLIP_LU_UserGuide.pdf +%license SLIP_LU/License/license.txt SLIP_LU/License/GPLv2.txt +%license SLIP_LU/License/lesserv3.txt SLIP_LU/License/CONTRIBUTOR-LICENSE.txt +%{_libdir}/libsliplu.so.* + %files -n %{spqrlib} %doc SPQR/README.txt %doc SPQR/Doc/spqr_user_guide.pdf SPQR/Doc/ChangeLog SPQR/Doc/README_2.txt