Merge pull request #21 from nickrobinson251/npr/guard-gpl-libs

Only define methods on SuiteSparse.UMFPACK if GPL libs present

Project.toml

@@ -1,7 +1,7 @@
 name = "SparseMatricesCSR"
 uuid = "a0a7dd2c-ebf4-11e9-1f05-cf50bc540ca1"
 authors = ["Víctor Sande <[email protected]>", "Francesc Verdugo <[email protected]>"]
-version = "0.6.6"
+version = "0.6.7"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/SparseMatrixCSR.jl

@@ -140,6 +140,8 @@ function LinearAlgebra.lu(a::SparseMatrixCSR{1})
   Transpose(lu(SparseMatrixCSC(a.m,a.n,a.rowptr,a.colval,a.nzval)))
 end
 
+if Base.USE_GPL_LIBS
+
 function LinearAlgebra.lu!(
     translu::Transpose{T,<:SuiteSparse.UMFPACK.UmfpackLU{T}},
     a::SparseMatrixCSR{1}) where {T}
@@ -154,6 +156,8 @@ function LinearAlgebra.lu!(
   Transpose(lu!(translu.parent,SparseMatrixCSC(a.m,a.n,rowptr,colval,a.nzval)))
 end
 
+end # Base.USE_GPL_LIBS
+
 size(S::SparseMatrixCSR) = (S.m, S.n)
 IndexStyle(::Type{<:SparseMatrixCSR}) = IndexCartesian()
 function getindex(A::SparseMatrixCSR{Bi,T}, i0::Integer, i1::Integer) where {Bi,T}

test/SparseMatrixCSR.jl

@@ -133,10 +133,14 @@ for Bi in (0,1)
   end
 end
 
-I = [1,1,2,2,2,3,3]
-J = [1,2,1,2,3,2,3]
-V = [4.0,1.0,-1.0,4.0,1.0,-1.0,4.0]
-test_lu(0,I,J,V)
-test_lu(1,I,J,V)
+if Base.USE_GPL_LIBS  # `lu!` requires `SuiteSparse.UMFPACK`
+    I = [1,1,2,2,2,3,3]
+    J = [1,2,1,2,3,2,3]
+    V = [4.0,1.0,-1.0,4.0,1.0,-1.0,4.0]
+    test_lu(0,I,J,V)
+    test_lu(1,I,J,V)
+else
+    @warn "Tests run without GPL libraries."
+end
 
 end # module