Merge pull request FluxML#173 from dhairyagandhi96/unifyenv

Move to a unified environment and update to Flux @0.9
saswatpp · Dec 2, 2019 · 53a5287 · 53a5287
2 parents 076472c + 250d631
commit 53a5287
Show file tree

Hide file tree

Showing 77 changed files with 967 additions and 5,042 deletions.
diff --git a/Manifest.toml b/Manifest.toml
diff --git a/Project.toml b/Project.toml
@@ -0,0 +1,20 @@
+[deps]
+AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
+BSON = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0"
+Cascadia = "54eefc05-d75b-58de-a785-1a3403f0919f"
+Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d"
+DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
+Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
+Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
+Gumbo = "708ec375-b3d6-5a57-a7ce-8257bf98657a"
+HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
+ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
+Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
+Juno = "e5e0dc1b-0480-54bc-9374-aad01c23163d"
+Metalhead = "dbeba491-748d-5e0e-a39e-b530a07fa0cc"
+Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
+Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
+StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
+Trebuchet = "98b73d46-197d-11e9-11eb-69a6ff759d3a"
+Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
+WAV = "8149f6b0-98f6-5db9-b78f-408fbbb8ef88"
diff --git a/README.md b/README.md
@@ -6,20 +6,15 @@ The models are broadly categorised into the folders [vision](/vision) (e.g. larg
 
 ## Usage
 
-Each folder is its own [Julia project](https://julialang.github.io/Pkg.jl/latest/#Using-someone-else's-project-1), which lists the packages you need to run the models. You can run the models by opening Julia in the project folder and running
+The zoo comes with its own [Julia project](https://julialang.github.io/Pkg.jl/latest/#Using-someone-else's-project-1), which lists the packages you need to run the models. You can run the models by opening Julia in the project folder and running
 
 ```
 using Pkg; Pkg.activate("."); Pkg.instantiate()
 ```
 
 to install all needed packages. Then you can run the model code with `include("script.jl")` or by running the script line-by-line. More details are available in the README for each model.
 
-Models with a `cuda` folder can be loaded with NVIDIA GPU support, if you have a CUDA installed.
-
-```julia
-using Pkg; Pkg.activate("cuda"); Pkg.instantiate()
-using CuArrays
-```
+Models may also be run with NVIDIA GPU support, if you have a CUDA installed. Most models will have this capability by default, pointed at by calls to `gpu` in the model code.
 
 ### Gitpod Online IDE
 

diff --git a/contrib/README.md b/contrib/README.md
@@ -0,0 +1,5 @@
+# Model Contributions
+
+The models here have been contributed by community members to display some of the models that can be used in different fields.
+
+These models come with their own environments (the Project.toml and Manifest.toml files) so please make sure to use them while working with these models.
diff --git a/audio/speech-blstm/00-data.jl → contrib/audio/speech-blstm/00-data.jl b/audio/speech-blstm/00-data.jl → contrib/audio/speech-blstm/00-data.jl
diff --git a/audio/speech-blstm/01-speech-blstm.jl → ...rib/audio/speech-blstm/01-speech-blstm.jl b/audio/speech-blstm/01-speech-blstm.jl → ...rib/audio/speech-blstm/01-speech-blstm.jl
diff --git a/audio/speech-blstm/Manifest.toml → contrib/audio/speech-blstm/Manifest.toml b/audio/speech-blstm/Manifest.toml → contrib/audio/speech-blstm/Manifest.toml
diff --git a/audio/speech-blstm/Project.toml → contrib/audio/speech-blstm/Project.toml b/audio/speech-blstm/Project.toml → contrib/audio/speech-blstm/Project.toml
diff --git a/audio/speech-blstm/README.md → contrib/audio/speech-blstm/README.md b/audio/speech-blstm/README.md → contrib/audio/speech-blstm/README.md
diff --git a/audio/speech-blstm/TIMIT/README.md → contrib/audio/speech-blstm/TIMIT/README.md b/audio/speech-blstm/TIMIT/README.md → contrib/audio/speech-blstm/TIMIT/README.md
diff --git a/audio/speech-blstm/test/README.md → contrib/audio/speech-blstm/test/README.md b/audio/speech-blstm/test/README.md → contrib/audio/speech-blstm/test/README.md
diff --git a/audio/speech-blstm/train/README.md → contrib/audio/speech-blstm/train/README.md b/audio/speech-blstm/train/README.md → contrib/audio/speech-blstm/train/README.md
diff --git a/other/diffeq/Manifest.toml → contrib/diffeq/Manifest.toml b/other/diffeq/Manifest.toml → contrib/diffeq/Manifest.toml
diff --git a/other/diffeq/Project.toml → contrib/diffeq/Project.toml b/other/diffeq/Project.toml → contrib/diffeq/Project.toml
diff --git a/other/diffeq/README.md → contrib/diffeq/README.md b/other/diffeq/README.md → contrib/diffeq/README.md
diff --git a/other/diffeq/dde.jl → contrib/diffeq/dde.jl b/other/diffeq/dde.jl → contrib/diffeq/dde.jl
diff --git a/other/diffeq/lotka-volterra.jl → contrib/diffeq/lotka-volterra.jl b/other/diffeq/lotka-volterra.jl → contrib/diffeq/lotka-volterra.jl
diff --git a/other/diffeq/neural_ode.jl → contrib/diffeq/neural_ode.jl b/other/diffeq/neural_ode.jl → contrib/diffeq/neural_ode.jl
diff --git a/other/diffeq/neural_sde.jl → contrib/diffeq/neural_sde.jl b/other/diffeq/neural_sde.jl → contrib/diffeq/neural_sde.jl
diff --git a/other/diffeq/sde.jl → contrib/diffeq/sde.jl b/other/diffeq/sde.jl → contrib/diffeq/sde.jl
diff --git a/...ifferentiable-programming/cartpole/DQN.jl → ...ifferentiable-programming/cartpole/DQN.jl b/...ifferentiable-programming/cartpole/DQN.jl → ...ifferentiable-programming/cartpole/DQN.jl
diff --git a/...erentiable-programming/cartpole/DiffRL.jl → ...erentiable-programming/cartpole/DiffRL.jl b/...erentiable-programming/cartpole/DiffRL.jl → ...erentiable-programming/cartpole/DiffRL.jl
diff --git a/...tiable-programming/cartpole/Manifest.toml → ...tiable-programming/cartpole/Manifest.toml b/...tiable-programming/cartpole/Manifest.toml → ...tiable-programming/cartpole/Manifest.toml
diff --git a/...ntiable-programming/cartpole/Project.toml → ...ntiable-programming/cartpole/Project.toml b/...ntiable-programming/cartpole/Project.toml → ...ntiable-programming/cartpole/Project.toml
diff --git a/...e-programming/cartpole/cuda/Manifest.toml → ...e-programming/cartpole/cuda/Manifest.toml b/...e-programming/cartpole/cuda/Manifest.toml → ...e-programming/cartpole/cuda/Manifest.toml
diff --git a/...le-programming/cartpole/cuda/Project.toml → ...le-programming/cartpole/cuda/Project.toml b/...le-programming/cartpole/cuda/Project.toml → ...le-programming/cartpole/cuda/Project.toml
diff --git a/...fferentiable-programming/pendulum/DDPG.jl → ...fferentiable-programming/pendulum/DDPG.jl b/...fferentiable-programming/pendulum/DDPG.jl → ...fferentiable-programming/pendulum/DDPG.jl
diff --git a/...erentiable-programming/pendulum/DiffRL.jl → ...erentiable-programming/pendulum/DiffRL.jl b/...erentiable-programming/pendulum/DiffRL.jl → ...erentiable-programming/pendulum/DiffRL.jl
diff --git a/...tiable-programming/pendulum/Manifest.toml → ...tiable-programming/pendulum/Manifest.toml b/...tiable-programming/pendulum/Manifest.toml → ...tiable-programming/pendulum/Manifest.toml
diff --git a/...ntiable-programming/pendulum/Project.toml → ...ntiable-programming/pendulum/Project.toml b/...ntiable-programming/pendulum/Project.toml → ...ntiable-programming/pendulum/Project.toml
diff --git a/...e-programming/pendulum/cuda/Manifest.toml → ...e-programming/pendulum/cuda/Manifest.toml b/...e-programming/pendulum/cuda/Manifest.toml → ...e-programming/pendulum/cuda/Manifest.toml
diff --git a/...le-programming/pendulum/cuda/Project.toml → ...le-programming/pendulum/cuda/Project.toml b/...le-programming/pendulum/cuda/Project.toml → ...le-programming/pendulum/cuda/Project.toml
diff --git a/...ferentiable-programming/trebuchet/DDPG.jl → ...ferentiable-programming/trebuchet/DDPG.jl b/...ferentiable-programming/trebuchet/DDPG.jl → ...ferentiable-programming/trebuchet/DDPG.jl
diff --git a/...rentiable-programming/trebuchet/DiffRL.jl → ...rentiable-programming/trebuchet/DiffRL.jl b/...rentiable-programming/trebuchet/DiffRL.jl → ...rentiable-programming/trebuchet/DiffRL.jl
diff --git a/...iable-programming/trebuchet/Manifest.toml → ...iable-programming/trebuchet/Manifest.toml b/...iable-programming/trebuchet/Manifest.toml → ...iable-programming/trebuchet/Manifest.toml
diff --git a/...tiable-programming/trebuchet/Project.toml → ...tiable-programming/trebuchet/Project.toml b/...tiable-programming/trebuchet/Project.toml → ...tiable-programming/trebuchet/Project.toml
diff --git a/...-programming/trebuchet/cuda/Manifest.toml → ...-programming/trebuchet/cuda/Manifest.toml b/...-programming/trebuchet/cuda/Manifest.toml → ...-programming/trebuchet/cuda/Manifest.toml
diff --git a/...e-programming/trebuchet/cuda/Project.toml → ...e-programming/trebuchet/cuda/Project.toml b/...e-programming/trebuchet/cuda/Project.toml → ...e-programming/trebuchet/cuda/Project.toml
diff --git a/other/meta-learning/Manifest.toml → contrib/meta-learning/Manifest.toml b/other/meta-learning/Manifest.toml → contrib/meta-learning/Manifest.toml
diff --git a/other/meta-learning/MetaLearning.jl → contrib/meta-learning/MetaLearning.jl b/other/meta-learning/MetaLearning.jl → contrib/meta-learning/MetaLearning.jl
diff --git a/other/meta-learning/Project.toml → contrib/meta-learning/Project.toml b/other/meta-learning/Project.toml → contrib/meta-learning/Project.toml
diff --git a/other/meta-learning/fomaml_grad.png → contrib/meta-learning/fomaml_grad.png b/other/meta-learning/fomaml_grad.png → contrib/meta-learning/fomaml_grad.png
diff --git a/other/meta-learning/linear.jl → contrib/meta-learning/linear.jl b/other/meta-learning/linear.jl → contrib/meta-learning/linear.jl
diff --git a/other/meta-learning/reptile_grad.png → contrib/meta-learning/reptile_grad.png b/other/meta-learning/reptile_grad.png → contrib/meta-learning/reptile_grad.png
diff --git a/other/meta-learning/utils.jl → contrib/meta-learning/utils.jl b/other/meta-learning/utils.jl → contrib/meta-learning/utils.jl
diff --git a/other/bitstring-parity/Manifest.toml b/other/bitstring-parity/Manifest.toml
diff --git a/other/bitstring-parity/Project.toml b/other/bitstring-parity/Project.toml