Merge pull request #23 from SciML/core

Change to ArrayInterfaceCore

Author: ChrisRackauckas

Project.toml

@@ -5,13 +5,13 @@ version = "0.3.0"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
-ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
+ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800"
 
 [compat]
 Adapt = "3"
-ArrayInterface = "3, 5"
+ArrayInterfaceCore = "0.1.1"
 ForwardDiff = "0.10.3"
 LabelledArrays = "1"
 julia = "1.6"

src/PreallocationTools.jl

@@ -1,14 +1,14 @@
 module PreallocationTools
 
-using ForwardDiff, ArrayInterface, LabelledArrays, Adapt
+using ForwardDiff, ArrayInterfaceCore, LabelledArrays, Adapt
 
 struct DiffCache{T<:AbstractArray, S<:AbstractArray}
     du::T
     dual_du::S
 end
 
 function DiffCache(u::AbstractArray{T}, siz, chunk_sizes) where {T}
-    x = adapt(ArrayInterface.parameterless_type(u), zeros(T, prod(chunk_sizes .+ 1)*prod(siz)))
+    x = adapt(ArrayInterfaceCore.parameterless_type(u), zeros(T, prod(chunk_sizes .+ 1)*prod(siz)))
     DiffCache(u, x)
 end
 
@@ -40,23 +40,23 @@ function get_tmp(dc::DiffCache, u::T) where T<:ForwardDiff.Dual
     if nelem > length(dc.dual_du)
         enlargedualcache!(dc, nelem)
     end
-    ArrayInterface.restructure(dc.du, reinterpret(T, view(dc.dual_du, 1:nelem)))
+    ArrayInterfaceCore.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)))*length(dc.du)
     if nelem > length(dc.dual_du)
         enlargedualcache!(dc, nelem)
     end
-    ArrayInterface.restructure(dc.du, reinterpret(T, view(dc.dual_du, 1:nelem)))
+    ArrayInterfaceCore.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)))*length(dc.du)
     if nelem > length(dc.dual_du)
         enlargedualcache!(dc, nelem)
     end
-    _x = ArrayInterface.restructure(dc.du, reinterpret(T, view(dc.dual_du, 1:nelem)))
+    _x = ArrayInterfaceCore.restructure(dc.du, reinterpret(T, view(dc.dual_du, 1:nelem)))
     LabelledArrays.LArray{T,N,D,Syms}(_x)
 end
 

test/gpu_all.jl

@@ -1,4 +1,4 @@
-using LinearAlgebra, OrdinaryDiffEq, Test, PreallocationTools, CUDA, ForwardDiff, ArrayInterface
+using LinearAlgebra, OrdinaryDiffEq, Test, PreallocationTools, CUDA, ForwardDiff, ArrayInterfaceCore
 
 #Dispatch tests
 chunk_size = 5
@@ -10,7 +10,7 @@ tmp_du_CUA = get_tmp(cache_CU, u0_CU)
 tmp_dual_du_CUA = get_tmp(cache_CU, dual_CU)
 tmp_du_CUN = get_tmp(cache_CU, 0.0)
 tmp_dual_du_CUN = get_tmp(cache_CU, dual_N)
-@test ArrayInterface.parameterless_type(typeof(cache_CU.dual_du)) == ArrayInterface.parameterless_type(typeof(u0_CU)) #check that dual cache array is a GPU array for performance reasons.
+@test ArrayInterfaceCore.parameterless_type(typeof(cache_CU.dual_du)) == ArrayInterfaceCore.parameterless_type(typeof(u0_CU)) #check that dual cache array is a GPU array for performance reasons.
 @test size(tmp_du_CUA) == size(u0_CU)                
 @test typeof(tmp_du_CUA) == typeof(u0_CU)
 @test eltype(tmp_du_CUA) == eltype(u0_CU)