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

Fix jitrule #2297

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix jitrule #2297

wants to merge 1 commit into from

Conversation

SouthEndMusic
Copy link

Fixes #2296 (?)

github-actions[bot]
github-actions bot reviewed Feb 4, 2025
View reviewed changes
src/rules/jitrules.jl
Comment on lines +5 to +9
base=nothing,
iterate=false;
func=true,
mixed_or_active=false,
reverse=false,
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
base=nothing,
iterate=false;
func=true,
mixed_or_active=false,
reverse=false,
base = nothing,
iterate = false;
func = true,
mixed_or_active = false,
reverse = false,

src/rules/jitrules.jl
@@ -841,11 +841,11 @@ function push_if_not_ref(
return darg
end

struct PushInnerStruct{reverse, Vals}
struct PushInnerStruct{reverse,Vals}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
struct PushInnerStruct{reverse,Vals}
struct PushInnerStruct{reverse, Vals}

src/rules/jitrules.jl
@@ -869,7 +869,7 @@ end
args,
dargs,
) where {reverse}
map(PushInnerStruct{reverse, typeof(vals)}(vals), args, dargs)
map(PushInnerStruct{reverse,typeof(vals)}(vals), args, dargs)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
map(PushInnerStruct{reverse,typeof(vals)}(vals), args, dargs)
return map(PushInnerStruct{reverse, typeof(vals)}(vals), args, dargs)

src/rules/jitrules.jl
@@ -1686,7 +1685,7 @@ function func_runtime_iterate_rev(N, Width)
wrapped,
batchshadowargs,
modbetween,
active_refs = setup_macro_wraps(false, N, Width, nothing, true; reverse = true) #=iterate=#
active_refs = setup_macro_wraps(false, N, Width, nothing, true; reverse=true) #=iterate=#
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
active_refs = setup_macro_wraps(false, N, Width, nothing, true; reverse=true) #=iterate=#
active_refs = setup_macro_wraps(false, N, Width, nothing, true; reverse = true) #=iterate=#

src/rules/jitrules.jl
@@ -1725,7 +1724,7 @@ end
) where {ActivityTup,RuntimeActivity,MB,Width,TapeType,F,DF}
N = div(length(allargs) + 2, Width + 1) - 1
primargs, _, primtypes, _, _, wrapped, batchshadowargs, modbetween, active_refs =
setup_macro_wraps(false, N, Width, :allargs, true; reverse = true) #=iterate=#
setup_macro_wraps(false, N, Width, :allargs, true; reverse=true) #=iterate=#
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
setup_macro_wraps(false, N, Width, :allargs, true; reverse=true) #=iterate=#
setup_macro_wraps(false, N, Width, :allargs, true; reverse = true) #=iterate=#

src/rules/jitrules.jl
Comment on lines +1757 to +1762
sret=nothing,
tape=nothing,
firstconst=false,
endcast=true,
firstconst_after_tape=true,
runtime_activity=true,
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
sret=nothing,
tape=nothing,
firstconst=false,
endcast=true,
firstconst_after_tape=true,
runtime_activity=true,
sret = nothing,
tape = nothing,
firstconst = false,
endcast = true,
firstconst_after_tape = true,
runtime_activity = true,

@SouthEndMusic SouthEndMusic mentioned this pull request Feb 4, 2025
Open
wsmoses
wsmoses requested changes Feb 4, 2025
View reviewed changes
Copy link
Member

@wsmoses wsmoses left a comment

Choose a reason for hiding this comment

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

So the error here is that the input should have been a ref and adding the ref here will cause other errors

@SouthEndMusic
Copy link
Author

So it's a downstream problem, not an Enzyme.jl problem? Or should the error have been caught earlier in Enzyme.jl?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@wsmoses wsmoses wsmoses requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Method Error: no method matching MixedDuplicated for Oceananigans run with CATKE
2 participants
@SouthEndMusic @wsmoses