Dominique Leuenberger 2017-06-21 11:49:34 +00:00 committed by Git OBS Bridge
parent b2345f352b
commit b2dae4d55a
6 changed files with 108 additions and 82 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7f22509d87ada8506580d537efde79cf90e28e228355c18b8bf603aad1a2d7b6
size 25627898

3
SuiteSparse-4.5.5.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b9a98de0ddafe7659adffad8a58ca3911c1afa8b509355e7aa58b02feb35d9b6
size 30309650

View File

@ -1,20 +0,0 @@
--- SuiteSparse.4.4.3/SuiteSparse_config/SuiteSparse_config.mk 2015-01-20 00:46:25.000000000 +0100
+++ SuiteSparse.4.4.1/SuiteSparse_config/SuiteSparse_config.mk 2014-10-23 22:57:40.000000000 +0200
@@ -119,7 +119,7 @@
# naming the BLAS and LAPACK library (*.a or *.so) files.
# This is probably slow ... it might connect to the Standard Reference BLAS:
-# BLAS = -lblas -lgfortran
+ BLAS = -lblas -lgfortran
LAPACK = -llapack
# MKL
@@ -131,7 +131,7 @@
# LAPACK =
# OpenBLAS
- BLAS = -lopenblas
+# BLAS = -lopenblas
# LAPACK =
# NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto"

View File

@ -1,12 +0,0 @@
diff -urN SuiteSparse.orig/SuiteSparse_config/Makefile SuiteSparse/SuiteSparse_config/Makefile
--- SuiteSparse.orig/SuiteSparse_config/Makefile 2012-08-15 10:44:18.241183146 +0800
+++ SuiteSparse/SuiteSparse_config/Makefile 2012-08-16 01:00:40.966163200 +0800
@@ -18,7 +18,7 @@
$(CC) $(CF) -c SuiteSparse_config.c
$(ARCHIVE) libsuitesparseconfig.a SuiteSparse_config.o
$(RANLIB) libsuitesparseconfig.a
- - $(RM) SuiteSparse_config.o
+# - $(RM) SuiteSparse_config.o
distclean: purge

View File

@ -1,3 +1,49 @@
-------------------------------------------------------------------
Sun Jun 11 01:49:03 UTC 2017 - toddrme2178@gmail.com
- Update to version 4.5.5
* minor fix to SuiteSparse/Makefile for 'make install'
- Update to version 4.5.4
* minor update to SPQR for ACM TOMS submission
- Update to version 4.5.3
* minor changes to Makefiles
- Update to version 4.5.2
* licensing simplified (no other change); refer to PACKAGE/Doc/License.txt
for the license for each package.
- Update to version 4.5.1
* update to Makefiles. Version 4.5.0 is broken on the Mac.
That version also compiles *.so libraries on Linux with
underlinked dependencies to other libraries in SuiteSparse.
For example, AMD requires SuiteSparse_config. The links to
required libraries are now explicitly included in each library,
in SuiteSparse 4.5.1.
* minor change to CHOLMOD/Check/cholmod_write.c, when compiling with
options that disable specific modules
- Update to version 4.5.0
* better Makefiles for creating and installing shared libraries
* CHOLMOD now uses METIS 5.1.0, which is distributed with SuiteSparse
* fix for MATLAB R2015b, which changed how it creates empty matrices,
as compared to prior versions of MATLAB. This change in MATLAB
breaks many of the mexFunctions in prior versions of SuiteSparse.
If you use MATLAB R2015b, you must upgrade to SuiteSparse 4.5.0
or later.
- Update to version 4.4.7
* note that this minor update fails on the Mac, so its
listed on my web page as a 'beta' release.
* Improved the Makefiles of all packages. They now create *.so
shared libraries (*.dylib on the Mac). Also, there is now
only a single SuiteSparse_config.mk file. It now determines
your system automatically, and whether or not you have METIS
and CUDA. It also automatically detects if you have the Intel
compiler or not, and uses it if it finds it. There should be
no need to edit this file for most cases, but you may need to
for your particular system. With this release, there are almost
no changes to the source code, except for the VERSION numbers
defined in the various include *.h files for each package.
- Use faster openblas.
* Remove blas-instead-of-openblas-SuiteSparse_config_mk.patch
- Remove upstream-included no-removal-of-suitesparse_config-output.patch
-------------------------------------------------------------------
Sat Dec 5 13:40:52 UTC 2015 - foss@grueninger.de

View File

@ -1,7 +1,7 @@
#
# spec file for package suitesparse
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,49 +20,49 @@ Name: suitesparse
Summary: A collection of sparse matrix libraries
License: GPL-2.0+ and LGPL-2.1+
Group: Development/Libraries
Version: 4.4.6
Version: 4.5.5
Release: 0
Url: http://faculty.cse.tamu.edu/davis/SuiteSparse/
Source: SuiteSparse-%{version}.tar.gz
Source: http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-%{version}.tar.gz
Source2: %{name}-rpmlintrc
Patch0: no-removal-of-suitesparse_config-output.patch
Patch1: blas-instead-of-openblas-SuiteSparse_config_mk.patch
Patch775418: bnc775418-enable-SuiteSparse_time-symbol.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: blas-devel
BuildRequires: gcc-c++
BuildRequires: gcc-fortran
BuildRequires: lapack-devel
%define amdver 2.4.1
%define amdso 2_4_1
%define btfver 1.2.1
%define btfso 1_2_1
%define camdver 2.4.1
%define camdso 2_4_1
%define ccolamdver 2.9.1
%define ccolamdso 2_9_1
%define colamdver 2.9.1
%define colamdso 2_9_1
%define cholmodver 3.0.6
%define cholmodso 3_0_6
%define csparsever 3.1.4
%define csparseso 3_1_4
%define cxsparsever 3.1.4
%define cxsparseso 3_1_4
%define kluver 1.3.3
%define kluso 1_3_3
%define ldlver 2.2.1
%define ldlso 2_2_1
%define rbiover 2.2.1
%define rbioso 2_2_1
%define spqrver 2.0.2
%define spqrso 2_0_2
%define umfpackver 5.7.1
%define umfpackso 5_7_1
BuildRequires: openmpi-devel
BuildRequires: openblas-devel
BuildRequires: metis-devel
%define amdver 2.4.6
%define amdso 2_4_6
%define btfver 1.2.6
%define btfso 1_2_6
%define camdver 2.4.6
%define camdso 2_4_6
%define ccolamdver 2.9.6
%define ccolamdso 2_9_6
%define colamdver 2.9.6
%define colamdso 2_9_6
%define cholmodver 3.0.11
%define cholmodso 3_0_11
%define csparsever 3.1.9
%define csparseso 3_1_9
%define cxsparsever 3.1.9
%define cxsparseso 3_1_9
%define kluver 1.3.8
%define kluso 1_3_8
%define ldlver 2.2.6
%define ldlso 2_2_6
%define rbiover 2.2.6
%define rbioso 2_2_6
%define spqrver 2.0.8
%define spqrso 2_0_8
%define umfpackver 5.7.6
%define umfpackso 5_7_6
# 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 4.4.6
%define configso 4_4_6
%define configver 4.5.5
%define configso 4_5_5
%define amdlib libamd-%{amdso}
%define btflib libbtf-%{btfso}
%define camdlib libcamd-%{camdso}
@ -86,6 +86,9 @@ matrices.
Summary: Development headers for SuiteSparse
License: GPL-2.0+ and LGPL-2.1+
Group: Development/Libraries
Requires: openmpi-devel
Requires: openblas-devel
Requires: metis-devel
Requires: %{amdlib} = %{amdver}
Requires: %{btflib} = %{btfver}
Requires: %{camdlib} = %{camdver}
@ -425,15 +428,12 @@ SuiteSparse_config is part of the SuiteSparse sparse matrix suite.
%prep
%setup -q -n SuiteSparse
sed 's/^CHOLMOD_CONFIG =.*/CHOLMOD_CONFIG = -DNPARTITION/' -i SuiteSparse_config/SuiteSparse_config.mk
sed 's/^\(METIS =\).*//' -i SuiteSparse_config/SuiteSparse_config.mk
# bnc#751746
rm -rf MATLAB_Tools/Factorize/Doc/factorize_article.pdf
rm -rf SPQR/Doc/algo_spqr.pdf
rm -rf SPQR/Doc/spqr.pdf
# bnc#775418
%patch0 -p1
%patch1 -p1
%patch775418 -p1
%build
@ -452,16 +452,22 @@ popd
amd_libs="libsuitesparseconfig.so"
camd_libs="libsuitesparseconfig.so"
ccolamd_libs="libsuitesparseconfig.so"
cholmod_libs="libamd.so libcamd.so libcolamd.so libccolamd.so libsuitesparseconfig.so -lblas -llapack"
cholmod_libs="libamd.so libcamd.so libcolamd.so libccolamd.so libsuitesparseconfig.so -lopenblas -llapack -lmetis"
colamd_libs="libsuitesparseconfig.so"
klu_libs="libamd.so libbtf.so libcolamd.so"
rbio_libs="libsuitesparseconfig.so"
spqr_libs="libcholmod.so libsuitesparseconfig.so -lblas -llapack"
umfpack_libs="libamd.so libcholmod.so libsuitesparseconfig.so -lblas -llapack"
spqr_libs="libcholmod.so libsuitesparseconfig.so -lopenblas -llapack -lmetis"
umfpack_libs="libamd.so libcholmod.so libsuitesparseconfig.so -lopenblas -llapack -lmetis"
for dir in AMD BTF CAMD CCOLAMD COLAMD CHOLMOD CSparse CXSparse KLU LDL RBio SPQR UMFPACK; do
pushd $dir
ver=$(grep -E "^VERSION =" Makefile | sed "s:VERSION = ::")
ver=$(grep -E "^VERSION =" Lib/Makefile | sed "s:VERSION = ::")
if [[ -z $ver ]] ; then
major=$(grep -oP "^\#define \w+_VER \d+" Include/*.h | sed -E "s:\#define [A-Z]+_VER ::")
minor=$(grep -oP "^\#define \w+_SUBVER \d+" Include/*.h | sed -E "s:\#define [A-Z]+_SUBVER ::")
patchlev=$(grep -oP "^\#define \w+_SUBSUB \d+" Include/*.h | sed -E "s:\#define [A-Z]+_SUBSUB ::")
ver="$major.$minor.$patchlev"
fi
make CFLAGS="%{optflags} -fPIC"
popd
pushd Lib
@ -475,11 +481,11 @@ done
# specialities
# -- CHOLMOD
pushd CHOLMOD
cp Cholesky/License.txt Doc/Cholesky_License.txt
cp Core/License.txt Doc/Core_License.txt
cp MatrixOps/License.txt Doc/MatrixOps_License.txt
cp Partition/License.txt Doc/Partition_License.txt
cp Supernodal/License.txt Doc/Supernodal_License.txt
cp Cholesky/lesser.txt Doc/Cholesky_License.txt
cp Core/lesser.txt Doc/Core_License.txt
cp MatrixOps/gpl.txt Doc/MatrixOps_License.txt
cp Partition/lesser.txt Doc/Partition_License.txt
cp Supernodal/gpl.txt Doc/Supernodal_License.txt
popd
%install
@ -492,7 +498,13 @@ cp -a README.txt %{buildroot}%{_docdir}/%{name}
cp -a Lib/*.so* %{buildroot}/%{_libdir}
for dir in AMD BTF CAMD CCOLAMD CHOLMOD COLAMD CSparse CXSparse KLU LDL RBio SPQR UMFPACK; do
pushd $dir
ver=$(grep -E "^VERSION =" Makefile | sed "s:VERSION = ::")
ver=$(grep -E "^VERSION =" Lib/Makefile | sed "s:VERSION = ::")
if [[ -z $ver ]] ; then
major=$(grep -oP "^\#define \w+_VER \d+" Include/*.h | sed -E "s:\#define [A-Z]+_VER ::")
minor=$(grep -oP "^\#define \w+_SUBVER \d+" Include/*.h | sed -E "s:\#define [A-Z]+_SUBVER ::")
patchlev=$(grep -oP "^\#define \w+_SUBSUB \d+" Include/*.h | sed -E "s:\#define [A-Z]+_SUBSUB ::")
ver="$major.$minor.$patchlev"
fi
cp -a Lib/*.a %{buildroot}/%{_libdir}
cp -a Include/*\.h %{buildroot}%{_includedir}/%{name}
if ls Include/*\.hpp 1> /dev/null 2>&1; then