Merge branch 'master' into hg/abstract-mcmc-1.0

Author: yebai

.travis.yml

@@ -8,9 +8,7 @@ os:
   - osx
 julia:
   - 1.0
-  - 1.1
-  - 1.2
-  - 1.3
+  - 1
   - nightly
 matrix:
   allow_failures:
@@ -19,6 +17,6 @@ matrix:
 notifications:
   email: false
 after_success:
-  - if [[ $TRAVIS_JULIA_VERSION = 1.3 ]] && [[ $TRAVIS_OS_NAME = linux ]]; then
+  - if [[ $TRAVIS_JULIA_VERSION = 1 ]] && [[ $TRAVIS_OS_NAME = linux ]]; then
       julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())';
     fi

Project.toml

@@ -8,12 +8,14 @@ AbstractMCMC = "80f14c24-f653-4e6a-9b94-39d6b0f70001"
 Bijectors = "76274a88-744f-5084-9051-94815aaf08c4"
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
+ZygoteRules = "700de1a5-db45-46bc-99cf-38207098b444"
 
 [compat]
 AbstractMCMC = "1.0"
 Bijectors = "0.5.2, 0.6"
 Distributions = "0.22, 0.23"
 MacroTools = "0.5.1"
+ZygoteRules = "0.2"
 julia = "1"
 
 [extras]

src/DynamicPPL.jl

@@ -4,12 +4,11 @@ using AbstractMCMC: AbstractSampler, AbstractChains, AbstractModel
 using Distributions
 using Bijectors
 using MacroTools
+import ZygoteRules
 
-import Base: string,
-             Symbol,
+import Base: Symbol,
              ==,
              hash,
-             in,
              getindex,
              setindex!,
              push!,
@@ -22,8 +21,7 @@ import Base: string,
              haskey
 
 # VarInfo
-export  VarName,
-        AbstractVarInfo,
+export  AbstractVarInfo,
         VarInfo,
         UntypedVarInfo,
         getlogp,
@@ -44,13 +42,14 @@ export  VarName,
         link!,
         invlink!,
         tonamedtuple,
+#VarName
+        VarName,
+        inspace,
+        subsumes,
 # Compiler
         ModelGen,
         @model,
         @varname,
-        @varinfo,
-        @logpdf,
-        @sampler,
 # Utilities
         vectorize,
         reconstruct,
@@ -61,9 +60,12 @@ export  VarName,
         vectorize,
         set_resume!,
 # Model
+        ModelGen,
         Model,
-        getmissing,
-        runmodel!,
+        getmissings,
+        getargnames,
+        getdefaults,
+        getgenerator,
 # Samplers
         Sampler,
         SampleFromPrior,
@@ -91,6 +93,11 @@ const DEBUG = Bool(parse(Int, get(ENV, "DEBUG_DYNAMICPPL", "0")))
 # Used here and overloaded in Turing
 function getspace end
 
+# Necessary forward declarations
+abstract type AbstractVarInfo end
+abstract type AbstractContext end
+
+
 include("utils.jl")
 include("selector.jl")
 include("model.jl")
@@ -102,5 +109,6 @@ include("varinfo.jl")
 include("context_implementations.jl")
 include("compiler.jl")
 include("prob_macro.jl")
+include("compat/ad.jl")
 
 end # module

src/compat/ad.jl

@@ -0,0 +1,11 @@
+# Prevent Zygote from differentiating push!
+# See https://github.com/TuringLang/Turing.jl/issues/1199
+ZygoteRules.@adjoint function push!(
+    vi::VarInfo,
+    vn::VarName,
+    r,
+    dist::Distribution,
+    gidset::Set{Selector}
+)
+    return push!(vi, vn, r, dist, gidset), _ -> nothing
+end