Fix a bug in the doubletranspose method for non-square matrices (#8316).

Add tests for sparse matrix multiplication that exercise both, the sortcols and the doubletranspose method.
JuliaLang · Oct 26, 2014 · 98c882f · 98c882f
1 parent b718cbc
commit 98c882f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/base/sparse/sparsematrix.jl b/base/sparse/sparsematrix.jl
@@ -2053,7 +2053,8 @@ end
 # sortSparseMatrixCSC!(A, sortindices = :doubletranspose) # Sort with a double transpose
 function sortSparseMatrixCSC!{Tv,Ti}(A::SparseMatrixCSC{Tv,Ti}; sortindices::Symbol = :sortcols)
     if sortindices == :doubletranspose
-        B = similar(A)
+        nB, mB = size(A)
+        B = SparseMatrixCSC(mB, nB, Array(Ti, nB+1), similar(A.rowval), similar(A.nzval))
         transpose!(A, B)
         transpose!(B, A)
         return A

diff --git a/test/sparse.jl b/test/sparse.jl
@@ -148,8 +148,10 @@ end
 # matrix multiplication and kron
 for i = 1:5
     a = sprand(10, 5, 0.7)
-    b = sprand(5, 10, 0.3)
+    b = sprand(5, 15, 0.3)
     @test maximum(abs(a*b - full(a)*full(b))) < 100*eps()
+    @test maximum(abs(Base.LinAlg.spmatmul(a,b,sortindices=:sortcols) - full(a)*full(b))) < 100*eps()
+    @test maximum(abs(Base.LinAlg.spmatmul(a,b,sortindices=:doubletranspose) - full(a)*full(b))) < 100*eps()
     @test full(kron(a,b)) == kron(full(a), full(b))
 end