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

Support struct types in create_result #6

Merged
merged 16 commits into from
May 28, 2024
Merged

Support struct types in create_result #6

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a4debf0
Add `struct` type case to `create_result`
May 25, 2024
3d88339
Fix type matching
May 25, 2024
99baa5b
Fix `Symbol` case in `create_result`
May 25, 2024
57f0797
Add `Array` case in `create_result`
May 25, 2024
dad034a
Test compilation on custom `struct` types
May 25, 2024
00a23ce
Fix forgotten `include`
May 25, 2024
ca33253
Test mutable struct types
May 25, 2024
3b5db1a
Fix forgotten `mutable` specifier
May 25, 2024
c94a3ee
Add comments
May 25, 2024
1e0c566
Refactor test
May 26, 2024
542741c
Test against recursive data structure (linked list)
May 26, 2024
a820f67
Test non-`ConcreteRArray` field
May 26, 2024
f48f067
Fix bug in `traced_type`
May 26, 2024
bee8cac
Refactor test of recursive data structure (linked list)
May 26, 2024
120aa0c
Fix call to `datatype_fieldcount` in `traced_type`
May 26, 2024
71780ab
Mark commented test as broken test
mofeing May 28, 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
16 changes: 15 additions & 1 deletion src/Reactant.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,10 +720,24 @@ function generate_jlfunc(concrete_result, client, mod, Nargs, linear_args, linea
end)
return
end
if T <: Int || T <: AbstractFloat || T <: AbstractString || T <: Nothing
mofeing marked this conversation as resolved.
Show resolved Hide resolved
if T ∈ [Int, AbstractFloat, AbstractString, Nothing, Symbol]
push!(concrete_result_maker, :($resname = $tocopy))
return
end
if isstructtype(T)
elems = Symbol[]
nf = fieldcount(T)
for i in 1:nf
sym = Symbol(resname, :_, i)
create_result(getfield(tocopy, i), sym, (path..., i))
push!(elems, sym)
end
push!(concrete_result_maker, quote
Copy link
Member

Choose a reason for hiding this comment

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

I think this depends on whether the structure is mutable (Enzyme.make_zero should have some relevant code to look at).

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Added a test on a mutable struct type and seems to work... although it might be too naive?

flds = Any[$(elems...)]
$resname = ccall(:jl_new_structv, Any, (Any, Ptr{Cvoid}, UInt32), $T, flds, $nf)
end)
return
end

error("canot copy $T")
end
Expand Down