- updated to 3.0.1

- updated shared patch

diff --git a/CHOLMOD-shared.patch b/CHOLMOD-shared.patch
index b136120cdb1e4bfceb32367b09aa4cf9068500f1..e346f15c51f2155f3ba1b2b9dc106da4e6e5102d 100644 (file)
--- a/CHOLMOD-shared.patch
+++ b/CHOLMOD-shared.patch
@@ -94,8 +94,8 @@
  reade: reade.f
 -      $(F77) $(FFLAGS) -O -o reade reade.f
 +      $(F77) $(LDFLAGS) -O $(FFLAGS) -o reade reade.f
---- CHOLMOD/Lib/Makefile.orig  2013-04-20 07:45:02.304428018 +0200
-+++ CHOLMOD/Lib/Makefile       2013-04-20 07:48:37.427752323 +0200
+--- CHOLMOD/Lib/Makefile.orig  2014-10-02 21:02:42.319207445 +0200
++++ CHOLMOD/Lib/Makefile       2014-10-02 21:06:16.905865107 +0200
 @@ -43,14 +43,14 @@
  
  C = $(CC) $(CF) $(CHOLMOD_CONFIG) $(CONFIG)
@@ -114,7 +114,7 @@
  
  clean:
        - $(RM) $(CLEAN)
-@@ -144,9 +144,13 @@
+@@ -149,9 +149,13 @@
  # to compile just the double/int version, use OBJ = $(DI)
  OBJ = $(DI) $(DL)
  
@@ -131,7 +131,7 @@
  
  $(OBJ): $(INC)
  
-@@ -155,24 +159,24 @@
+@@ -160,24 +164,24 @@
  #-------------------------------------------------------------------------------
  
  cholmod_check.o: ../Check/cholmod_check.c
@@ -162,7 +162,7 @@
  
  
  #-------------------------------------------------------------------------------
-@@ -180,98 +184,98 @@
+@@ -185,98 +189,98 @@
  #-------------------------------------------------------------------------------
  
  cholmod_common.o: ../Core/cholmod_common.c
@@ -291,7 +291,7 @@
  
  
  #-------------------------------------------------------------------------------
-@@ -279,116 +283,116 @@
+@@ -284,116 +288,116 @@
  #-------------------------------------------------------------------------------
  
  cholmod_amd.o: ../Cholesky/cholmod_amd.c
@@ -442,7 +442,7 @@
  
  
  #-------------------------------------------------------------------------------
-@@ -396,88 +400,88 @@
+@@ -401,88 +405,88 @@
  #-------------------------------------------------------------------------------
  
  cholmod_horzcat.o: ../MatrixOps/cholmod_horzcat.c
@@ -555,34 +555,53 @@
  
  
  #-------------------------------------------------------------------------------
-@@ -487,24 +491,24 @@
+@@ -492,27 +496,27 @@
  cholmod_super_numeric.o: ../Supernodal/cholmod_super_numeric.c \
-         ../Supernodal/t_cholmod_gpu.c \
+         ../GPU/t_cholmod_gpu.c \
        ../Supernodal/t_cholmod_super_numeric.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(C) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) -c $(I) $<
  
  cholmod_super_symbolic.o: ../Supernodal/cholmod_super_symbolic.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(C) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) -c $(I) $<
  
  cholmod_super_solve.o: ../Supernodal/cholmod_super_solve.c \
        ../Supernodal/t_cholmod_super_solve.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(C) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) -c $(I) $<
  
  #-------------------------------------------------------------------------------
  
  cholmod_l_super_numeric.o: ../Supernodal/cholmod_super_numeric.c \
        ../Supernodal/t_cholmod_super_numeric.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG -c $(I) $< -o $@
  
  cholmod_l_super_symbolic.o: ../Supernodal/cholmod_super_symbolic.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG -c $(I) $< -o $@
  
  cholmod_l_super_solve.o: ../Supernodal/cholmod_super_solve.c \
        ../Supernodal/t_cholmod_super_solve.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG -c $(I) $< -o $@
+ 
+ #-------------------------------------------------------------------------------
+ # GPU module
+@@ -525,12 +529,12 @@
+ 
+ cholmod_gpu_kernels.o: ../GPU/cholmod_gpu_kernels.c \
+         ../GPU/cholmod_gpu_kernels.cu
+-      $(C) -c $(I) $<
++      libtool --tag=CC --mode=compile $(C) -c $(I) $<
+       $(NVCC) -I../../SuiteSparse_config -Xcompiler -fPIC -O3  -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -c ../GPU/cholmod_gpu_kernels.cu
+ 
+ cholmod_gpu.o: ../GPU/cholmod_gpu.c 
+-      $(C) -c $(I) $<
++      libtool --tag=CC --mode=compile $(C) -c $(I) $<
+ 
+ cholmod_l_gpu.o: ../GPU/cholmod_gpu.c 
+-      $(C) -DDLONG -c $(I) $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG -c $(I) $< -o $@
+ 

diff --git a/CHOLMOD.spec b/CHOLMOD.spec
index f6b334fe08f6ce4ac347be55f495afa0ec9a2c75..01ad90c80f89c75bf7ff7a5cb72fca28c40d0e13 100644 (file)
--- a/CHOLMOD.spec
+++ b/CHOLMOD.spec
@@ -5,22 +5,22 @@
 Summary:       CHOLMOD: sparse supernodal Cholesky factorization and update/downdate
 Summary(pl.UTF-8):     CHOLMOD - rzadki wielowęzłowy rozkład Cholesky'ego z poprawianiem
 Name:          CHOLMOD
-Version:       2.1.2
+Version:       3.0.1
 Release:       1
 License:       GPL v2+ (some parts LGPL v2.1+)
 Group:         Libraries
 Source0:       http://www.cise.ufl.edu/research/sparse/cholmod/%{name}-%{version}.tar.gz
-# Source0-md5: 0c55ade78bb1b1f1e7b6a6cba024f70d
+# Source0-md5: 677c2fac5bf480c125801ced2f51f9fe
 Patch0:                %{name}-ufconfig.patch
 Patch1:                %{name}-shared.patch
 # http://www.cise.ufl.edu/research/sparse/cholmod/metis.patch (for METIS 5)
 Patch2:                %{name}-metis.patch
 URL:           http://www.cise.ufl.edu/research/sparse/cholmod/
-BuildRequires: AMD-devel >= 2.3.0
-BuildRequires: CAMD-devel >= 2.3.0
-BuildRequires: CCOLAMD-devel >= 2.8.0
-BuildRequires: COLAMD-devel >= 2.8.0
-BuildRequires: SuiteSparse_config-devel >= 4.2.0
+BuildRequires: AMD-devel >= 2.4.0
+BuildRequires: CAMD-devel >= 2.4.0
+BuildRequires: CCOLAMD-devel >= 2.9.0
+BuildRequires: COLAMD-devel >= 2.9.0
+BuildRequires: SuiteSparse_config-devel >= 4.3.0
 BuildRequires: blas-devel
 BuildRequires: gcc-fortran
 BuildRequires: lapack-devel
@@ -28,11 +28,11 @@ BuildRequires:      libtool >= 2:1.5
 %if %{with metis}
 BuildRequires: metis-devel >= 5
 %endif
-Requires:      AMD >= 2.3.0
-Requires:      CAMD >= 2.3.0
-Requires:      CCOLAMD >= 2.8.0
-Requires:      COLAMD >= 2.8.0
-Requires:      SuiteSparse_config-libs >= 4.2.0
+Requires:      AMD >= 2.4.0
+Requires:      CAMD >= 2.4.0
+Requires:      CCOLAMD >= 2.9.0
+Requires:      COLAMD >= 2.9.0
+Requires:      SuiteSparse_config-libs >= 4.3.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -48,11 +48,11 @@ Summary:    Header files for CHOLMOD library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki CHOLMOD
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      AMD-devel >= 2.3.0
-Requires:      CAMD-devel >= 2.3.0
-Requires:      CCOLAMD-devel >= 2.8.0
-Requires:      COLAMD-devel >= 2.8.0
-Requires:      SuiteSparse_config-devel >= 4.2.0
+Requires:      AMD-devel >= 2.4.0
+Requires:      CAMD-devel >= 2.4.0
+Requires:      CCOLAMD-devel >= 2.9.0
+Requires:      COLAMD-devel >= 2.9.0
+Requires:      SuiteSparse_config-devel >= 4.3.0
 
 %description devel
 Header files for CHOLMOD library.