re-introduced ArrayInterface.restructure

Author: thomvet

Project.toml

@@ -4,10 +4,12 @@ authors = ["Chris Rackauckas <accounts@chrisrackauckas.com>"]
 version = "0.1.1"
 
 [deps]
+ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800"
 
 [compat]
+ArrayInterface = "2.6, 3.0"
 ForwardDiff = "0.10.3"
 LabelledArrays = "1"
 julia = "1.6"

src/PreallocationTools.jl

@@ -1,24 +1,23 @@
 module PreallocationTools
 
-using ForwardDiff, LabelledArrays
+using ForwardDiff, ArrayInterface, LabelledArrays
 
 struct DiffCache{T<:AbstractArray, S<:AbstractArray}
     du::T
     dual_du::S
 end
 
-#= removed dependency on ArrayInterface, because it seemed not necessary anymore; 
-not sure whether it breaks things that are not in the testset; needs checking. =#
 function DiffCache(u::AbstractArray{T}, siz, ::Type{Val{chunk_size}}) where {T, chunk_size}
-    x = zeros(T,(chunk_size+1)*prod(siz)) 
+    x = zeros(T,(chunk_size+1)*prod(siz))  
     DiffCache(u, x)
 end
 
 """
 
 `dualcache(u::AbstractArray, N = Val{default_cache_size(length(u))})`
 
-Builds a `DualCache` object that stores versions of the cache for `u` and for the `Dual` version of `u` allowing use of pre-cached arrays with
+Builds a `DualCache` object that stores both a version of the cache for `u`
+and for the `Dual` version of `u`, allowing use of pre-cached vectors with
 forward-mode automatic differentiation.
 
 """
@@ -33,17 +32,17 @@ Returns the `Dual` or normal cache array stored in `dc` based on the type of `u`
 """
 function get_tmp(dc::DiffCache, u::T) where T<:ForwardDiff.Dual
   nelem = div(sizeof(T), sizeof(eltype(dc.dual_du)))*prod(size(dc.du))
-  reshape(reinterpret(T, view(dc.dual_du, 1:nelem)), size(dc.du))
+  ArrayInterface.restructure(dc.du, reinterpret(T, view(dc.dual_du, 1:nelem)))
 end
 
 function get_tmp(dc::DiffCache, u::AbstractArray{T}) where T<:ForwardDiff.Dual
     nelem = div(sizeof(T), sizeof(eltype(dc.dual_du)))*prod(size(dc.du))
-    reshape(reinterpret(T, view(dc.dual_du, 1:nelem)), size(dc.du))
+    ArrayInterface.restructure(dc.du, reinterpret(T, view(dc.dual_du, 1:nelem)))
 end
 
 function get_tmp(dc::DiffCache, u::LabelledArrays.LArray{T,N,D,Syms}) where {T,N,D,Syms}
     nelem = div(sizeof(T), sizeof(eltype(dc.dual_du)))*prod(size(dc.du))
-    _x = reshape(reinterpret(T, view(dc.dual_du, 1:nelem)), size(dc.du))
+    _x = ArrayInterface.restructure(dc.du, reinterpret(T, view(dc.dual_du, 1:nelem)))
     LabelledArrays.LArray{T,N,D,Syms}(_x)
 end