Skip to content

Commit 4daacd7

Browse files
authored
Merge pull request #4 from Tokazama/main
Include ArrayInterface's sub libraries for OffsetArrays and StaticArrays
2 parents 302ddf2 + 4488910 commit 4daacd7

File tree

5 files changed

+15
-4
lines changed

5 files changed

+15
-4
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
version:
13-
- '1.5'
13+
- '1.6'
1414
- '1'
1515
- 'nightly'
1616
os:

Project.toml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
11
name = "LayoutPointers"
22
uuid = "10f19ff3-798f-405d-979b-55457f8fc047"
33
authors = ["chriselrod <[email protected]> and contributors"]
4-
version = "0.1.8"
4+
version = "0.1.9"
55

66
[deps]
77
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
8+
ArrayInterfaceOffsetArrays = "015c0d05-e682-4f19-8f0a-679ce4c54826"
9+
ArrayInterfaceStaticArrays = "b0d46f97-bff5-4637-a19a-dd75974142cd"
810
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
911
ManualMemory = "d125e4d3-2237-4719-b19c-fa641b8a4667"
1012
SIMDTypes = "94e857df-77ce-4151-89e5-788b33177be4"
1113
Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
1214

1315
[compat]
1416
ArrayInterface = "3.1.24, 4, 5, 6"
17+
ArrayInterfaceOffsetArrays = "0.1"
18+
ArrayInterfaceStaticArrays = "0.1"
1519
ManualMemory = "0.1.6"
1620
SIMDTypes = "0.1"
1721
Static = "0.3, 0.4, 0.5, 0.6"
18-
julia = "1.5"
22+
julia = "1.6"
1923

2024
[extras]
2125
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
2226
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
27+
ArrayInterfaceOffsetArrays = "015c0d05-e682-4f19-8f0a-679ce4c54826"
2328
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
2429

2530
[targets]

scratch.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Pkg.activate(".")
2+
Pkg.develop(path="../Static-proposals/Static.jl/")
3+
using LayoutPointers

src/LayoutPointers.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ module LayoutPointers
22

33
using ArrayInterface, Static, LinearAlgebra
44
using ArrayInterface: CPUPointer, StrideIndex, offsets
5+
using ArrayInterfaceOffsetArrays
6+
using ArrayInterfaceStaticArrays
57
using SIMDTypes: Bit, FloatingTypes, IntegerTypesHW
68
using Static: Zero, One
79
using ArrayInterface:

test/runtests.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using LayoutPointers, ArrayInterface, Aqua, Test
1+
using LayoutPointers, ArrayInterface, ArrayInterfaceOffsetArrays, Aqua, Test
22

33
@testset "LayoutPointers.jl" begin
44
Aqua.test_all(LayoutPointers, deps_compat = VERSION <= v"1.8" || VERSION.prerelease[1] != "DEV")
@@ -12,6 +12,7 @@ using LayoutPointers, ArrayInterface, Aqua, Test
1212
struct SizedWrapper{M,N,T,AT<:AbstractMatrix{T}} <: AbstractMatrix{T}
1313
A::AT
1414
end
15+
ArrayInterface.is_forwarding_wrapper(::Type{<:SizedWrapper}) = true
1516
SizedWrapper{M,N}(A::AT) where {M,N,T,AT<:AbstractMatrix{T}} = SizedWrapper{M,N,T,AT}(A)
1617
Base.size(::SizedWrapper{M,N}) where {M,N} = (M, N)
1718
Base.getindex(A::SizedWrapper, i...) = getindex(parent(A), i...)

0 commit comments

Comments
 (0)