Skip to content
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

Jump to bottom

Adapt to pending Enzymecore changes #519

Merged
merged 7 commits into from
Sep 19, 2024
+21 −17
Merged

Adapt to pending Enzymecore changes #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a854a36
Adapt to pending Enzymecore changes
wsmoses Sep 16, 2024
7516ccb
fixup
wsmoses Sep 16, 2024
925e8f3
Update EnzymeExt.jl
wsmoses Sep 17, 2024
4b1e22a
Update Project.toml
wsmoses Sep 19, 2024
fe1bec5
fix
Sep 19, 2024
8e1a894
Enzyme buildkite
Sep 19, 2024
e4d702f
fix
Sep 19, 2024
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
10 changes: 6 additions & 4 deletions .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ steps:
matrix:
setup:
version:
- "1.8"
- "1.9"
- "1.10"
- "1.11"
plugins:
Expand All @@ -42,8 +40,12 @@ steps:
command: |
julia -e 'println("--- :julia: Instantiating project")
using Pkg
Pkg.develop(; path=pwd())
Pkg.add(["CUDA", "Enzyme"])' || exit 3
try
Pkg.develop([PackageSpec(; path=pwd()), PackageSpec("Enzyme"), PackageSpec("CUDA")])
catch err
Pkg.develop(; path=pwd())
Pkg.add(["CUDA", "Enzyme"])
end' || exit 3
julia -e 'println("+++ :julia: Running tests")
using CUDA
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "KernelAbstractions"
uuid = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
authors = ["Valentin Churavy <v.churavy@gmail.com> and contributors"]
version = "0.9.26"
version = "0.9.27"

[deps]
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
Expand All @@ -21,7 +21,7 @@ UnsafeAtomicsLLVM = "d80eeb9a-aca5-4d75-85e5-170c8b632249"
[compat]
Adapt = "0.4, 1.0, 2.0, 3.0, 4"
Atomix = "0.1"
EnzymeCore = "0.7.5"
EnzymeCore = "0.8.1"
InteractiveUtils = "1.6"
LinearAlgebra = "1.6"
MacroTools = "0.5"
Expand Down
22 changes: 12 additions & 10 deletions ext/EnzymeExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,18 @@ EnzymeRules.inactive(::Type{StaticSize}, x...) = nothing
# https://github.com/EnzymeAD/Enzyme.jl/issues/1516
# On the CPU `autodiff_deferred` can deadlock.
# Hence a specialized CPU version
function cpu_fwd(ctx, f, args...)
EnzymeCore.autodiff(Forward, Const(f), Const{Nothing}, Const(ctx), args...)
function cpu_fwd(ctx, config, f, args...)
EnzymeCore.autodiff(EnzymeCore.set_runtime_activity(Forward, config), Const(f), Const{Nothing}, Const(ctx), args...)
return nothing
end

function gpu_fwd(ctx, f, args...)
EnzymeCore.autodiff_deferred(Forward, Const(f), Const{Nothing}, Const(ctx), args...)
function gpu_fwd(ctx, config, f, args...)
EnzymeCore.autodiff_deferred(EnzymeCore.set_runtime_activity(Forward, config), Const(f), Const{Nothing}, Const(ctx), args...)
return nothing
end

function EnzymeRules.forward(
config,
func::Const{<:Kernel{CPU}},
::Type{Const{Nothing}},
args...;
Expand All @@ -65,10 +66,11 @@ function EnzymeRules.forward(
f = kernel.f
fwd_kernel = similar(kernel, cpu_fwd)

fwd_kernel(f, args...; ndrange, workgroupsize)
fwd_kernel(config, f, args...; ndrange, workgroupsize)
end

function EnzymeRules.forward(
config,
func::Const{<:Kernel{<:GPU}},
::Type{Const{Nothing}},
args...;
Expand All @@ -79,7 +81,7 @@ function EnzymeRules.forward(
f = kernel.f
fwd_kernel = similar(kernel, gpu_fwd)

fwd_kernel(f, args...; ndrange, workgroupsize)
fwd_kernel(config, f, args...; ndrange, workgroupsize)
end

_enzyme_mkcontext(kernel::Kernel{CPU}, ndrange, iterspace, dynamic) =
Expand Down Expand Up @@ -253,7 +255,7 @@ function gpu_rev(
end

function EnzymeRules.augmented_primal(
config::Config,
config::RevConfig,
func::Const{<:Kernel},
Copy link
Member

Choose a reason for hiding this comment

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

Do we need those kinds of changes with an abstract Config type?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Forward mode rules changed fairly fundamentally, so we'll definitely still need these changes

::Type{Const{Nothing}},
args::Vararg{Any, N};
Expand Down Expand Up @@ -311,7 +313,7 @@ function EnzymeRules.augmented_primal(
end

function EnzymeRules.reverse(
config::Config,
config::RevConfig,
func::Const{<:Kernel},
::Type{<:EnzymeCore.Annotation},
tape,
Expand Down Expand Up @@ -364,7 +366,7 @@ end
# synchronize rule and then synchronize where the launch was. However, with the current
# kernel semantics this ensures correctness for now.
function EnzymeRules.augmented_primal(
config::Config,
config::RevConfig,
func::Const{typeof(synchronize)},
::Type{Const{Nothing}},
backend::T,
Expand All @@ -374,7 +376,7 @@ function EnzymeRules.augmented_primal(
end

function EnzymeRules.reverse(
config::Config,
config::RevConfig,
func::Const{typeof(synchronize)},
::Type{Const{Nothing}},
tape,
Expand Down
2 changes: 1 addition & 1 deletion test/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
Enzyme = "0.12"
Enzyme = "0.13"
Loading