fix namespace qualification

jeff-regier · Dec 8, 2016 · 4259c6c · 4259c6c
1 parent 2834914
commit 4259c6c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/DeterministicVIImagePSF.jl b/src/DeterministicVIImagePSF.jl
@@ -12,7 +12,7 @@ import ..DeterministicVI:
     StarPosParams, GalaxyPosParams, CanonicalParams, VariationalParams,
     SourceBrightness, GalaxyComponent, SkyPatch,
     load_source_brightnesses, add_elbo_log_term!,
-    accumulate_source_pixel_brightness!, subtract_kl_all_sources!
+    accumulate_source_pixel_brightness!, subtract_kl_all_sources!, KL_HELPER_POOL
 
 import ..Model:
     populate_gal_fsm!, getids, ParamSet, linear_world_to_pix, lidx,

diff --git a/src/deterministic_vi_image_psf/elbo_image_psf.jl b/src/deterministic_vi_image_psf/elbo_image_psf.jl
@@ -350,9 +350,8 @@ function get_fft_elbo_function{T}(ea::ElboArgs{T}, fsm_vec::Vector, lanczos_widt
         @assert ea.psf_K == 1
         elbo = ea.elbo_vars.elbo
         kl_source = SensitiveFloat{T}(length(CanonicalParams), 1, elbo.has_gradient, elbo.has_hessian)
-        kl_helper = Celeste.DeterministicVI.KL_HELPER_POOL[threadid()]
         elbo_likelihood_with_fft!(ea, lanczos_width, fsm_vec)
-        subtract_kl_all_sources!(ea, elbo, kl_source, kl_helper)
+        subtract_kl_all_sources!(ea, elbo, kl_source, KL_HELPER_POOL[Base.Threads.threadid()])
         return deepcopy(elbo)
     end
 end
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -50,7 +50,7 @@ else
                  "test_joint_infer.jl",
                  "test_log_prob.jl",
                  "test_misc.jl",
-                 "test_optimization.jl",
+                 "test_optimization.jl"
                  "test_psf.jl",
                  "test_score.jl",
                  "test_sdssio.jl",