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.

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

proper diagonal in copytri! (fix #30055) #30066

Merged
merged 22 commits into from
Jan 8, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
84faacf
proper diagonal in copytri! (fix #30055)
KlausC Nov 17, 2018
7073d71
added sprandn methods with Type
KlausC Nov 19, 2018
e43667e
Merge remote-tracking branch 'upstream/master'
KlausC Nov 19, 2018
4bef0c4
Merge remote-tracking branch 'upstream/master'
KlausC Nov 21, 2018
468723c
Merge remote-tracking branch 'upstream/master'
KlausC Nov 23, 2018
b2b63ec
Merge remote-tracking branch 'upstream/master'
KlausC Nov 24, 2018
ef2bc34
Merge remote-tracking branch 'upstream/master'
KlausC Nov 27, 2018
0b2dbeb
Merge remote-tracking branch 'upstream/master'
KlausC Dec 4, 2018
1192355
Merge remote-tracking branch 'upstream/master'
KlausC Dec 7, 2018
d7282cb
Merge remote-tracking branch 'upstream/master'
KlausC Dec 9, 2018
d423468
Merge remote-tracking branch 'upstream/master'
KlausC Dec 10, 2018
07f744f
Merge remote-tracking branch 'upstream/master'
KlausC Dec 11, 2018
957aa85
Merge remote-tracking branch 'upstream/master'
KlausC Dec 12, 2018
c8b61ca
Merge remote-tracking branch 'upstream/master'
KlausC Dec 18, 2018
6a4f54d
Merge remote-tracking branch 'upstream/master'
KlausC Dec 19, 2018
af3e470
Merge remote-tracking branch 'upstream/master'
KlausC Dec 20, 2018
1f95165
Merge remote-tracking branch 'upstream/master'
KlausC Dec 25, 2018
12b2c59
Merge remote-tracking branch 'upstream/master'
KlausC Dec 28, 2018
0644a29
Merge remote-tracking branch 'upstream/master'
KlausC Jan 7, 2019
51d3ac5
Merge branch 'master' into krc/copytriangular
KlausC Jan 7, 2019
49f4156
additional parameter in copytri! for diagonal
KlausC Jan 7, 2019
fa3d7ad
@inline copytri! to enforce constant propagation
KlausC Jan 8, 2019
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
5 changes: 5 additions & 0 deletions stdlib/LinearAlgebra/src/matmul.jl
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,11 @@ function copytri!(A::AbstractMatrix, uplo::AbstractChar, conjugate::Bool=false)
else
throw(ArgumentError("uplo argument must be 'U' (upper) or 'L' (lower), got $uplo"))
end
if conjugate
for i = 1:n
A[i,i] = adjoint(A[i,i])
end
end
A
end

Expand Down
4 changes: 2 additions & 2 deletions stdlib/LinearAlgebra/src/symmetric.jl
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,14 @@ similar(A::Union{Symmetric,Hermitian}, ::Type{T}, dims::Dims{N}) where {T,N} = s
function Matrix(A::Symmetric)
B = copytri!(convert(Matrix, copy(A.data)), A.uplo)
for i = 1:size(A, 1)
B[i,i] = symmetric(B[i,i], sym_uplo(A.uplo))::symmetric_type(eltype(A.data))
B[i,i] = symmetric(A[i,i], sym_uplo(A.uplo))::symmetric_type(eltype(A.data))
end
return B
end
function Matrix(A::Hermitian)
B = copytri!(convert(Matrix, copy(A.data)), A.uplo, true)
for i = 1:size(A, 1)
B[i,i] = hermitian(B[i,i], sym_uplo(A.uplo))::hermitian_type(eltype(A.data))
B[i,i] = hermitian(A[i,i], sym_uplo(A.uplo))::hermitian_type(eltype(A.data))
end
return B
end
Expand Down
7 changes: 7 additions & 0 deletions stdlib/LinearAlgebra/test/matmul.jl
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,13 @@ end

@test_throws ArgumentError LinearAlgebra.copytri!(Matrix{Float64}(undef,10,10),'Z')

@testset "Issue 30055" begin
A = UpperTriangular([1+im 2+im 3+im; 4+im 5+im 6+im; 7+im 9+im 0])'
@test copy(A) == A # copy uses copytri!
A = LowerTriangular([1+im 2+im 3+im; 4+im 5+im 6+im; 7+im 9+im 0])'
@test copy(A) == A # copy uses copytri!
end

@testset "gemv! and gemm_wrapper for $elty" for elty in [Float32,Float64,ComplexF64,ComplexF32]
A10x10, x10, x11 = Array{elty}.(undef, ((10,10), 10, 11))
@test_throws DimensionMismatch LinearAlgebra.gemv!(x10,'N',A10x10,x11)
Expand Down