Merge pull request #95 from SciML/densedimsubarrayfix

Added SubArrays indexed by vector support.

Author: chriselrod

src/ArrayInterface.jl

@@ -760,6 +760,7 @@ function __init__()
         end
         t
     end
+    parent_type(::Type{<:StaticArrays.SizedArray{S, T, M, N, A}}) where {S,T,M,N,A} = A
     @require Adapt="79e6a3ab-5dfb-504d-930d-738a2a938a0e" begin
       function Adapt.adapt_storage(::Type{<:StaticArrays.SArray{S}},xs::Array) where S
           StaticArrays.SArray{S}(xs)

src/stridelayout.jl

@@ -231,11 +231,11 @@ _dense_dims(::Any, ::Any) = nothing
     end
     dense_tup = Expr(:tuple)
     for np in 1:NP
-        spₙ = sp[np]
-        if I.parameters[np] <: Base.Slice
-            push!(dense_tup.args, densev[np])
-        elseif I.parameters[np] <: AbstractUnitRange
+        Iₙₚ = I.parameters[np]
+        if Iₙₚ <: AbstractUnitRange
             push!(dense_tup.args, densev[np])
+        elseif Iₙₚ <: AbstractVector
+            push!(dense_tup.args, false)
         end
     end
     # If n != N, then an axis was indexed by something other than an integer or `AbstractUnitRange`, so we return `nothing`.

test/runtests.jl

@@ -351,6 +351,9 @@ Base.getindex(::DummyZeros{T}, inds...) where {T} = zero(T)
     @test @inferred(dense_dims(@view(PermutedDimsArray(A,(3,1,2))[2:3,2,:]))) === ArrayInterface.DenseDims((false,false))
     @test @inferred(dense_dims(@view(PermutedDimsArray(A,(3,1,2))[2:3,2,:])')) === ArrayInterface.DenseDims((false,false))
     @test @inferred(dense_dims(@view(PermutedDimsArray(A,(3,1,2))[:,1:2,1])')) === ArrayInterface.DenseDims((true,false))
+    @test @inferred(dense_dims(@view(PermutedDimsArray(A,(3,1,2))[2:3,:,[1,2]]))) === ArrayInterface.DenseDims((false,true,false))
+    @test @inferred(dense_dims(@view(PermutedDimsArray(A,(3,1,2))[2:3,[1,2,3],:]))) === ArrayInterface.DenseDims((false,false,false))
+
 
     B = Array{Int8}(undef, 2,2,2,2);
     doubleperm = PermutedDimsArray(PermutedDimsArray(B,(4,2,3,1)), (4,2,1,3));