Skip to content

Fix batched ForwardWithPrimal primal slot width #3488

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ChrisRackauckas-Claude wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix batched ForwardWithPrimal primal slot width #3488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/compiler.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3866,7 +3866,8 @@ function create_abi_wrapper(
twidth = if width == 1
1
else
if (rettype <: Const) && returnNum == 0
if ((rettype <: Const) && returnNum == 0) ||
(returnPrimal && returnNum == count_Sret - 1)
1
else
width
Expand Down
23 changes: 19 additions & 4 deletions test/typeunstable.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,15 +334,30 @@ end
batched_uninferred_target(x) = (2 .* x,)
batched_uninferred_return(x) = Base.invokelatest(batched_uninferred_target, x)

@testset "Batched forward concrete annotation with uninferred return" begin
function batched_uninferred_setup()
x = [1.0, 2.0]
dx1 = ones(2)
dx2 = fill(3.0, 2)
tangents = (ones(2), fill(3.0, 2))
return_activity = BatchDuplicated{Tuple{Vector{Float64}}, 2}
return x, tangents, return_activity
end

@testset "Batched forward concrete annotation with uninferred return" begin
x, tangents, return_activity = batched_uninferred_setup()
result = Enzyme.autodiff(
Enzyme.set_runtime_activity(Forward), Const(batched_uninferred_return),
return_activity, BatchDuplicated(x, (dx1, dx2))
return_activity, BatchDuplicated(x, tangents)
)
@test result[1][1][1] == [2.0, 2.0]
@test result[1][2][1] == [6.0, 6.0]
end

@testset "Batched forward-with-primal concrete annotation with uninferred return" begin
x, tangents, return_activity = batched_uninferred_setup()
result = Enzyme.autodiff(
Enzyme.set_runtime_activity(ForwardWithPrimal), Const(batched_uninferred_return),
return_activity, BatchDuplicated(x, tangents)
)
@test result[1][1][1] == [2.0, 2.0]
@test result[1][2][1] == [6.0, 6.0]
@test result[2][1] == [2.0, 4.0]
end