Deduplicate packages loading in tests (#1548)

* Refactor splitdir * Use dirname instead of basename * Finish * Refactor * Add two * Few more * Uncomment runtests again * Fix typo * Remove imports * Clean up * Remove more using occurrences
TuringLang · Feb 22, 2021 · 24d3731 · 24d3731
1 parent 1cd12d1
commit 24d3731
Show file tree

Hide file tree

Showing 24 changed files with 37 additions and 160 deletions.
diff --git a/test/contrib/inference/dynamichmc.jl b/test/contrib/inference/dynamichmc.jl
@@ -1,9 +1,3 @@
-using Turing, Test
-import Random
-
-dir = splitdir(splitdir(pathof(Turing))[1])[1]
-include(dir*"/test/test_utils/AllUtils.jl")
-
 @stage_testset "dynamichmc" "dynamichmc.jl" begin
     import DynamicHMC
     Random.seed!(100)

diff --git a/test/contrib/inference/sghmc.jl b/test/contrib/inference/sghmc.jl
@@ -1,11 +1,3 @@
-using Turing
-using LinearAlgebra
-using Random
-using Test
-
-dir = splitdir(splitdir(pathof(Turing))[1])[1]
-include(dir*"/test/test_utils/AllUtils.jl")
-
 @testset "sghmc.jl" begin
     @numerical_testset "sghmc inference" begin
         Random.seed!(125)

diff --git a/test/core/ad.jl b/test/core/ad.jl
@@ -1,17 +1,3 @@
-using ForwardDiff, Distributions, FiniteDifferences, Tracker, Random, LinearAlgebra
-using PDMats, Zygote
-using Turing: Turing, invlink, link, SampleFromPrior, 
-    TrackerAD, ZygoteAD
-using DynamicPPL: getval
-using Turing.Core: TuringDenseMvNormal, TuringDiagMvNormal
-using ForwardDiff: Dual
-using StatsFuns: binomlogpdf, logsumexp
-using Test, LinearAlgebra
-const FDM = FiniteDifferences
-
-dir = splitdir(splitdir(pathof(Turing))[1])[1]
-include(dir*"/test/test_utils/AllUtils.jl")
-
 @testset "ad.jl" begin
     @turing_testset "adr" begin
         ad_test_f = gdemo_default

diff --git a/test/inference/AdvancedSMC.jl b/test/inference/AdvancedSMC.jl
@@ -1,12 +1,3 @@
-using Turing, Random, Test
-using Turing.Inference: getspace
-using AdvancedPS: ResampleWithESSThreshold, resample_systematic, resample_multinomial
-
-using Random
-
-dir = splitdir(splitdir(pathof(Turing))[1])[1]
-include(dir*"/test/test_utils/AllUtils.jl")
-
 @testset "SMC" begin
     @turing_testset "constructor" begin
         s = SMC()

diff --git a/test/inference/Inference.jl b/test/inference/Inference.jl
@@ -1,12 +1,3 @@
-using Turing, Random, Test
-using DynamicPPL: getlogp
-import MCMCChains
-
-using Random
-
-dir = splitdir(splitdir(pathof(Turing))[1])[1]
-include(dir*"/test/test_utils/AllUtils.jl")
-
 @testset "io.jl" begin
     # Only test threading if 1.3+.
     if VERSION > v"1.2"

diff --git a/test/inference/emcee.jl b/test/inference/emcee.jl
@@ -1,9 +1,4 @@
-using Turing, Random, Test
-import Turing.Inference
-import AdvancedMH
 
-dir = splitdir(splitdir(pathof(Turing))[1])[1]
-include(dir*"/test/test_utils/AllUtils.jl")
 
 @testset "emcee.jl" begin
     @testset "gdemo" begin
@@ -18,4 +13,4 @@ include(dir*"/test/test_utils/AllUtils.jl")
         chain = sample(gdemo_default, spl, n_samples)
         check_gdemo(chain)
     end
-end
+end
diff --git a/test/inference/ess.jl b/test/inference/ess.jl
@@ -1,8 +1,3 @@
-using Turing, Random, Test
-
-dir = splitdir(splitdir(pathof(Turing))[1])[1]
-include(dir*"/test/test_utils/AllUtils.jl")
-
 @testset "ESS" begin
     @model demo(x) = begin
         m ~ Normal()

diff --git a/test/inference/gibbs.jl b/test/inference/gibbs.jl
@@ -1,12 +1,3 @@
-using Random, Turing, Test
-import AbstractMCMC
-import MCMCChains
-import Turing.Inference
-using Turing.RandomMeasures
-
-dir = splitdir(splitdir(pathof(Turing))[1])[1]
-include(dir*"/test/test_utils/AllUtils.jl")
-
 @testset "gibbs.jl" begin
     @turing_testset "gibbs constructor" begin
         N = 500

diff --git a/test/inference/gibbs_conditional.jl b/test/inference/gibbs_conditional.jl
@@ -1,11 +1,3 @@
-using Random, Turing, Test
-using StatsFuns
-using Clustering
-
-dir = splitdir(splitdir(pathof(Turing))[1])[1]
-include(dir*"/test/test_utils/AllUtils.jl")
-
-
 @turing_testset "gibbs conditionals" begin
     Random.seed!(100)
 

diff --git a/test/inference/hmc.jl b/test/inference/hmc.jl
@@ -1,13 +1,3 @@
-using Turing, Random, Test
-using Turing: Sampler, NUTS
-using MCMCChains: Chains
-using StatsFuns: logistic
-
-using LinearAlgebra
-
-dir = splitdir(splitdir(pathof(Turing))[1])[1]
-include(dir*"/test/test_utils/AllUtils.jl")
-
 @testset "hmc.jl" begin
     @numerical_testset "constrained bounded" begin
         # Set a seed

diff --git a/test/inference/is.jl b/test/inference/is.jl
@@ -1,12 +1,3 @@
-using Turing
-using StatsFuns
-
-using Random
-using Test
-
-dir = splitdir(splitdir(pathof(Turing))[1])[1]
-include(dir*"/test/test_utils/AllUtils.jl")
-
 @turing_testset "is.jl" begin
     function reference(n)
         as = Vector{Float64}(undef, n)

diff --git a/test/inference/mh.jl b/test/inference/mh.jl
@@ -1,10 +1,3 @@
-using Turing, Random, Test
-import Turing.Inference
-import AdvancedMH
-
-dir = splitdir(splitdir(pathof(Turing))[1])[1]
-include(dir*"/test/test_utils/AllUtils.jl")
-
 @testset "mh.jl" begin
     @turing_testset "mh constructor" begin
         Random.seed!(0)

diff --git a/test/inference/utilities.jl b/test/inference/utilities.jl
@@ -1,5 +1,3 @@
-using Random
-
 @testset "predict" begin
     Random.seed!(100)
 

diff --git a/test/modes/ModeEstimation.jl b/test/modes/ModeEstimation.jl
@@ -1,15 +1,4 @@
-using Turing
-using Optim
-using Test
-using StatsBase
-using NamedArrays
-using ReverseDiff
-using Random
-using LinearAlgebra
-using Zygote
-
-dir = splitdir(splitdir(pathof(Turing))[1])[1]
-include(dir*"/test/test_utils/AllUtils.jl")
+
 
 @testset "ModeEstimation.jl" begin
     @testset "MLE" begin

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,16 +1,46 @@
-##########################################
-# Master file for running all test cases #
-##########################################
-using Zygote, ReverseDiff, Memoization, Turing
+using AbstractMCMC
+using AdvancedMH
+using Clustering
+using Distributions
+using DistributionsAD
+using FiniteDifferences
+using ForwardDiff
+using MCMCChains
+using Memoization
+using NamedArrays
+using Optim
+using PDMats
+using ReverseDiff
+using SpecialFunctions
+using StatsBase
+using StatsFuns
+using Tracker
+using Turing
+using Turing.Inference
+using Turing.RandomMeasures
+using Zygote
+
+using LinearAlgebra
 using Pkg
 using Random
 using Test
 
+using AdvancedPS: ResampleWithESSThreshold, resample_systematic, resample_multinomial
+using AdvancedVI: TruncatedADAGrad, DecayedADAGrad, apply!
+using Distributions: Binomial, logpdf
+using DynamicPPL: getval, getlogp
+using ForwardDiff: Dual
+using MCMCChains: Chains
+using StatsFuns: binomlogpdf, logistic, logsumexp
+using Turing: BinomialLogit, ForwardDiffAD, Sampler, SampleFromPrior, NUTS, TrackerAD, 
+                Variational, ZygoteAD, getspace, gradient_logp
+using Turing.Core: TuringDenseMvNormal, TuringDiagMvNormal
+using Turing.Variational: TruncatedADAGrad, DecayedADAGrad, AdvancedVI
+
 setprogress!(false)
 
 include("test_utils/AllUtils.jl")
 
-# Begin testing.
 @testset "Turing" begin
     @testset "core" begin
         include("core/ad.jl")

diff --git a/test/stdlib/RandomMeasures.jl b/test/stdlib/RandomMeasures.jl
@@ -1,11 +1,3 @@
-using Turing
-using Turing.RandomMeasures
-using Test
-using Random
-
-dir = splitdir(splitdir(pathof(Turing))[1])[1]
-include(dir*"/test/test_utils/AllUtils.jl")
-
 @testset "RandomMeasures.jl" begin
     @testset "Infinite Mixture Model" begin
         @model infiniteGMM(x) = begin

diff --git a/test/stdlib/distributions.jl b/test/stdlib/distributions.jl
@@ -1,11 +1,3 @@
-using Turing, Random, Test
-using Turing: BinomialLogit, NUTS
-using Distributions: Binomial, logpdf
-using StatsFuns: logistic
-
-dir = splitdir(splitdir(pathof(Turing))[1])[1]
-include(dir*"/test/test_utils/AllUtils.jl")
-
 @testset "distributions.jl" begin
     @turing_testset "distributions functions" begin
         ns = 10

diff --git a/test/test_utils/AllUtils.jl b/test/test_utils/AllUtils.jl
@@ -1,5 +1,3 @@
-using Turing, Random, Test
-
 # Import utility functions and reused models.
 include("staging.jl")
 include("numerical_tests.jl")

diff --git a/test/test_utils/ad_utils.jl b/test/test_utils/ad_utils.jl
@@ -1,6 +1,3 @@
-using Turing: gradient_logp, ForwardDiffAD
-using Test
-
 """
     test_reverse_mode_ad(forward, f, ȳ, x...; rtol=1e-6, atol=1e-6)
 

diff --git a/test/test_utils/random_measure_utils.jl b/test/test_utils/random_measure_utils.jl
@@ -1,5 +1,3 @@
-using SpecialFunctions
-
 function compute_log_joint(observations, partition, tau0, tau1, sigma, theta)
   n = length(observations)
   k = length(partition)

diff --git a/test/test_utils/testing_functions.jl b/test/test_utils/testing_functions.jl
@@ -1,5 +1,3 @@
-using Turing
-
 GKernel(var) = (x) -> Normal(x, sqrt.(var))
 
 function randr(vi::Turing.VarInfo,

diff --git a/test/utilities/stan-interface.jl b/test/utilities/stan-interface.jl
@@ -1,8 +1,3 @@
-using Turing, Random, Test
-
-dir = splitdir(splitdir(pathof(Turing))[1])[1]
-include(dir*"/test/test_utils/AllUtils.jl")
-
 @stage_testset "stan" "stan-interface.jl" begin
     using CmdStan
 

diff --git a/test/variational/advi.jl b/test/variational/advi.jl
@@ -1,11 +1,3 @@
-using DistributionsAD
-
-using Turing, Random, Test, LinearAlgebra
-using Turing: Variational
-using Turing.Variational: TruncatedADAGrad, DecayedADAGrad, AdvancedVI
-
-include("../test_utils/AllUtils.jl")
-
 @testset "advi.jl" begin
     @turing_testset "advi constructor" begin
         Random.seed!(0)

diff --git a/test/variational/optimisers.jl b/test/variational/optimisers.jl
@@ -1,6 +1,3 @@
-using Random, Test, LinearAlgebra, ForwardDiff
-using AdvancedVI: TruncatedADAGrad, DecayedADAGrad, apply!
-
 function test_opt(ADPack, opt)
     θ = randn(10, 10)
     θ_fit = randn(10, 10)