Skip to content

Remove GPUArrays dependency #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anicusan merged 4 commits into from
May 17, 2025
Merged

Remove GPUArrays dependency #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8ce32c
Remove GPUArrays dependency
christiangnrd May 12, 2025
4f6bb7f
Fix
christiangnrd May 12, 2025
e826472
test
christiangnrd May 12, 2025
2d770d1
Revert "test"
christiangnrd May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version = "0.3.4"

[deps]
ArgCheck = "dce04be8-c92d-5529-be00-80e4d2c0e197"
GPUArrays = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
GPUArraysCore = "46192b85-c4d5-4398-a991-12ede77f4527"
KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
OhMyThreads = "67456a42-1dca-4109-a031-0a68de7e3ad5"
Expand All @@ -21,7 +21,7 @@ AcceleratedKernelsoneAPIExt = "oneAPI"

[compat]
ArgCheck = "2"
GPUArrays = "10, 11"
GPUArraysCore = "0.2.0"
KernelAbstractions = "0.9.34"
Markdown = "1"
Metal = "1"
Expand Down
3 changes: 1 addition & 2 deletions src/AcceleratedKernels.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module AcceleratedKernels

# Internal dependencies
using ArgCheck: @argcheck
using GPUArrays: GPUArrays, AbstractGPUVector, AbstractGPUArray, @allowscalar
using GPUArraysCore: AbstractGPUVector, AbstractGPUArray, @allowscalar
using KernelAbstractions
using Polyester: @batch
import OhMyThreads as OMT
Expand All @@ -21,7 +21,6 @@ import OhMyThreads as OMT
# Exposed functions from upstream packages
const synchronize = KernelAbstractions.synchronize
const get_backend = KernelAbstractions.get_backend
const neutral_element = GPUArrays.neutral_element


# Include code from other files
Expand Down
14 changes: 7 additions & 7 deletions src/accumulate/accumulate.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ include("accumulate_cpu.jl")
accumulate!(
op, v::AbstractArray, backend::Backend=get_backend(v);
init,
neutral=GPUArrays.neutral_element(op, eltype(v)),
neutral=neutral_element(op, eltype(v)),
dims::Union{Nothing, Int}=nothing,
inclusive::Bool=true,

Expand All @@ -47,7 +47,7 @@ include("accumulate_cpu.jl")
accumulate!(
op, dst::AbstractArray, src::AbstractArray, backend::Backend=get_backend(v);
init,
neutral=GPUArrays.neutral_element(op, eltype(dst)),
neutral=neutral_element(op, eltype(dst)),
dims::Union{Nothing, Int}=nothing,
inclusive::Bool=true,

Expand Down Expand Up @@ -117,7 +117,7 @@ AK.accumulate!(+, v, alg=AK.ScanPrefixes())
function accumulate!(
op, v::AbstractArray, backend::Backend=get_backend(v);
init,
neutral=GPUArrays.neutral_element(op, eltype(v)),
neutral=neutral_element(op, eltype(v)),
dims::Union{Nothing, Int}=nothing,
inclusive::Bool=true,

Expand All @@ -141,7 +141,7 @@ end
function accumulate!(
op, dst::AbstractArray, src::AbstractArray, backend::Backend=get_backend(v);
init,
neutral=GPUArrays.neutral_element(op, eltype(dst)),
neutral=neutral_element(op, eltype(dst)),
dims::Union{Nothing, Int}=nothing,
inclusive::Bool=true,

Expand All @@ -166,7 +166,7 @@ end
function _accumulate_impl!(
op, v::AbstractArray, backend::Backend;
init,
neutral=GPUArrays.neutral_element(op, eltype(v)),
neutral=neutral_element(op, eltype(v)),
dims::Union{Nothing, Int}=nothing,
inclusive::Bool=true,

Expand Down Expand Up @@ -211,7 +211,7 @@ end
accumulate(
op, v::AbstractArray, backend::Backend=get_backend(v);
init,
neutral=GPUArrays.neutral_element(op, eltype(v)),
neutral=neutral_element(op, eltype(v)),
dims::Union{Nothing, Int}=nothing,
inclusive::Bool=true,

Expand All @@ -229,7 +229,7 @@ Out-of-place version of [`accumulate!`](@ref).
function accumulate(
op, v::AbstractArray, backend::Backend=get_backend(v);
init,
neutral=GPUArrays.neutral_element(op, eltype(v)),
neutral=neutral_element(op, eltype(v)),
dims::Union{Nothing, Int}=nothing,
inclusive::Bool=true,

Expand Down
2 changes: 1 addition & 1 deletion src/accumulate/accumulate_nd.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ end
function accumulate_nd!(
op, v::AbstractArray, backend::GPU;
init,
neutral=GPUArrays.neutral_element(op, eltype(v)),
neutral=neutral_element(op, eltype(v)),
dims::Int,
inclusive::Bool=true,

Expand Down
2 changes: 1 addition & 1 deletion src/reduce/mapreduce_1d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ end
function mapreduce_1d(
f, op, src::AbstractArray, backend::GPU;
init,
neutral=GPUArrays.neutral_element(op, eltype(src)),
neutral=neutral_element(op, eltype(src)),

block_size::Int=256,
temp::Union{Nothing, AbstractArray}=nothing,
Expand Down
4 changes: 2 additions & 2 deletions src/reduce/mapreduce_nd.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ end
function mapreduce_nd(
f, op, src::AbstractArray, backend::GPU;
init,
neutral=GPUArrays.neutral_element(op, eltype(src)),
neutral=neutral_element(op, eltype(src)),
dims::Int,
block_size::Int=256,
temp::Union{Nothing, AbstractArray}=nothing,
Expand Down Expand Up @@ -324,7 +324,7 @@ end
function _mapreduce_nd_apply_init!(f, op, dst, src, backend, init, block_size)
foreachindex(
dst, backend,
block_size=block_size,
block_size=block_size,
) do i
dst[i] = op(init, f(src[i]))
end
Expand Down
27 changes: 21 additions & 6 deletions src/reduce/reduce.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
# neutral_element moved over from GPUArrays.jl
neutral_element(op, T) =
error("""AcceleratedKernels.jl needs to know the neutral element for your operator `$op`.
Please pass it as an explicit keyword argument `neutral`.""")
neutral_element(::typeof(Base.:(|)), T) = zero(T)
neutral_element(::typeof(Base.:(+)), T) = zero(T)
neutral_element(::typeof(Base.add_sum), T) = zero(T)
neutral_element(::typeof(Base.:(&)), T) = one(T)
neutral_element(::typeof(Base.:(*)), T) = one(T)
neutral_element(::typeof(Base.mul_prod), T) = one(T)
neutral_element(::typeof(Base.min), T) = typemax(T)
neutral_element(::typeof(Base.max), T) = typemin(T)
neutral_element(::typeof(Base._extrema_rf), ::Type{<:NTuple{2,T}}) where {T} = typemax(T), typemin(T)


include("mapreduce_1d.jl")
include("mapreduce_nd.jl")

Expand All @@ -6,7 +21,7 @@ include("mapreduce_nd.jl")
reduce(
op, src::AbstractArray, backend::Backend=get_backend(src);
init,
neutral=GPUArrays.neutral_element(op, eltype(src)),
neutral=neutral_element(op, eltype(src)),
dims::Union{Nothing, Int}=nothing,

# CPU settings
Expand Down Expand Up @@ -72,7 +87,7 @@ mcolsum = AK.reduce(+, m; init=zero(eltype(m)), dims=2)
function reduce(
op, src::AbstractArray, backend::Backend=get_backend(src);
init,
neutral=GPUArrays.neutral_element(op, eltype(src)),
neutral=neutral_element(op, eltype(src)),
dims::Union{Nothing, Int}=nothing,

# CPU settings
Expand Down Expand Up @@ -103,7 +118,7 @@ end
function _reduce_impl(
op, src::AbstractArray, backend;
init,
neutral=GPUArrays.neutral_element(op, eltype(src)),
neutral=neutral_element(op, eltype(src)),
dims::Union{Nothing, Int}=nothing,

# CPU settings
Expand Down Expand Up @@ -137,7 +152,7 @@ end
mapreduce(
f, op, src::AbstractArray, backend::Backend=get_backend(src);
init,
neutral=GPUArrays.neutral_element(op, eltype(src)),
neutral=neutral_element(op, eltype(src)),
dims::Union{Nothing, Int}=nothing,

# CPU settings
Expand Down Expand Up @@ -203,7 +218,7 @@ mcolsumsq = AK.mapreduce(f, +, m; init=zero(eltype(m)), dims=2)
function mapreduce(
f, op, src::AbstractArray, backend::Backend=get_backend(src);
init,
neutral=GPUArrays.neutral_element(op, eltype(src)),
neutral=neutral_element(op, eltype(src)),
dims::Union{Nothing, Int}=nothing,

# CPU settings
Expand Down Expand Up @@ -234,7 +249,7 @@ end
function _mapreduce_impl(
f, op, src::AbstractArray, backend::Backend;
init,
neutral=GPUArrays.neutral_element(op, eltype(src)),
neutral=neutral_element(op, eltype(src)),
dims::Union{Nothing, Int}=nothing,

# CPU settings
Expand Down
Loading