Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed sparse cholesky to return Vector #30416

Merged
merged 1 commit into from
Dec 17, 2018
Merged

Fixed sparse cholesky to return Vector #30416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion stdlib/SuiteSparse/src/cholmod.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,10 +1686,18 @@ end
(\)(L::Factor, B::SparseVecOrMat) = sparse(spsolve(CHOLMOD_A, L, Sparse(B, 0)))

\(adjL::Adjoint{<:Any,<:Factor}, B::Dense) = (L = adjL.parent; solve(CHOLMOD_A, L, B))
\(adjL::Adjoint{<:Any,<:Factor}, B::VecOrMat) = (L = adjL.parent; Matrix(solve(CHOLMOD_A, L, Dense(B))))
\(adjL::Adjoint{<:Any,<:Factor}, B::Sparse) = (L = adjL.parent; spsolve(CHOLMOD_A, L, B))
\(adjL::Adjoint{<:Any,<:Factor}, B::SparseVecOrMat) = (L = adjL.parent; \(adjoint(L), Sparse(B)))

function \(adjL::Adjoint{<:Any,<:Factor}, b::StridedVector)
L = adjL.parent
return Vector(solve(CHOLMOD_A, L, Dense(b)))
end
function \(adjL::Adjoint{<:Any,<:Factor}, B::StridedMatrix)
L = adjL.parent
return Matrix(solve(CHOLMOD_A, L, Dense(B)))
end

const RealHermSymComplexHermF64SSL = Union{
Symmetric{Float64,SparseMatrixCSC{Float64,SuiteSparse_long}},
Hermitian{Float64,SparseMatrixCSC{Float64,SuiteSparse_long}},
Expand Down
5 changes: 5 additions & 0 deletions stdlib/SuiteSparse/test/cholmod.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,11 @@ end
@test_throws ArgumentError logdet(Fnew)
end

@testset "Issue #28985" begin
@test typeof(cholesky(sparse(I, 4, 4))'\rand(4)) == Array{Float64, 1}
@test typeof(cholesky(sparse(I, 4, 4))'\rand(4,1)) == Array{Float64, 2}
end

@testset "Issue with promotion during conversion to CHOLMOD.Dense" begin
@test CHOLMOD.Dense(fill(1, 5)) == fill(1, 5, 1)
@test CHOLMOD.Dense(fill(1f0, 5)) == fill(1, 5, 1)
Expand Down