Change LDA to new syntax.

TuringLang · May 2, 2017 · de0bfdf · de0bfdf
1 parent f4d69f9
commit de0bfdf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/benchmarks/lda.model.jl b/benchmarks/lda.model.jl
@@ -27,15 +27,15 @@
 #   }
 # }
 
-@model ldamodel(K, V, M, N, w, doc, alpha, beta) = begin
+@model ldamodel(K, V, M, N, w, doc, beta, alpha) = begin
   theta = Vector{Vector{Real}}(M)
   for m = 1:M
     theta[m] ~ Dirichlet(alpha)
   end
 
   phi = Vector{Vector{Real}}(K)
   for k = 1:K
-    phi[k] ~ Dirichlet(β)
+    phi[k] ~ Dirichlet(beta)
   end
 
   # z = tzeros(Int, N)

diff --git a/benchmarks/lda.run.jl b/benchmarks/lda.run.jl
@@ -4,7 +4,7 @@ include("benchmarkhelper.jl")
 include("lda-stan.data.jl")
 include("lda.model.jl")
 
-bench_res = tbenchmark("HMCDA(300, 0.65, 1.5)", "ldamodel", "ldastandata[1]")
+bench_res = tbenchmark("HMCDA(300, 0.65, 1.5)", "ldamodel", "data=ldastandata[1]")
 bench_res[4].names = ["phi[1]", "phi[2]"]
 logd = build_logd("LDA", bench_res...)
 

diff --git a/src/Turing.jl b/src/Turing.jl
@@ -56,7 +56,9 @@ doc"""
 Debugging print function: The first argument controls the verbosity of message, e.g. larger v leads to more verbose debugging messages.
 """
 dprintln(v, args...) = v < Turing.VERBOSITY ? println("\r[Turing]: ", args..., "\n $(stacktrace()[2])") : nothing
-dwarn(v, args...) = v < Turing.VERBOSITY ? print_with_color(:red, "\r[Turing]: ", mapreduce(string,*,args), "\n $(stacktrace()[2])\n") : nothing
+dwarn(v, args...) = v < Turing.VERBOSITY ? print_with_color(:red, "\r[Turing.WARNING]: ", mapreduce(string,*,args), "\n $(stacktrace()[2])\n") : nothing
+derror(v, args...) = error("\r[Turing.ERROR]: ", mapreduce(string,*,args))
+
 
 global FCOMPILER = 1
 

diff --git a/src/core/compiler.jl b/src/core/compiler.jl
@@ -245,14 +245,15 @@ macro model(fexpr)
     end
     if _k != nothing
       _k_str = string(_k)
+      dprintln(1, _k_str, " = ", _k)
       _ = quote
             if haskey(data, keytype(data)($_k_str))
               if nothing != $_k
-                warn(" parameter "*$_k_str*" found twice, value in data dictionary will be used.")
+                Turing.dwarn(0, " parameter "*$_k_str*" found twice, value in data dictionary will be used.")
               end
             else
               data[keytype(data)($_k_str)] = $_k
-              data[keytype(data)($_k_str)] == nothing && error(" data "*$_k_str*" is not provided.")
+              data[keytype(data)($_k_str)] == nothing && Turing.derror(0, "Data `"*$_k_str*"` is not provided.")
             end
           end
       unshift!(fdefn_outer.args[2].args, _)