Merge branch 'master' into versioninfo_type_stability

Author: nsajko

src/abstractq.jl

@@ -9,6 +9,7 @@ end
 parent(adjQ::AdjointQ) = adjQ.Q
 eltype(::Type{<:AbstractQ{T}}) where {T} = T
 Base.eltypeof(Q::AbstractQ) = eltype(Q)
+Base.IteratorSize(::Type{<:AbstractQ}) = Base.HasShape{2}()
 ndims(::AbstractQ) = 2
 
 # inversion/adjoint/transpose
@@ -40,7 +41,6 @@ convert(::Type{AbstractQ{T}}, adjQ::AdjointQ{T}) where {T} = adjQ
 convert(::Type{AbstractQ{T}}, adjQ::AdjointQ) where {T} = convert(AbstractQ{T}, adjQ.Q)'
 
 # ... to matrix
-collect(Q::AbstractQ) = copyto!(Matrix{eltype(Q)}(undef, size(Q)), Q)
 Matrix{T}(Q::AbstractQ) where {T} = convert(Matrix{T}, Q*I) # generic fallback, yields square matrix
 Matrix{T}(adjQ::AdjointQ{S}) where {T,S} = convert(Matrix{T}, lmul!(adjQ, Matrix{S}(I, size(adjQ))))
 Matrix(Q::AbstractQ{T}) where {T} = Matrix{T}(Q)

src/bidiag.jl

@@ -1250,19 +1250,19 @@ end
 ldiv!(A::Bidiagonal, b::AbstractVecOrMat) = @inline ldiv!(b, A, b)
 function ldiv!(c::AbstractVecOrMat, A::Bidiagonal, b::AbstractVecOrMat)
     require_one_based_indexing(c, A, b)
-    N = size(A, 2)
+    N = size(A, 1)
     mb, nb = size(b, 1), size(b, 2)
     if N != mb
-        throw(DimensionMismatch(lazy"second dimension of A, $N, does not match first dimension of b, $mb"))
+        dimstr = b isa AbstractVector ? "length" : "first dimension"
+        throw(DimensionMismatch(LazyString(lazy"the first dimension of the Bidiagonal matrix, $N, ",
+            lazy"does not match the $dimstr of the right-hand-side, $mb")))
     end
     mc, nc = size(c, 1), size(c, 2)
     if mc != mb || nc != nb
-        throw(DimensionMismatch(lazy"size of result, ($mc, $nc), does not match the size of b, ($mb, $nb)"))
+        throw(DimensionMismatch(lazy"size of result, $(size(c)), does not match the size of b, $(size(b))"))
     end
 
-    if N == 0
-        return copyto!(c, b)
-    end
+    N == 0 && return c # in this case c and b are also empty
 
     zi = findfirst(iszero, A.dv)
     isnothing(zi) || throw(SingularException(zi))

test/bidiag.jl

@@ -362,8 +362,9 @@ Random.seed!(1)
                     @test (x\T)::typediv ≈ x\TM
                     @test (T/x)::typediv ≈ TM/x
                     if !isa(x, Number)
-                        @test Array((T\x)::typediv2) ≈ Array(TM\x)
-                        @test Array((x/T)::typediv2) ≈ Array(x/TM)
+                        U = T.uplo == 'U' ? UpperTriangular : LowerTriangular
+                        @test Array((T\x)::typediv2) ≈ Array(U(TM)\x)
+                        @test Array((x/T)::typediv2) ≈ Array(x/U(TM))
                     end
                     return nothing
                 end
@@ -1180,4 +1181,15 @@ end
     @test !isreal(im*M)
 end
 
+@testset "ldiv! error message" begin
+    C = zeros(2)
+    B = Bidiagonal(1:0, 1:0, :U)
+    msg = "size of result, (2,), does not match the size of b, (0, 1)"
+    @test_throws msg ldiv!(C, B, zeros(0,1))
+    msg = "the first dimension of the Bidiagonal matrix, 0, does not match the length of the right-hand-side, 2"
+    @test_throws msg ldiv!(C, B, zeros(2))
+    msg = "the first dimension of the Bidiagonal matrix, 0, does not match the first dimension of the right-hand-side, 2"
+    @test_throws msg ldiv!(C, B, zeros(2,1))
+end
+
 end # module TestBidiagonal

test/runtests.jl

@@ -9,3 +9,18 @@ end
 @testset "Docstrings" begin
     @test isempty(Docs.undocumented_names(LinearAlgebra))
 end
+
+@testset "versioninfo" begin
+    vinfo = sprint(LinearAlgebra.versioninfo)
+    @test occursin("Threading:", vinfo)
+    @test occursin(r"Threads.threadpoolsize\(\) = [0-9]+", vinfo)
+    @test occursin(r"Threads.maxthreadid\(\) = [0-9]+", vinfo)
+    @test occursin(r"LinearAlgebra.BLAS.get_num_threads\(\) = [0-9]+", vinfo)
+    @test occursin("Relevant environment variables:", vinfo)
+    vars = strip(split(vinfo, "Relevant environment variables:")[end])
+    @test any(occursin(vars), [r"JULIA_NUM_THREADS = [0-9]+", r"MKL_DYNAMIC = [0-9]+",
+                r"MKL_NUM_THREADS = [0-9]+",
+                r"OPENBLAS_NUM_THREADS = [0-9]+",
+                r"GOTO_NUM_THREADS = [0-9]+",
+                r"OMP_NUM_THREADS = [0-9]+", r"\[none\]"])
+end