Add jl_cholmod_sizeof_long to SuiteSparse_wrapper. Select supported i…

…ndex types based on size of SuitSparse_long. Test adjusted.
pwl · Dec 8, 2014 · 5f333b1 · 5f333b1
1 parent 877a29c
commit 5f333b1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/base/linalg/cholmod.jl b/base/linalg/cholmod.jl
@@ -50,7 +50,16 @@ function cmn(::Type{Int64})
  chm_l_com
 end
 
-typealias CHMITypes Union(Int32,Int64)
+# check the size of SuiteSparse_long
+if int(ccall((:jl_cholmod_sizeof_long,:libsuitesparse_wrapper),Csize_t,())) == 4
+ const CholmodIndexTypes = (:Int32, )
+ typealias CHMITypes Union(Int32)
+else
+ const CholmodIndexTypes = (:Int32, :Int64)
+ typealias CHMITypes Union(Int32, Int64)
+end
+
+
 typealias CHMVTypes Union(Complex128, Float64)
 typealias CHMVRealTypes Union(Float64)
 
@@ -424,6 +433,7 @@ function CholmodSparse!{Tv<:CHMVTypes,Ti<:CHMITypes}(colpt::Vector{Ti},
  xtyp(Tv),dtyp(Tv),
  CHOLMOD_FALSE,CHOLMOD_TRUE),
  colpt,rowval,nzval)
+
  @isok isvalid(cs)
 
  cs = sort!(cs)
@@ -479,7 +489,7 @@ function chm_rdsp(fnm::AbstractString)
  CholmodSparse(res)
 end
 
-for Ti in (:Int32,:Int64)
+for Ti in CholmodIndexTypes
  @eval begin
  function (*){Tv<:CHMVRealTypes}(A::CholmodSparse{Tv,$Ti},
  B::CholmodSparse{Tv,$Ti})

diff --git a/deps/Makefile b/deps/Makefile
@@ -1371,6 +1371,7 @@ install-mojibake: $(MOJIBAKE_OBJ_TARGET)
 SUITESPARSE_OBJ_SOURCE = SuiteSparse-$(SUITESPARSE_VER)/UMFPACK/Lib/libumfpack.a
 SUITESPARSE_OBJ_TARGET = $(build_shlibdir)/libspqr.$(SHLIB_EXT)
 
+
 ifeq ($(USE_BLAS64), 1)
 UMFPACK_CONFIG = -DLONGBLAS='long long'
 CHOLMOD_CONFIG = -DLONGBLAS='long long'

diff --git a/deps/SuiteSparse_wrapper.c b/deps/SuiteSparse_wrapper.c
@@ -5,6 +5,10 @@ extern size_t jl_cholmod_common_size(void) {
  return sizeof(cholmod_common);
 }
 
+extern size_t jl_cholmod_sizeof_long(void) {
+ return sizeof(SuiteSparse_long);
+}
+
 extern int jl_cholmod_version(int *ver) {
  if (ver != (int*) NULL) {
  ver[0] = CHOLMOD_MAIN_VERSION;

diff --git a/test/linalg/cholmod.jl b/test/linalg/cholmod.jl
@@ -3,8 +3,8 @@ using Base.Test
 let # Issue 9160
  const CHOLMOD = Base.LinAlg.CHOLMOD
 
- for Ti in (Int32, Int64)
- for elty in (Float64, )
+ for Ti in CHOLMOD.CHMITypes.types
+ for elty in CHOLMOD.CHMVRealTypes.types
 
  A = sprand(10,10,0.1)
  A = convert(SparseMatrixCSC{elty,Ti},A)