Merge branch 'master' into genericsyrk2

Author: dkarrasch

src/LinearAlgebra.jl

@@ -726,6 +726,8 @@ end
 (\)(F::TransposeFactorization{T,<:LU}, B::VecOrMat{Complex{T}}) where {T<:BlasReal} =
     ldiv(F, B)
 
+const default_peakflops_size = Int === Int32 ? 2048 : 4096
+
 """
     LinearAlgebra.peakflops(n::Integer=4096; eltype::DataType=Float64, ntrials::Integer=3, parallel::Bool=false)
 
@@ -750,7 +752,7 @@ of the problem that is solved on each processor.
     This function requires at least Julia 1.1. In Julia 1.0 it is available from
     the standard library `InteractiveUtils`.
 """
-function peakflops(n::Integer=4096; eltype::DataType=Float64, ntrials::Integer=3, parallel::Bool=false)
+function peakflops(n::Integer=default_peakflops_size; eltype::DataType=Float64, ntrials::Integer=3, parallel::Bool=false)
     t = zeros(Float64, ntrials)
     for i=1:ntrials
         a = ones(eltype,n,n)

src/bunchkaufman.jl

@@ -182,10 +182,8 @@ julia> d, u, p = S; # destructuring via iteration
 julia> d == S.D && u == S.U && p == S.p
 true
 
-julia> S.U*S.D*S.U' - S.P*A*S.P'
-2×2 Matrix{Float64}:
- 0.0  0.0
- 0.0  0.0
+julia> S.U * S.D * S.U' ≈ S.P * A * S.P'
+true
 
 julia> S = bunchkaufman(Symmetric(A, :L))
 BunchKaufman{Float64, Matrix{Float64}, Vector{Int64}}
@@ -202,10 +200,8 @@ permutation:
  2
  1
 
-julia> S.L*S.D*S.L' - A[S.p, S.p]
-2×2 Matrix{Float64}:
- 0.0  0.0
- 0.0  0.0
+julia> S.L * S.D * S.L' ≈ A[S.p, S.p]
+true
 ```
 """
 bunchkaufman(A::AbstractMatrix{T}, rook::Bool=false; check::Bool = true) where {T} =

src/matmul.jl

@@ -1023,7 +1023,7 @@ function __generic_matvecmul!(f::F, C::AbstractVector, A::AbstractVecOrMat, B::A
     @inbounds begin
         if length(B) == 0
             for k = eachindex(C)
-                @stable_muladdmul _modify!(MulAddMul(alpha,beta), false, C, k)
+                @stable_muladdmul _modify!(MulAddMul(alpha,beta), zero(eltype(C)), C, k)
             end
         else
             for k = eachindex(C)
@@ -1046,7 +1046,7 @@ function __generic_matvecmul!(::typeof(identity), C::AbstractVector, A::Abstract
             if !iszero(beta)
                 C[i] *= beta
             elseif length(B) == 0
-                C[i] = false
+                C[i] = zero(eltype(C))
             else
                 C[i] = zero(A[i]*B[1] + A[i]*B[1])
             end

src/symmetric.jl

@@ -352,7 +352,7 @@ function copyto!(dest::Symmetric, src::Symmetric)
     elseif src.uplo == dest.uplo
         copytrito!(dest.data, src.data, src.uplo)
     else
-        transpose!(dest.data, Base.unalias(dest.data, src.data))
+        copytrito!(dest.data, transpose(Base.unalias(dest.data, src.data)), dest.uplo)
     end
     return dest
 end
@@ -363,7 +363,7 @@ function copyto!(dest::Hermitian, src::Hermitian)
     elseif src.uplo == dest.uplo
         copytrito!(dest.data, src.data, src.uplo)
     else
-        adjoint!(dest.data, Base.unalias(dest.data, src.data))
+        copytrito!(dest.data, adjoint(Base.unalias(dest.data, src.data)), dest.uplo)
     end
     return dest
 end
@@ -445,8 +445,6 @@ adjoint(A::Hermitian) = A
 transpose(A::Symmetric) = A
 adjoint(A::Symmetric{<:Real}) = A
 transpose(A::Hermitian{<:Real}) = A
-adjoint(A::Symmetric) = Adjoint(A)
-transpose(A::Hermitian) = Transpose(A)
 
 real(A::Symmetric{<:Real}) = A
 real(A::Hermitian{<:Real}) = A

test/matmul.jl

@@ -6,6 +6,11 @@ using Base: rtoldefault
 using Test, LinearAlgebra, Random
 using LinearAlgebra: mul!, Symmetric, Hermitian
 
+const BASE_TEST_PATH = joinpath(Sys.BINDIR, "..", "share", "julia", "test")
+
+isdefined(Main, :SizedArrays) || @eval Main include(joinpath($(BASE_TEST_PATH), "testhelpers", "SizedArrays.jl"))
+using .Main.SizedArrays
+
 ## Test Julia fallbacks to BLAS routines
 
 mul_wrappers = [
@@ -1176,4 +1181,16 @@ end
     end
 end
 
+@testset "zero-length generic matvec" begin
+    m = SizedArrays.SizedArray{(2,2)}(ones(2,2))
+    A = fill(m, 2, 0)
+    v = fill(m, size(A,2))
+    w = similar(v, size(A,1))
+    mul!(w, A, v)
+    @test all(iszero, w)
+    A = fill(m, 0, 2)
+    mul!(w, A', v)
+    @test all(iszero, w)
+end
+
 end # module TestMatmul

test/symmetric.jl

@@ -1163,4 +1163,19 @@ end
     end
 end
 
+@testset "copyto! with mismatched uplo" begin
+    for (S,tf) in ((Symmetric, transpose), (Hermitian, adjoint))
+        for (uplo1,uplo2) in [(:U,:L), (:L, :U)]
+            M = Matrix{Complex{BigFloat}}(undef, 2, 2)
+            M[1,1] = M[2,2] = 3
+            isupper = uplo1 == :U
+            M[1+!isupper, 1+isupper] = 4+3im
+            H1 = S(M, uplo1)
+            H2 = 2 * S(tf(M), uplo2)
+            copyto!(H2, H1)
+            @test H2 == H1
+        end
+    end
+end
+
 end # module TestSymmetric