remove the hack (#129)

Author: aviatesk

src/Diffractor.jl

@@ -39,11 +39,4 @@ include("debugutils.jl")
 
 include("stage1/termination.jl")
 
-function reload()
-    @info "reloading Diffractor generators"
-    for generator in GENERATORS
-        Core.eval(@__MODULE__, generator)
-    end
-end
-
 end

src/stage1/generated.jl

@@ -395,10 +395,7 @@ end
 ChainRulesCore.backing(::ZeroTangent) = ZeroTangent()
 ChainRulesCore.backing(::NoTangent) = NoTangent()
 
-let ex = :(function (ff::∂⃖recurse)(args...)
-               $(Expr(:meta, :generated_only))
-               $(Expr(:meta, :generated, perform_optic_transform))
-           end)
-    push!(GENERATORS, ex)
-    Core.eval(@__MODULE__, ex)
+@eval function (ff::∂⃖recurse)(args...)
+    $(Expr(:meta, :generated_only))
+    $(Expr(:meta, :generated, perform_optic_transform))
 end

src/stage1/recurse_fwd.jl

@@ -50,10 +50,7 @@ function perform_fwd_transform(world::UInt, source::LineNumberNode,
     return fwd_transform(ci, mi, length(args)-1, N)
 end
 
-let ex = :(function (ff::∂☆recurse)(args...)
-               $(Expr(:meta, :generated_only))
-               $(Expr(:meta, :generated, perform_fwd_transform))
-           end)
-    push!(GENERATORS, ex)
-    Core.eval(@__MODULE__, ex)
+@eval function (ff::∂☆recurse)(args...)
+    $(Expr(:meta, :generated_only))
+    $(Expr(:meta, :generated, perform_fwd_transform))
 end

test/runtests.jl

@@ -226,8 +226,7 @@ z45, delta45 = frule_via_ad(DiffractorRuleConfig(), (0,1), x -> log(exp(x)), 2)
     @test gradient(x -> sum(sqrt.(atan.(x, transpose(x)))), [1,2,3])[1] ≈ [0.2338, -0.0177, -0.0661] atol=1e-3
     @test gradient(x -> sum(exp.(log.(x))), [1,2,3]) == ([1,1,1],)
 
-    # XXX the world-age limitation is preventing this test from passing
-    # @test gradient(x -> sum((exp∘log).(x)), [1,2,3]) == ([1,1,1],)  # frule_via_ad
+    @test_broken gradient(x -> sum((exp∘log).(x)), [1,2,3]) == ([1,1,1],)  # frule_via_ad
     exp_log(x) = exp(log(x))
     @test gradient(x -> sum(exp_log.(x)), [1,2,3]) == ([1,1,1],)
     @test gradient((x,y) -> sum(x ./ y), [1 2; 3 4], [1,2]) == ([1 1; 0.5 0.5], [-3, -1.75])

test/stage2_fwd.jl

@@ -12,8 +12,6 @@ module stage2_fwd
     myminus(a, b) = a - b
     ChainRulesCore.@scalar_rule myminus(x, y) (true, -1)
 
-    Diffractor.reload() # XXX we should remove this
-
     self_minus(a) = myminus(a, a)
     let self_minus′′ = Diffractor.dontuse_nth_order_forward_stage2(Tuple{typeof(self_minus), Float64}, 2)
         @test isa(self_minus′′, Core.OpaqueClosure{Tuple{Float64}, Float64})