Skip to content

Pretty print for static IR #382

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

Merged
merged 3 commits into from
Feb 16, 2021
Merged

Pretty print for static IR #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3572ab9
Pretty print for static IR, define get_ir on static functions directly.
ztangent Feb 16, 2021
ecf11d6
Fixed error when printing combinators.
ztangent Feb 16, 2021
23c63ba
Add smoke tests.
ztangent Feb 16, 2021
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
36 changes: 36 additions & 0 deletions src/static_ir/print_ir.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
Base.show(io::IO, ::MIME"text/plain", ir::StaticIR) =
print_ir(io, ir)

function print_ir(io::IO, ir::StaticIR)
println(io, "== Static IR ==")
args = join((string(arg.name) for arg in ir.arg_nodes), ", ")
println(io, "Arguments: ($args)")
for node in ir.nodes
node in ir.arg_nodes && continue
print(io, " "); print_ir(io, node); println(io)
end
print(io, " return $(ir.return_node.name)")
end

function print_ir(io::IO, node::TrainableParameterNode)
print(io, "@param $(node.name)::$(node.typ)")
end

function print_ir(io::IO, node::JuliaNode)
inputs = join((string(i.name) for i in node.inputs), ", ")
print(io, "$(node.name) = $(node.fn)($inputs)")
end

function print_ir(io::IO, node::GenerativeFunctionCallNode)
inputs = join((string(i.name) for i in node.inputs), ", ")
gen_fn_name = ir_name(node.generative_function)
print(io, "$(node.name) = @trace($(gen_fn_name)($inputs), :$(node.addr))")
end

function print_ir(io::IO, node::RandomChoiceNode)
inputs = join((string(i.name) for i in node.inputs), ", ")
print(io, "$(node.name) = @trace($(node.dist)($inputs), :$(node.addr))")
end

ir_name(fn::GenerativeFunction) = nameof(typeof(fn))
ir_name(fn::DynamicDSLFunction) = nameof(fn.julia_function)
2 changes: 2 additions & 0 deletions src/static_ir/static_ir.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ function generate_generative_function(ir::StaticIR, name::Symbol, options::Stati
params::Dict{Symbol,Any}
end
(gen_fn::$gen_fn_type_name)(args...) = $(GlobalRef(Gen, :propose))(gen_fn, args)[3]
$(GlobalRef(Gen, :get_ir))(::$gen_fn_type_name) = $(QuoteNode(ir))
Copy link
Contributor

@alex-lew alex-lew Feb 16, 2021

Choose a reason for hiding this comment

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

This seems reasonable, but it's making me wonder whether there was any reason we didn't have this in the first place. I guess the answer is probably that get_ir was mostly used from @generated functions, which only had access to the type of the GF, not the GF itself.

$(GlobalRef(Gen, :get_ir))(::Type{$gen_fn_type_name}) = $(QuoteNode(ir))
$(GlobalRef(Gen, :get_trace_type))(::Type{$gen_fn_type_name}) = $trace_struct_name
$(GlobalRef(Gen, :has_argument_grads))(::$gen_fn_type_name) = $(QuoteNode(has_argument_grads))
Expand All @@ -63,6 +64,7 @@ function generate_generative_function(ir::StaticIR, name::Symbol, options::Stati
Expr(:block, trace_defns, gen_fn_defn, Expr(:call, gen_fn_type_name, :(Dict{Symbol,Any}()), :(Dict{Symbol,Any}())))
end

include("print_ir.jl")
include("render_ir.jl")

###########################
Expand Down
3 changes: 3 additions & 0 deletions test/static_ir/static_ir.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ z = add_julia_node!(builder, (u, v) -> u + v, inputs=[u, v], name=:z)
set_return_node!(builder, z)
ir = build_ir(builder)
bar = eval(generate_generative_function(ir, :bar, track_diffs=false, cache_julia_nodes=false))
@test occursin("== Static IR ==", repr("text/plain", ir))

#@gen (static, nojuliacache) function foo(a, b)
#@param theta::Float64
Expand All @@ -45,6 +46,7 @@ w = add_julia_node!(builder, (z, a, theta) -> z + 1 + a + theta, inputs=[z, a, t
set_return_node!(builder, w)
ir = build_ir(builder)
foo = eval(generate_generative_function(ir, :foo, track_diffs=false, cache_julia_nodes=false))
@test occursin("== Static IR ==", repr("text/plain", ir))

theta_val = rand()
set_param!(foo, :theta, theta_val)
Expand All @@ -58,6 +60,7 @@ one = add_constant_node!(builder, 2)
set_return_node!(builder, one)
ir = build_ir(builder)
const_fn = eval(generate_generative_function(ir, :const_fn, track_diffs=false, cache_julia_nodes=false))
@test occursin("== Static IR ==", repr("text/plain", ir))

Gen.load_generated_functions()

Expand Down