@@ -169,7 +169,7 @@ const SparseOrTri{Tv,Ti} = Union{SparseMatrixCSCUnion{Tv,Ti},SparseTriangular{Tv
169169# done by a quicksort of the row indices or by a full scan of the dense result vector.
170170# The last is faster, if more than ≈ 1/32 of the result column is nonzero.
171171# TODO : extend to SparseMatrixCSCUnion to allow for SubArrays (view(X, :, r)).
172- function spmatmul (A:: SparseOrTri , B:: Union{SparseOrTri,SparseVectorUnion ,SubArray{<:Any,<:Any,<:AbstractSparseArray}} )
172+ function spmatmul (A:: SparseOrTri , B:: Union{SparseOrTri,AbstractCompressedVector ,SubArray{<:Any,<:Any,<:AbstractSparseArray}} )
173173 Tv = promote_op (matprod, eltype (A), eltype (B))
174174 Ti = promote_type (indtype (A), indtype (B))
175175 mA, nA = size (A)
@@ -1385,7 +1385,7 @@ kron!(C::SparseMatrixCSC, A::_DenseConcatGroup, B::_SparseKronGroup) =
13851385 kron! (C, convert (SparseMatrixCSC, A), convert (SparseMatrixCSC, B))
13861386kron! (C:: SparseMatrixCSC , A:: _SparseKronGroup , B:: _SparseKronGroup ) =
13871387 kron! (C, convert (SparseMatrixCSC, A), convert (SparseMatrixCSC, B))
1388- kron! (C:: SparseMatrixCSC , A:: SparseVectorUnion , B:: AdjOrTransSparseVectorUnion ) =
1388+ kron! (C:: SparseMatrixCSC , A:: _SparseVectorUnion , B:: _AdjOrTransSparseVectorUnion ) =
13891389 broadcast! (* , C, A, B)
13901390# disambiguation
13911391kron! (C:: SparseMatrixCSC , A:: _SparseKronGroup , B:: Diagonal ) =
@@ -1420,7 +1420,7 @@ kron(A::_SparseKronGroup, B::_SparseKronGroup) =
14201420 kron (convert (SparseMatrixCSC, A), convert (SparseMatrixCSC, B))
14211421kron (A:: _SparseKronGroup , B:: _DenseConcatGroup ) = kron (A, sparse (B))
14221422kron (A:: _DenseConcatGroup , B:: _SparseKronGroup ) = kron (sparse (A), B)
1423- kron (A:: SparseVectorUnion , B:: AdjOrTransSparseVectorUnion ) = A .* B
1423+ kron (A:: _SparseVectorUnion , B:: _AdjOrTransSparseVectorUnion ) = A .* B
14241424# disambiguation
14251425kron (A:: AbstractCompressedVector , B:: AdjOrTrans{<:Any,<:AbstractCompressedVector} ) = A .* B
14261426kron (a:: Number , b:: _SparseKronGroup ) = a * b
0 commit comments