Skip to content

Commit 699e129

Browse files
ChrisRackauckasChrisRackauckas
committed
Make the much lighter ArrayInterfaceGPUArrays
Gives almost all GPU support in a pretty good way with almost no dependencies. I like it like that. fix project tomls
1 parent 763554d commit 699e129

File tree

10 files changed

+76
-34
lines changed

10 files changed

+76
-34
lines changed

‎Project.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "ArrayInterface"
22
uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
3-
version = "6.0.0"
3+
version = "5.3.0"
44

55
[deps]
66
ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"

‎lib/ArrayInterfaceCUDA/Project.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ version = "0.1.1"
66
[deps]
77
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
88
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
9+
ArrayInterfaceGPUArrays = "6ba088a2-8465-4c0a-af30-387133b534db"
910
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
1011

1112
[compat]
1213
Adapt = "3"
13-
ArrayInterface = "5"
14+
ArrayInterface = "5, 6"
15+
ArrayInterfaceGPUArrays = "0.1"
1416
CUDA = "3.9"
1517
julia = "1.6"
1618

‎lib/ArrayInterfaceCUDA/src/ArrayInterfaceCUDA.jl

+3-17
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,13 @@
11
module ArrayInterfaceCUDA
22

33
using Adapt
4-
using ArrayInterface
4+
using ArrayInterface, ArrayInterfaceGPUArrays
55
using CUDA
66

7-
ArrayInterface.fast_scalar_indexing(::Type{<:CUDA.CuArray}) = false
8-
@inline ArrayInterface.allowed_getindex(x::CUDA.CuArray, i...) = CUDA.@allowscalar(x[i...])
9-
@inline ArrayInterface.allowed_setindex!(x::CUDA.CuArray, v, i...) = (CUDA.@allowscalar(x[i...] = v))
10-
11-
function Base.setindex(x::CUDA.CuArray, v, i::Int)
12-
_x = copy(x)
13-
ArrayInterface.allowed_setindex!(_x, v, i)
14-
return _x
15-
end
16-
17-
function ArrayInterface.restructure(x::CUDA.CuArray, y)
18-
reshape(Adapt.adapt(ArrayInterface.parameterless_type(x), y), Base.size(x)...)
19-
end
20-
21-
ArrayInterface.device(::Type{<:CUDA.CuArray}) = ArrayInterface.GPU()
22-
237
function ArrayInterface.lu_instance(A::CuMatrix{T}) where {T}
248
CUDA.CUSOLVER.CuQR(similar(A, 0, 0), similar(A, 0))
259
end
2610

11+
ArrayInterface.device(::Type{<:CUDA.CuArray}) = ArrayInterface.GPU()
12+
2713
end # module

‎lib/ArrayInterfaceGPUArrays/LICENSE

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2022 SciML
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎lib/ArrayInterfaceGPUArrays/Project.toml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name = "ArrayInterfaceGPUArrays"
2+
uuid = "6ba088a2-8465-4c0a-af30-387133b534db"
3+
authors = ["Zachary P. Christensen <[email protected]>"]
4+
version = "0.1.0"
5+
6+
[deps]
7+
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
8+
ArrayInterfaceCore = "30b0a656-2188-435a-8636-2ec0e6a096e2"
9+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
10+
GPUArrays = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
11+
12+
[compat]
13+
Adapt = "3"
14+
ArrayInterfaceCore = "0.1.1"
15+
GPUArrays = "8"
16+
julia = "1.6"
17+

‎lib/ArrayInterfaceGPUArrays/src/ArrayInterfaceGPUArrays.jl

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
module ArrayInterfaceGPUArrays
2+
3+
using Adapt
4+
using ArrayInterface
5+
using GPUArrays
6+
7+
ArrayInterface.fast_scalar_indexing(::Type{<:GPUArrays.AbstractGPUArray}) = false
8+
@inline ArrayInterface.allowed_getindex(x::GPUArrays.AbstractGPUArray, i...) = CUDA.@allowscalar(x[i...])
9+
@inline ArrayInterface.allowed_setindex!(x::GPUArrays.AbstractGPUArray, v, i...) = (CUDA.@allowscalar(x[i...] = v))
10+
11+
function Base.setindex(x::GPUArrays.AbstractGPUArray, v, i::Int)
12+
_x = copy(x)
13+
ArrayInterface.allowed_setindex!(_x, v, i)
14+
return _x
15+
end
16+
17+
function ArrayInterface.restructure(x::GPUArrays.AbstractGPUArray, y)
18+
reshape(Adapt.adapt(ArrayInterface.parameterless_type(x), y), Base.size(x)...)
19+
end
20+
21+
function ArrayInterface.lu_instance(A::GPUArrays.AbstractGPUMatrix{T}) where {T}
22+
qr(similar(A, 1, 1))
23+
end
24+
25+
# Doesn't do much, but makes a gigantic change to the dependency chain.
26+
# ArrayInterface.device(::Type{<:GPUArrays.AbstractGPUArray}) = ArrayInterface.GPU()
27+
28+
end

‎lib/ArrayInterfaceGPUArrays/test/runtests.jl

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
using ArrayInterfaceGPUArrays

‎lib/ArrayInterfaceOffsetArrays/Project.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
88
Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
99

1010
[compat]
11-
ArrayInterface = "5"
11+
ArrayInterface = "5, 6"
1212
OffsetArrays = "1.11"
1313
Static = "0.6"
1414
julia = "1.6"

‎src/ArrayInterface.jl

-13
Original file line numberDiff line numberDiff line change
@@ -101,19 +101,6 @@ has_parent(::Type{T}) where {T} = _has_parent(parent_type(T), T)
101101
_has_parent(::Type{T}, ::Type{T}) where {T} = False()
102102
_has_parent(::Type{T1}, ::Type{T2}) where {T1,T2} = True()
103103

104-
"""
105-
device(::Type{T}) -> AbstractDevice
106-
107-
Indicates the most efficient way to access elements from the collection in low-level code.
108-
For `GPUArrays`, will return `ArrayInterface.GPU()`.
109-
For `AbstractArray` supporting a `pointer` method, returns `ArrayInterface.CPUPointer()`.
110-
For other `AbstractArray`s and `Tuple`s, returns `ArrayInterface.CPUIndex()`.
111-
Otherwise, returns `nothing`.
112-
"""
113-
device(A) = device(typeof(A))
114-
device(::Type) = nothing
115-
device(::Type{<:Tuple}) = CPUTuple()
116-
device(::Type{T}) where {T<:Array} = CPUPointer()
117104
device(::Type{T}) where {T<:AbstractArray} = _device(has_parent(T), T)
118105
function _device(::True, ::Type{T}) where {T}
119106
if defines_strides(T)

‎test/runtests.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ end
2121

2222
groups = if GROUP == "All"
2323
["ArrayInterfaceCore", "ArrayInterface", "ArrayInterfaceBandedMatrices", "ArrayInterfaceBlockBandedMatrices",
24-
"ArrayInterfaceCUDA", "ArrayInterfaceOffsetArrays", "ArrayInterfaceStaticArrays"]
24+
"ArrayInterfaceOffsetArrays", "ArrayInterfaceStaticArrays",]
2525
else
2626
[GROUP]
2727
end

0 commit comments

Comments
 (0)