Merge remote-tracking branch 'upstream/main' into vcat_shaped_axis

Author: dingraha

Project.toml

@@ -1,14 +1,13 @@
 name = "ComponentArrays"
 uuid = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66"
 authors = ["Jonnie Diegelman <[email protected]>"]
-version = "0.15.24"
+version = "0.15.26"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
 ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
-ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 Functors = "d9f16b24-f501-4c13-a1f2-28368ffc5196"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 StaticArrayInterface = "0d7ed370-da01-4f52-bd93-41d350b8b718"
@@ -41,7 +40,6 @@ Adapt = "4.1"
 ArrayInterface = "7.17.1"
 ChainRulesCore = "1.25"
 ConstructionBase = "1"
-ForwardDiff = "0.10.36"
 Functors = "0.4.12, 0.5"
 GPUArrays = "10.3.1, 11"
 KernelAbstractions = "0.9.29"

src/componentarray.jl

@@ -255,6 +255,10 @@ function maybe_reshape(data, axs::AbstractAxis...)
     return reshape(data, shapes)
 end
 
+function Base.reshape(parent::AbstractArray, dims::ComponentArrays.CombinedAxis...)
+    reshape(parent, getfield.(dims, :array_axis))
+end
+
 # Recurse through nested ViewAxis types to find the last index
 last_index(x) = last(x)
 last_index(x::ViewAxis) = last_index(viewindex(x))

test/Project.toml

@@ -1,4 +1,5 @@
 [deps]
+Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
 ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"

test/formalities.jl

@@ -0,0 +1,4 @@
+using ComponentArrays
+using Aqua
+
+Aqua.test_all(ComponentArrays, ambiguities=false, unbound_args=false)

test/runtests.jl

@@ -11,6 +11,8 @@ using Test
 using Unitful
 using Functors
 
+include("formalities.jl")
+
 # Convert abstract unit range to a ViewAxis with ShapeAxis.
 r2v(r::AbstractUnitRange) = ViewAxis(r, ShapedAxis(size(r)))
 
@@ -306,7 +308,10 @@ end
     @test cmat3[:c, :b] == reshape(cmat3check[6:11, 2:5], 3, 2, 4)
     @test cmat3[:c, :c] == reshape(cmat3check[6:11, 6:11], 3, 2, 3, 2)
 
-    @test_broken reshape(a, axes(ca)...) isa Vector{Float64}
+    # https://discourse.julialang.org/t/no-method-error-reshape-when-solving-ode-with-componentarrays-jl/126342
+    x = ComponentVector(x=1.0, y=0.0, z=0.0)
+    @test reshape(x, axes(x)...) isa ComponentVector
+    @test reshape(a, axes(ca)...) isa Vector{Float64}
 
     # Issue #265: Multi-symbol indexing with matrix components
     @test ca2.c[[:a, :b]].b isa AbstractMatrix