Skip to content

Fix for issue #2909 #2946

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

Closed
wants to merge 1 commit into from
Closed

Fix for issue #2909 #2946

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
2 changes: 1 addition & 1 deletion pymc3/distributions/discrete.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def __init__(self, n, p, *args, **kwargs):
self.mode = tt.cast(tround(n * p), self.dtype)

def random(self, point=None, size=None, repeat=None):
n, p = draw_values([self.n, self.p], point=point)
n, p = draw_values([self.n, self.p], point=point, size=size)
return generate_samples(stats.binom.rvs, n=n, p=p,
dist_shape=self.shape,
size=size)
Expand Down
12 changes: 7 additions & 5 deletions pymc3/distributions/distribution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def __init__(self, logp, shape=(), dtype=None, testval=0, *args, **kwargs):
self.logp = logp


def draw_values(params, point=None):
def draw_values(params, point=None, size=None):
"""
Draw (fix) parameter values. Handles a number of cases:

Expand Down Expand Up @@ -215,10 +215,10 @@ def draw_values(params, point=None):
for name, node in named_nodes.items():
if not isinstance(node, (tt.sharedvar.SharedVariable,
tt.TensorConstant)):
givens[name] = (node, _draw_value(node, point=point))
givens[name] = (node, _draw_value(node, point=point, size=size))
values = []
for param in params:
values.append(_draw_value(param, point=point, givens=givens.values()))
values.append(_draw_value(param, point=point, givens=givens.values(), size=size))
return values


Expand Down Expand Up @@ -247,7 +247,7 @@ def _compile_theano_function(param, vars, givens=None):
allow_input_downcast=True)


def _draw_value(param, point=None, givens=None):
def _draw_value(param, point=None, givens=None, size=None):
"""Draw a random value from a distribution or return a constant.

Parameters
Expand All @@ -263,6 +263,8 @@ def _draw_value(param, point=None, givens=None):
givens : dict, optional
A dictionary from theano variables to their values. These values
are used to evaluate `param` if it is a theano variable.
size: int, optional
Number of sampling
"""
if isinstance(param, numbers.Number):
return param
Expand All @@ -276,7 +278,7 @@ def _draw_value(param, point=None, givens=None):
if point and hasattr(param, 'model') and param.name in point:
return point[param.name]
elif hasattr(param, 'random') and param.random is not None:
return param.random(point=point, size=None)
return param.random(point=point, size=size).mean(axis=0)
else:
if givens:
variables, values = list(zip(*givens))
Expand Down