Skip to content

Commit

Permalink
fix: remove UnrolledUtilities dep
Browse files Browse the repository at this point in the history
  • Loading branch information
avik-pal committed Sep 11, 2024
1 parent 92a0bd4 commit 448337d
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 3 deletions.
2 changes: 0 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
Functors = "d9f16b24-f501-4c13-a1f2-28368ffc5196"
Preferences = "21216c6a-2e73-6563-6e65-726566657250"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
UnrolledUtilities = "0fe1646c-419e-43be-ac14-22321958931b"

[weakdeps]
AMDGPU = "21141c5a-9bdb-4563-92ae-f87d6854732e"
Expand Down Expand Up @@ -58,7 +57,6 @@ RecursiveArrayTools = "3.8"
ReverseDiff = "1.15"
SparseArrays = "1.10"
Tracker = "0.2.34"
UnrolledUtilities = "0.1.2"
Zygote = "0.6.69"
cuDNN = "1.3"
julia = "1.10"
Expand Down
31 changes: 30 additions & 1 deletion src/internal.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module Internal
using Functors: fmap
using Preferences: load_preference
using Random: AbstractRNG
using UnrolledUtilities: unrolled_mapreduce

using ..MLDataDevices: MLDataDevices, AbstractDevice, CPUDevice, CUDADevice, AMDGPUDevice,
MetalDevice, oneAPIDevice, supported_gpu_backends, GPU_DEVICES,
Expand Down Expand Up @@ -150,6 +149,34 @@ for op in (:get_device, :get_device_type)
end
end

function unrolled_mapreduce(f::F, op::O, itr) where {F, O}
return unrolled_mapreduce(f, op, itr, static_length(itr))
end

function unrolled_mapreduce(::F, ::O, _, ::Val{0}) where {F, O}
error("Cannot unroll over an empty iterator.")
end

unrolled_mapreduce(f::F, ::O, itr, ::Val{1}) where {F, O} = f(only(itr))

@generated function unrolled_mapreduce(f::F, op::O, itr, ::Val{N}) where {F, O, N}
syms = [gensym("f_itr_$(i)") for i in 1:N]
op_syms = [gensym("op_$(i)") for i in 1:(N - 1)]
f_applied = [:($(syms[i]) = f(itr[$i])) for i in 1:N]
combine_expr = [:($(op_syms[1]) = op($(syms[1]), $(syms[2])))]
for i in 2:(N - 1)
push!(combine_expr, :($(op_syms[i]) = op($(op_syms[i - 1]), $(syms[i + 1]))))
end
return quote
$(Expr(:meta, :inline))
$(Expr(:inbounds, true))
$(Expr(:block, f_applied...))
$(Expr(:inbounds, :pop))
$(Expr(:block, combine_expr...))
return $(op_syms[end])
end
end

function unsafe_free_internal!(x::AbstractArray)
unsafe_free_internal!(MLDataDevices.get_device_type(x), x)
return
Expand All @@ -162,4 +189,6 @@ function unsafe_free!(x)
return
end

static_length(t::Tuple) = Val(length(t))

end

2 comments on commit 448337d

@avik-pal
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/115014

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v1.1.1 -m "<description of version>" 448337d759362dc673dd7669e783165a9494b2d9
git push origin v1.1.1

Please sign in to comment.