Merge pull request #8 from ChrisRackauckas/arrayinterface

update to StaticArrayInterface

Author: chriselrod

.github/workflows/CI.yml

@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.2'
+          - '1.6'
           - '1'
           - 'nightly'
         os:

Project.toml

@@ -4,13 +4,13 @@ authors = ["chriselrod <[email protected]> and contributors"]
 version = "0.1.12"
 
 [deps]
-ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
 Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
+StaticArrayInterface = "0d7ed370-da01-4f52-bd93-41d350b8b718"
 
 [compat]
-ArrayInterface = "3.1.33, 4, 5, 6"
 Static = "0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8"
-julia = "1.2"
+StaticArrayInterface = "1"
+julia = "1.6"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

src/CloseOpenIntervals.jl

@@ -77,17 +77,17 @@ SafeCloseOpen
 @inline Base.iterate(r::SafeCloseOpen) = (i = Int(first(r)); i ≥ getfield(r, :upper) ? nothing : (i, i))
 @inline Base.iterate(r::AbstractCloseOpen, i::IntegerType) = (i += one(i)) ≥ getfield(r, :upper) ? nothing : (i, i)
 
-import ArrayInterface
-ArrayInterface.known_first(::Type{<:AbstractCloseOpen{StaticInt{F}}}) where {F} = F
-ArrayInterface.known_step(::Type{<:AbstractCloseOpen}) = 1
-ArrayInterface.known_last(::Type{<:AbstractCloseOpen{<:Any,StaticInt{L}}}) where {L} = L - 1
-ArrayInterface.known_length(::Type{<:AbstractCloseOpen{StaticInt{F},StaticInt{L}}}) where {F,L} = L - F
+import StaticArrayInterface
+StaticArrayInterface.known_first(::Type{<:AbstractCloseOpen{StaticInt{F}}}) where {F} = F
+StaticArrayInterface.known_step(::Type{<:AbstractCloseOpen}) = 1
+StaticArrayInterface.known_last(::Type{<:AbstractCloseOpen{<:Any,StaticInt{L}}}) where {L} = L - 1
+StaticArrayInterface.known_length(::Type{<:AbstractCloseOpen{StaticInt{F},StaticInt{L}}}) where {F,L} = L - F
 
 Base.IteratorSize(::Type{<:AbstractCloseOpen}) = Base.HasShape{1}()
 Base.IteratorEltype(::Type{<:AbstractCloseOpen}) = Base.HasEltype()
 @inline Base.size(r::AbstractCloseOpen) = (length(r),)
 @inline Base.eltype(r::AbstractCloseOpen) = Int
-@inline Base.eachindex(r::AbstractCloseOpen) = StaticInt(1):ArrayInterface.static_length(r)
+@inline Base.eachindex(r::AbstractCloseOpen) = StaticInt(1):StaticArrayInterface.static_length(r)
 
 @static if isdefined(Base.IteratorsMD, :OrdinalRangeInt)
   @inline function Base.IteratorsMD.__inc(state::Tuple{Int,Int,Vararg{Int}}, indices::Tuple{AbstractCloseOpen,Vararg{Base.IteratorsMD.OrdinalRangeInt}})

test/runtests.jl

@@ -1,15 +1,15 @@
 using CloseOpenIntervals
 using Test
 
-function mysum2(X = CartesianIndices((SafeCloseOpen(10),SafeCloseOpen(10))))
+function mysum2(X = CartesianIndices((SafeCloseOpen(10), SafeCloseOpen(10))))
   s = 0
   for I in X
     s += sum(Tuple(I))
   end
   s
 end
 mysum2_allocated() = @allocated(mysum2())
-const ArrayInterface = CloseOpenIntervals.ArrayInterface
+const ArrayInterface = CloseOpenIntervals.StaticArrayInterface
 @testset "CloseOpenIntervals.jl" begin
   function mysum(x, N)
     s = zero(eltype(x))
@@ -25,17 +25,19 @@ const ArrayInterface = CloseOpenIntervals.ArrayInterface
     end
     s
   end
-  x = rand(128);
+  x = rand(128)
   for n ∈ 1:128
-    @test mysum(x,n) ≈ mysafesum(x,n) ≈ sum(view(x,1:n))
+    @test mysum(x, n) ≈ mysafesum(x, n) ≈ sum(view(x, 1:n))
     @test length(CloseOpen(n)) == n
   end
-  @test @inferred(mysum(x,0)) == first(x)
-  @test @inferred(mysafesum(x,0)) == 0.0
+  @test @inferred(mysum(x, 0)) == first(x)
+  @test @inferred(mysafesum(x, 0)) == 0.0
   @test @inferred(mysum(x, CloseOpenIntervals.StaticInt(128))) ≈ sum(x)
-  @test @inferred(ArrayInterface.static_length(CloseOpen(CloseOpenIntervals.StaticInt(128)))) === CloseOpenIntervals.StaticInt(128)
+  @test @inferred(
+    ArrayInterface.static_length(CloseOpen(CloseOpenIntervals.StaticInt(128)))
+  ) === CloseOpenIntervals.StaticInt(128)
   @test @inferred(eltype(CloseOpen(7))) === Int
   @test ArrayInterface.known_length(CloseOpen(CloseOpenIntervals.StaticInt(128))) == 128
-  @test @inferred(mysum2()) == sum(0:9)*2*length(0:9)
+  @test @inferred(mysum2()) == sum(0:9) * 2 * length(0:9)
   @test mysum2_allocated() == 0
 end