Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow M as a variable name #340

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow M as a variable name #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/importance.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,8 @@ end
loadvals(_pargs, NamedTuple()) |>
merge_pqargs

@under_global from_type(_unwrap_type(M)) @q let M
@gensym _M
@under_global from_type(_unwrap_type(M)) @q let $_M
$body
end
end
6 changes: 4 additions & 2 deletions src/particles.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,16 @@ end

@gg function _particles(M::Type{<:TypeLevel}, _m::Model, _args, _n::Val{_N}) where {_N}
body = sourceParticles()(type2model(_m), _n) |> loadvals(_args, NamedTuple())
@under_global from_type(_unwrap_type(M)) @q let M
@gensym _M
@under_global from_type(_unwrap_type(M)) @q let $_M
$body
end
end

@gg function _particles(M::Type{<:TypeLevel}, _m::Model, _args::NamedTuple{()}, _n::Val{_N}) where {_N}
body = sourceParticles()(type2model(_m), _n)
@under_global from_type(_unwrap_type(M)) @q let M
@gensym _M
@under_global from_type(_unwrap_type(M)) @q let $_M
$body
end
end
3 changes: 2 additions & 1 deletion src/primitives/as.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ as(d::Dists.AbstractMvNormal, _data::NamedTuple=NamedTuple()) = as(Array, size(d

@gg function _as(M::Type{<:TypeLevel}, _m::Model{Asub,B}, _args::A, _data) where {Asub,A,B}
body = type2model(_m) |> sourceXform(_data) |> loadvals(_args, _data)
@under_global from_type(_unwrap_type(M)) @q let M
@gensym _M
@under_global from_type(_unwrap_type(M)) @q let $_M
$body
end
end
Expand Down
3 changes: 2 additions & 1 deletion src/primitives/basemeasure.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ end

@gg function _basemeasure(M::Type{<:TypeLevel}, _m::Model, _args, _pars)
body = type2model(_m) |> sourceBasemeasure() |> loadvals(_args, _pars)
@under_global from_type(_unwrap_type(M)) @q let M
@gensym _M
@under_global from_type(_unwrap_type(M)) @q let $_M
$body
end
end
6 changes: 4 additions & 2 deletions src/primitives/entropy.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,16 @@ end

@gg function _entropy(M::Type{<:TypeLevel}, _m::Model, _args, _n::Val{_N}) where {_N}
body = sourceEntropy()(type2model(_m), _n()) |> loadvals(_args, NamedTuple())
@under_global from_type(_unwrap_type(M)) @q let M
@gensym _M
@under_global from_type(_unwrap_type(M)) @q let $_M
$body
end
end

@gg function _entropy(M::Type{<:TypeLevel}, _m::Model, _args::NamedTuple{()}, _n::Val{_N}) where {_N}
body = sourceEntropy()(type2model(_m), _n)
@under_global from_type(_unwrap_type(M)) @q let M
@gensym _M
@under_global from_type(_unwrap_type(M)) @q let $_M
$body
end
end
3 changes: 2 additions & 1 deletion src/primitives/insupport.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ end

@gg function _insupport(M::Type{<:TypeLevel}, _m::Model, _args, _data, _pars)
body = type2model(_m) |> sourceInsupport() |> loadvals(_args, _data, _pars)
@under_global from_type(_unwrap_type(M)) @q let M
@gensym _M
@under_global from_type(_unwrap_type(M)) @q let $_M
$body
end
end
3 changes: 2 additions & 1 deletion src/primitives/likelihood-weighting.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ end

@gg function _weightedSample(M::Type{<:TypeLevel}, _m::Model, _args, _data)
body = type2model(_m) |> sourceWeightedSample(_data) |> loadvals(_args, _data)
@under_global from_type(_unwrap_type(M)) @q let M
@gensym _M
@under_global from_type(_unwrap_type(M)) @q let $_M
$body
end
end
3 changes: 2 additions & 1 deletion src/primitives/logdensity.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ end

@gg function _logdensityof(M::Type{<:TypeLevel}, _m::Model, _args, _data, _pars)
body = type2model(_m) |> sourceLogdensityOf() |> loadvals(_args, _data, _pars)
@under_global from_type(_unwrap_type(M)) @q let M
@gensym _M
@under_global from_type(_unwrap_type(M)) @q let $_M
$body
end
end
Expand Down
6 changes: 4 additions & 2 deletions src/primitives/rand.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,16 @@ end

@gg function _rand(M::Type{<:TypeLevel}, _m::Model, _args)
body = type2model(_m) |> sourceRand() |> loadvals(_args, NamedTuple())
@under_global from_type(_unwrap_type(M)) @q let M
@gensym _M
@under_global from_type(_unwrap_type(M)) @q let $_M
$body
end
end

@gg function _rand(M::Type{<:TypeLevel}, _m::Model, _args::NamedTuple{()})
body = type2model(_m) |> sourceRand()
@under_global from_type(_unwrap_type(M)) @q let M
@gensym _M
@under_global from_type(_unwrap_type(M)) @q let $_M
$body
end
end
6 changes: 4 additions & 2 deletions src/primitives/simulate.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,17 @@ simulate(rng::AbstractRNG, μ::AbstractMeasure; trace_assignments=false) = rand(
@gg function _simulate(M::Type{<:TypeLevel}, _m::Model, _args, trace_assignments::Val{V}) where {V}
trace_assignments = V
body = type2model(_m) |> sourceSimulate(trace_assignments) |> loadvals(_args, NamedTuple())
@under_global from_type(_unwrap_type(M)) @q let M
@gensym _M
@under_global from_type(_unwrap_type(M)) @q let $_M
$body
end
end

@gg function _simulate(M::Type{<:TypeLevel}, _m::Model, _args::NamedTuple{()}, trace_assignments::Val{V}) where {V}
trace_assignments = V
body = type2model(_m) |> sourceSimulate(trace_assignments)
@under_global from_type(_unwrap_type(M)) @q let M
@gensym _M
@under_global from_type(_unwrap_type(M)) @q let $_M
$body
end
end
6 changes: 4 additions & 2 deletions src/primitives/testvalue.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,16 @@ end

@gg function _testvalue(M::Type{<:TypeLevel}, _m::Model, _args)
body = type2model(_m) |> sourceTestvalue() |> loadvals(_args, NamedTuple())
@under_global from_type(_unwrap_type(M)) @q let M
@gensym _M
@under_global from_type(_unwrap_type(M)) @q let $_M
$body
end
end

@gg function _testvalue(M::Type{<:TypeLevel}, _m::Model, _args::NamedTuple{()})
body = type2model(_m) |> sourceTestvalue()
@under_global from_type(_unwrap_type(M)) @q let M
@gensym _M
@under_global from_type(_unwrap_type(M)) @q let $_M
$body
end
end
3 changes: 2 additions & 1 deletion src/symbolic/symbolic.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ end
types = GeneralizedGenerated.from_type(T)
Sym = SymbolicUtils.Sym
body = type2model(_m) |> sourceSymlogdensity(types)
@under_global from_type(_unwrap_type(M)) @q let M
@gensym _M
@under_global from_type(_unwrap_type(M)) @q let $_M
$body
end
end