DI: Reverse dependency structure #2301
Draft
+1,012
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| include("reverse_onearg.jl") | ||
| include("reverse_twoarg.jl") | ||
|
|
||
| end # module |
There was a problem hiding this comment.
Suggested change
| end # module | |
| end # module |
Comment on lines
+4
to
+16
| f::F, | ||
| ::AutoEnzyme{<:Union{ForwardMode,Nothing}}, | ||
| x, | ||
| tx::NTuple, | ||
| contexts::Vararg{DI.Context,C}, | ||
| ) where {F,C} | ||
| return DI.NoPushforwardPrep() | ||
| end | ||
|
|
||
| function DI.value_and_pushforward( | ||
| f::F, | ||
| ::DI.NoPushforwardPrep, | ||
| backend::AutoEnzyme{<:Union{ForwardMode,Nothing}}, |
There was a problem hiding this comment.
Suggested change
| f::F, | |
| ::AutoEnzyme{<:Union{ForwardMode,Nothing}}, | |
| x, | |
| tx::NTuple, | |
| contexts::Vararg{DI.Context,C}, | |
| ) where {F,C} | |
| return DI.NoPushforwardPrep() | |
| end | |
| function DI.value_and_pushforward( | |
| f::F, | |
| ::DI.NoPushforwardPrep, | |
| backend::AutoEnzyme{<:Union{ForwardMode,Nothing}}, | |
| f::F, | |
| ::AutoEnzyme{<:Union{ForwardMode, Nothing}}, | |
| x, | |
| tx::NTuple, | |
| contexts::Vararg{DI.Context, C}, | |
| ) where {F, C} | |
| f::F, | |
| ::DI.NoPushforwardPrep, | |
| backend::AutoEnzyme{<:Union{ForwardMode, Nothing}}, | |
| x, | |
| tx::NTuple{1}, | |
| contexts::Vararg{DI.Context, C}, | |
| ) where {F, C} |
Comment on lines
+31
to
+37
| f::F, | ||
| ::DI.NoPushforwardPrep, | ||
| backend::AutoEnzyme{<:Union{ForwardMode,Nothing}}, | ||
| x, | ||
| tx::NTuple{B}, | ||
| contexts::Vararg{DI.Context,C}, | ||
| ) where {F,B,C} |
There was a problem hiding this comment.
Suggested change
| f::F, | |
| ::DI.NoPushforwardPrep, | |
| backend::AutoEnzyme{<:Union{ForwardMode,Nothing}}, | |
| x, | |
| tx::NTuple{B}, | |
| contexts::Vararg{DI.Context,C}, | |
| ) where {F,B,C} | |
| f::F, | |
| ::DI.NoPushforwardPrep, | |
| backend::AutoEnzyme{<:Union{ForwardMode, Nothing}}, | |
| x, | |
| tx::NTuple{B}, | |
| contexts::Vararg{DI.Context, C}, | |
| ) where {F, B, C} |
Comment on lines
+48
to
+54
| f::F, | ||
| ::DI.NoPushforwardPrep, | ||
| backend::AutoEnzyme{<:Union{ForwardMode,Nothing}}, | ||
| x, | ||
| tx::NTuple{1}, | ||
| contexts::Vararg{DI.Context,C}, | ||
| ) where {F,C} |
There was a problem hiding this comment.
Suggested change
| f::F, | |
| ::DI.NoPushforwardPrep, | |
| backend::AutoEnzyme{<:Union{ForwardMode,Nothing}}, | |
| x, | |
| tx::NTuple{1}, | |
| contexts::Vararg{DI.Context,C}, | |
| ) where {F,C} | |
| f::F, | |
| ::DI.NoPushforwardPrep, | |
| backend::AutoEnzyme{<:Union{ForwardMode, Nothing}}, | |
| x, | |
| tx::NTuple{1}, | |
| contexts::Vararg{DI.Context, C}, | |
| ) where {F, C} |
Comment on lines
+65
to
+71
| f::F, | ||
| ::DI.NoPushforwardPrep, | ||
| backend::AutoEnzyme{<:Union{ForwardMode,Nothing}}, | ||
| x, | ||
| tx::NTuple{B}, | ||
| contexts::Vararg{DI.Context,C}, | ||
| ) where {F,B,C} |
There was a problem hiding this comment.
Suggested change
| f::F, | |
| ::DI.NoPushforwardPrep, | |
| backend::AutoEnzyme{<:Union{ForwardMode,Nothing}}, | |
| x, | |
| tx::NTuple{B}, | |
| contexts::Vararg{DI.Context,C}, | |
| ) where {F,B,C} | |
| f::F, | |
| ::DI.NoPushforwardPrep, | |
| backend::AutoEnzyme{<:Union{ForwardMode, Nothing}}, | |
| x, | |
| tx::NTuple{B}, | |
| contexts::Vararg{DI.Context, C}, | |
| ) where {F, B, C} |
Comment on lines
+12
to
+29
| f::F, ::AutoEnzyme{M,Nothing}, mode::Mode, ::Val{B}=Val(1) | ||
| ) where {F,M,B} | ||
| return f | ||
| end | ||
|
|
||
| @inline function get_f_and_df( | ||
| f::F, ::AutoEnzyme{M,<:Const}, mode::Mode, ::Val{B}=Val(1) | ||
| ) where {F,M,B} | ||
| return Const(f) | ||
| end | ||
|
|
||
| @inline function get_f_and_df( | ||
| f::F, | ||
| ::AutoEnzyme{ | ||
| M, | ||
| <:Union{ | ||
| Duplicated, | ||
| MixedDuplicated, |
There was a problem hiding this comment.
Suggested change
| f::F, ::AutoEnzyme{M,Nothing}, mode::Mode, ::Val{B}=Val(1) | |
| ) where {F,M,B} | |
| return f | |
| end | |
| @inline function get_f_and_df( | |
| f::F, ::AutoEnzyme{M,<:Const}, mode::Mode, ::Val{B}=Val(1) | |
| ) where {F,M,B} | |
| return Const(f) | |
| end | |
| @inline function get_f_and_df( | |
| f::F, | |
| ::AutoEnzyme{ | |
| M, | |
| <:Union{ | |
| Duplicated, | |
| MixedDuplicated, | |
| f::F, ::AutoEnzyme{M, Nothing}, mode::Mode, ::Val{B} = Val(1) | |
| ) where {F, M, B} | |
| f::F, ::AutoEnzyme{M, <:Const}, mode::Mode, ::Val{B} = Val(1) | |
| ) where {F, M, B} | |
| f::F, | |
| ::AutoEnzyme{ | |
| M, | |
| <:Union{ | |
| Duplicated, | |
| MixedDuplicated, | |
| BatchDuplicated, | |
| BatchMixedDuplicated, | |
| DuplicatedNoNeed, | |
| BatchDuplicatedNoNeed, | |
| }, | |
| mode::Mode, | |
| ::Val{B} = Val(1), | |
| ) where {F, M, B} |
Comment on lines
+47
to
+51
| force_annotation(f::F) where {F<:Annotation} = f | ||
| force_annotation(f::F) where {F} = Const(f) | ||
|
|
||
| @inline function _translate( | ||
| ::AutoEnzyme, ::Mode, ::Val{B}, c::Union{DI.Constant,DI.BackendContext} |
There was a problem hiding this comment.
Suggested change
| force_annotation(f::F) where {F<:Annotation} = f | |
| force_annotation(f::F) where {F} = Const(f) | |
| @inline function _translate( | |
| ::AutoEnzyme, ::Mode, ::Val{B}, c::Union{DI.Constant,DI.BackendContext} | |
| force_annotation(f::F) where {F <: Annotation} = f | |
| ::AutoEnzyme, ::Mode, ::Val{B}, c::Union{DI.Constant, DI.BackendContext} | |
| ) where {B} | |
| backend::AutoEnzyme, mode::Mode, ::Val{B}, c::DI.Cache | |
| ) where {B} |
Comment on lines
+67
to
+70
| backend::AutoEnzyme, mode::Mode, ::Val{B}, c::DI.FunctionContext | ||
| ) where {B} | ||
| return force_annotation(get_f_and_df(DI.unwrap(c), backend, mode, Val(B))) | ||
| end |
There was a problem hiding this comment.
Suggested change
| backend::AutoEnzyme, mode::Mode, ::Val{B}, c::DI.FunctionContext | |
| ) where {B} | |
| return force_annotation(get_f_and_df(DI.unwrap(c), backend, mode, Val(B))) | |
| end | |
| backend::AutoEnzyme, mode::Mode, ::Val{B}, c::DI.FunctionContext | |
| ) where {B} | |
| backend::AutoEnzyme, mode::Mode, ::Val{B}, contexts::Vararg{DI.Context, C} | |
| ) where {B, C} |
Comment on lines
+103
to
+104
| set_err(mode::Mode, ::AutoEnzyme{<:Any,Nothing}) = EnzymeCore.set_err_if_func_written(mode) | ||
| set_err(mode::Mode, ::AutoEnzyme{<:Any,<:Annotation}) = mode |
There was a problem hiding this comment.
Suggested change
| set_err(mode::Mode, ::AutoEnzyme{<:Any,Nothing}) = EnzymeCore.set_err_if_func_written(mode) | |
| set_err(mode::Mode, ::AutoEnzyme{<:Any,<:Annotation}) = mode | |
| set_err(mode::Mode, ::AutoEnzyme{<:Any, Nothing}) = EnzymeCore.set_err_if_func_written(mode) | |
| set_err(mode::Mode, ::AutoEnzyme{<:Any, <:Annotation}) = mode |
Comment on lines
+118
to
+120
| function annotate(::Type{BatchDuplicated{T,B}}, x, tx::NTuple{B}) where {T,B} | ||
| return BatchDuplicated(x, tx) | ||
| end |
There was a problem hiding this comment.
Suggested change
| function annotate(::Type{BatchDuplicated{T,B}}, x, tx::NTuple{B}) where {T,B} | |
| return BatchDuplicated(x, tx) | |
| end | |
| function annotate(::Type{BatchDuplicated{T, B}}, x, tx::NTuple{B}) where {T, B} | |
| batchify_activity(::Type{Active{T}}, ::Val{B}) where {T, B} = Active{T} | |
| batchify_activity(::Type{Duplicated{T}}, ::Val{B}) where {T, B} = BatchDuplicated{T, B} |
Benchmark Results
Benchmark PlotsA plot of the benchmark results have been uploaded as an artifact to the workflow run for this PR. |
wsmoses
commented
Feb 8, 2025
| return set_err(ReverseSplitWithPrimal, backend) | ||
| end | ||
|
|
||
| set_err(mode::Mode, ::AutoEnzyme{<:Any,Nothing}) = EnzymeCore.set_err_if_func_written(mode) |
There was a problem hiding this comment.
@gdalle as discussed on slack this probably should be an extension to the set_err_if_func_written function to take an ADmode, so likely we have this in an EnzymeCoreADTypes ext?
wsmoses
commented
Feb 8, 2025
| forward_withprimal(backend::AutoEnzyme{<:ForwardMode}) = WithPrimal(backend.mode) | ||
| forward_withprimal(::AutoEnzyme{Nothing}) = ForwardWithPrimal | ||
|
|
||
| reverse_noprimal(backend::AutoEnzyme{<:ReverseMode}) = NoPrimal(backend.mode) |
There was a problem hiding this comment.
@gdalle similarly here we can make an ADTypes ext func for get_mode_or_default(AutoEnzyme, defaultMode)
wsmoses
commented
Feb 8, 2025
| dy_sametype = convert(typeof(y), only(prep.ty_copy)) | ||
| x_and_dx = Duplicated(x, dx_sametype) | ||
| y_and_dy = Duplicated(y, dy_sametype) | ||
| annotated_contexts = translate(backend, mode, Val(1), contexts...) |
There was a problem hiding this comment.
@gdalle I presume this can be moved into Enzyme.gradient! And have DI call that?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@gdalle this will enable the DI ext to more properly touch internals if need be