Merge branch 'master' into pull-request/fb369658

Author: TsurHerman

REQUIRE

@@ -1 +1 @@
-julia 0.6.0-pre
+julia 0.6.0

src/StaticArrays.jl

@@ -8,7 +8,7 @@ import Base: getindex, setindex!, size, similar, vec, show,
              length, convert, promote_op, promote_rule, map, map!, reduce, reducedim, mapreducedim,
              mapreduce, broadcast, broadcast!, conj, transpose, ctranspose,
              hcat, vcat, ones, zeros, eye, one, cross, vecdot, reshape, fill,
-             fill!, det, logdet, inv, eig, eigvals, expm, logm, sqrtm, lyap, trace, diag, vecnorm, norm, dot, diagm, diag,
+             fill!, det, logdet, inv, eig, eigvals, expm, logm, sqrtm, lyap, trace, kron, diag, vecnorm, norm, dot, diagm, diag,
              lu, svd, svdvals, svdfact, factorize, ishermitian, issymmetric, isposdef,
              sum, diff, prod, count, any, all, minimum,
              maximum, extrema, mean, copy, rand, randn, randexp, rand!, randn!,

src/linalg.jl

@@ -317,6 +317,21 @@ end
     end
 end
 
+const _length_limit = Length(200)
+
+@inline kron(a::StaticMatrix, b::StaticMatrix) = _kron(_length_limit, Size(a), Size(b), a, b)
+@generated function _kron(::Length{length_limit}, ::Size{SA}, ::Size{SB}, a, b) where {length_limit,SA,SB}
+    outsize = SA .* SB
+    if prod(outsize) > length_limit
+        return :( SizedMatrix{$(outsize[1]),$(outsize[2])}( kron(drop_sdims(a), drop_sdims(b)) ) )
+    end
+    rows = [:(hcat($([:(a[$(sub2ind(SA,i,j))]*b) for j=1:SA[2]]...))) for i=1:SA[1]]
+    return quote
+        @_inline_meta
+        @inbounds return vcat($(rows...))
+    end
+end
+
 @inline Size(::Union{RowVector{T, SA}, Type{RowVector{T, SA}}}) where {T, SA <: StaticArray} = Size(1, Size(SA)[1])
 @inline Size(::Union{RowVector{T, CA}, Type{RowVector{T, CA}}} where CA <: ConjVector{<:Any, SA}) where {T, SA <: StaticArray} = Size(1, Size(SA)[1])
 @inline Size(::Union{Symmetric{T,SA}, Type{Symmetric{T,SA}}}) where {T,SA<:StaticArray} = Size(SA)

src/util.jl

@@ -59,3 +59,34 @@ end
 
     return nothing
 end
+
+
+# Trivial view used to drop static dimensions to override dispatch
+struct TrivialView{A,T,N} <: AbstractArray{T,N}
+    a::A
+end
+
+size(a::TrivialView) = size(a.a)
+getindex(a::TrivialView, inds...) = getindex(a.a, inds...)
+setindex!(a::TrivialView, inds...) = setindex!(a.a, inds...)
+Base.IndexStyle(::Type{<:TrivialView{A}}) where {A} = IndexStyle(A)
+
+TrivialView(a::AbstractArray{T,N}) where {T,N} = TrivialView{typeof(a),T,N}(a)
+
+
+# Remove the static dimensions from an array
+
+"""
+    drop_sdims(a)
+
+Return an `AbstractArray` with the same elements as `a`, but with static
+dimensions removed (ie, not a `StaticArray`).
+
+This is useful if you want to override dispatch to call the `Base` version of
+operations such as `kron` instead of the implementation in `StaticArrays`.
+Normally you shouldn't need to do this, but it can be more efficient for
+certain algorithms where the number of elements of the output is a lot larger
+than the input.
+"""
+@inline drop_sdims(a::StaticArray) = TrivialView(a)
+@inline drop_sdims(a) = a

test/SizedArray.jl

@@ -68,6 +68,8 @@
         @test convert(Vector, SizedArray{Tuple{4}, Int, 1}(collect(3:6))) == collect(3:6)
         @test Matrix(SMatrix{2,2}((1,2,3,4))) == [1 3; 2 4]
         @test convert(Matrix, SMatrix{2,2}((1,2,3,4))) == [1 3; 2 4]
+        # Conversion after reshaping
+        @test_broken Array(SizedMatrix{2,2}([1,2,3,4])) == [1 3; 2 4]
     end
 
     @testset "promotion" begin

test/inv.jl

@@ -70,6 +70,14 @@ end
     @test_broken norm(Matrix(sm*inv(sm) - eye(4))) < 10*norm(m*inv(m) - eye(4))
 end
 
+@testset "Matrix inverse 5x5" begin
+    m = randn(Float64, 5,5) + eye(5)
+    @test inv(SMatrix{5,5}(m))::StaticMatrix ≈ inv(m)
+    m = triu(randn(Float64, 5,5) + eye(5))
+    @test inv(SMatrix{5,5}(m))::StaticMatrix ≈ inv(m)
+    m = tril(randn(Float64, 5,5) + eye(5))
+    @test inv(SMatrix{5,5}(m))::StaticMatrix ≈ inv(m)
+end
 
 #-------------------------------------------------------------------------------
 # More comprehensive but qualitiative testing for inv() accuracy

test/linalg.jl

@@ -149,4 +149,19 @@ using StaticArrays, Base.Test
         @test vecnorm(SVector{0, Float64}(()), 1) === 0.
         @test trace(SMatrix{0,0,Float64}(())) === 0.
     end
+
+    @testset "kron" begin
+        @test @inferred(kron(@SMatrix([1 2; 3 4]), @SMatrix([0 1 0; 1 0 1]))) ==
+            SMatrix{4,6,Int}([0 1 0 0 2 0;
+                              1 0 1 2 0 2;
+                              0 3 0 0 4 0;
+                              3 0 3 4 0 4])
+        @test @inferred(kron(@SMatrix([1 2; 3 4]), @SMatrix([2.0]))) === @SMatrix [2.0 4.0; 6.0 8.0]
+
+        # Output should be heap allocated into a SizedArray when it gets large
+        # enough.
+        M1 = collect(1:20)
+        M2 = collect(20:-1:1).'
+        @test @inferred(kron(SMatrix{20,1}(M1),SMatrix{1,20}(M2)))::SizedMatrix{20,20} == kron(M1,M2)
+    end
 end

test/runtests.jl

@@ -31,6 +31,7 @@ include("eigen.jl")
 include("expm.jl")
 include("sqrtm.jl")
 include("lyap.jl")
+include("lu.jl")
 include("chol.jl")
 include("deque.jl")
 include("io.jl")

test/util.jl

@@ -0,0 +1,20 @@
+using StaticArrays, Base.Test
+
+import StaticArrays: drop_sdims
+
+@testset "util" begin
+    @test !(drop_sdims(SVector(1,2)) isa StaticArray)
+    @test !(drop_sdims([1,2]) isa StaticArray)
+    @test !(drop_sdims(SizedVector{2}([1,2])) isa StaticArray)
+
+    @test drop_sdims(SVector(1,2)) == SVector(1,2)
+    @test drop_sdims(@SMatrix [1 2; 3 4]) == [1 2; 3 4]
+    # Check this works for SizedArray where it's tempting to *unwrap* rather
+    # than add an extra wrapper.  Currently unwrapping doesn't work due to
+    # reshaping issues.
+    @test drop_sdims(SizedMatrix{2,2}([1 2; 3 4])) == [1 2; 3 4]
+    @test drop_sdims(SizedMatrix{2,3}([1 4;
+                                       2 5;
+                                       3 6])) == [1 3 5;
+                                                  2 4 6]
+end