Removed repetitive imports from algorithms. (#130)

rishabhvarshney14 · findmyway · web-flow · commit f60880338b39 · 2020-12-08T23:54:03.000+08:00
* moved imports

* removed repeated imports

* move using into RLZoo.jl

* remove other duplications

Co-authored-by: Jun Tian &lt;tianjun.cpp@gmail.com&gt;
diff --git a/src/ReinforcementLearningZoo.jl b/src/ReinforcementLearningZoo.jl
@@ -3,13 +3,28 @@ module ReinforcementLearningZoo
 const RLZoo = ReinforcementLearningZoo
 export RLZoo
 
+using CircularArrayBuffers
 using ReinforcementLearningBase
 using ReinforcementLearningCore
 using Setfield: @set
 using StableRNGs
 using Logging
 using Flux.Losses
 using Dates
+using Random
+using Random: shuffle
+using CUDA
+using Zygote
+using Zygote: ignore
+using Flux
+using Flux: onehot, normalise
+using StatsBase
+using StatsBase: sample, Weights, mean
+using LinearAlgebra: dot
+using MacroTools
+using Distributions: Categorical, Normal, logpdf
+using StructArrays
+
 
 include("patch.jl")
 include("algorithms/algorithms.jl")
diff --git a/src/algorithms/algorithms.jl b/src/algorithms/algorithms.jl
@@ -1,5 +1,3 @@
-using Zygote: ignore
-
 include("dqns/dqns.jl")
 include("policy_gradient/policy_gradient.jl")
 include("searching/searching.jl")
diff --git a/src/algorithms/cfr/best_response_policy.jl b/src/algorithms/cfr/best_response_policy.jl
@@ -1,7 +1,5 @@
 export BestResponsePolicy
 
-using Flux: onehot
-
 struct BestResponsePolicy{E,S,A,X,P<:AbstractPolicy} <: AbstractCFRPolicy
     cfr_reach_prob::Dict{S,Vector{Pair{E,Float64}}}
     best_response_action_cache::Dict{S,A}
diff --git a/src/algorithms/cfr/deep_cfr.jl b/src/algorithms/cfr/deep_cfr.jl
@@ -1,7 +1,5 @@
 export DeepCFR
 
-using Statistics: mean
-using StatsBase
 
 """
     DeepCFR(;kwargs...)
diff --git a/src/algorithms/cfr/external_sampling_mccfr.jl b/src/algorithms/cfr/external_sampling_mccfr.jl
@@ -1,8 +1,5 @@
 export ExternalSamplingMCCFRPolicy
 
-using Random
-using StatsBase: sample, Weights
-
 """
     ExternalSamplingMCCFRPolicy
 
diff --git a/src/algorithms/cfr/outcome_sampling_mccfr.jl b/src/algorithms/cfr/outcome_sampling_mccfr.jl
@@ -1,8 +1,5 @@
 export OutcomeSamplingMCCFRPolicy
 
-using Random
-using StatsBase: sample, Weights
-
 """
     OutcomeSamplingMCCFRPolicy
 
diff --git a/src/algorithms/dqns/basic_dqn.jl b/src/algorithms/dqns/basic_dqn.jl
@@ -1,8 +1,5 @@
 export BasicDQNLearner
 
-using Random
-using Flux
-
 """
     BasicDQNLearner(;kwargs...)
 
diff --git a/src/algorithms/dqns/dqn.jl b/src/algorithms/dqns/dqn.jl
@@ -1,8 +1,5 @@
 export DQNLearner
 
-using Random
-using Flux
-
 mutable struct DQNLearner{
     Tq<:AbstractApproximator,
     Tt<:AbstractApproximator,
diff --git a/src/algorithms/dqns/iqn.jl b/src/algorithms/dqns/iqn.jl
@@ -1,12 +1,5 @@
 export IQNLearner, ImplicitQuantileNet
 
-using Flux
-using CUDA
-using Random
-using Zygote
-using Statistics: mean
-using LinearAlgebra: dot
-
 """
     ImplicitQuantileNet(;ψ, ϕ, header)
 
diff --git a/src/algorithms/dqns/prioritized_dqn.jl b/src/algorithms/dqns/prioritized_dqn.jl
@@ -1,11 +1,5 @@
 export PrioritizedDQNLearner
 
-using Random
-using Flux
-using Zygote
-using StatsBase: mean
-using LinearAlgebra: dot
-
 """
     PrioritizedDQNLearner(;kwargs...)
 
diff --git a/src/algorithms/dqns/rainbow.jl b/src/algorithms/dqns/rainbow.jl
@@ -1,11 +1,5 @@
 export RainbowLearner
 
-using Flux
-using Zygote
-using StatsBase
-using Random
-using LinearAlgebra: dot
-
 """
     RainbowLearner(;kwargs...)
 
diff --git a/src/algorithms/policy_gradient/A2C.jl b/src/algorithms/policy_gradient/A2C.jl
@@ -1,8 +1,5 @@
 export A2CLearner
 
-using Flux
-using Setfield:@set
-
 """
     A2CLearner(;kwargs...)
 
diff --git a/src/algorithms/policy_gradient/A2CGAE.jl b/src/algorithms/policy_gradient/A2CGAE.jl
@@ -1,7 +1,5 @@
 export A2CGAELearner
 
-using Flux
-
 """
     A2CGAELearner(;kwargs...)
 # Keyword arguments
diff --git a/src/algorithms/policy_gradient/MAC.jl b/src/algorithms/policy_gradient/MAC.jl
@@ -1,7 +1,5 @@
 export MACLearner
 
-using Flux
-
 """
     MACLearner(;kwargs...)
 
diff --git a/src/algorithms/policy_gradient/ddpg.jl b/src/algorithms/policy_gradient/ddpg.jl
@@ -1,8 +1,5 @@
 export DDPGPolicy
 
-using Random
-using Flux
-
 mutable struct DDPGPolicy{
     BA<:NeuralNetworkApproximator,
     BC<:NeuralNetworkApproximator,
diff --git a/src/algorithms/policy_gradient/ppo.jl b/src/algorithms/policy_gradient/ppo.jl
@@ -1,10 +1,5 @@
 export PPOPolicy, PPOTrajectory, MaskedPPOTrajectory
 
-using Random
-using Distributions: Categorical, Normal, logpdf
-using StructArrays
-using CircularArrayBuffers
-
 const PPOTrajectory = Trajectory{
     <:NamedTuple{
         (:action_log_prob, SART...),
diff --git a/src/algorithms/policy_gradient/sac.jl b/src/algorithms/policy_gradient/sac.jl
@@ -1,10 +1,5 @@
 export SACPolicy, SACPolicyNetwork
 
-using Random
-using Flux
-using Flux.Losses: mse
-using Distributions: Normal, logpdf
-
 # Define SAC Actor
 struct SACPolicyNetwork
     pre::Chain
diff --git a/src/algorithms/policy_gradient/td3.jl b/src/algorithms/policy_gradient/td3.jl
@@ -1,8 +1,5 @@
 export TD3Policy, TD3Critic
 
-using Random
-using Flux
-
 struct TD3Critic
     critic_1::Flux.Chain
     critic_2::Flux.Chain
diff --git a/src/algorithms/policy_gradient/vpg.jl b/src/algorithms/policy_gradient/vpg.jl
@@ -1,9 +1,3 @@
-using Flux: normalise
-using Random: shuffle
-
-using ReinforcementLearningBase
-using ReinforcementLearningCore
-
 export VPGPolicy, GaussianNetwork
 
 """
diff --git a/src/experiments/atari/atari.jl b/src/experiments/atari/atari.jl
@@ -1,16 +1,6 @@
 using .ArcadeLearningEnvironment
 using .ReinforcementLearningEnvironments
 
-using Dates
-using ReinforcementLearningCore
-using Flux
-using BSON
-using TensorBoardLogger
-using Logging
-using Statistics
-using Random
-using Setfield:@set
-
 function atari_env_factory(
     name,
     state_size,

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-using Zygote: ignore`
`2`		`-`
`3`	`1`	`include("dqns/dqns.jl")`
`4`	`2`	`include("policy_gradient/policy_gradient.jl")`
`5`	`3`	`include("searching/searching.jl")`