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.

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

add Multinomial distribution #1

Merged
merged 1 commit into from
Apr 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions pixyz/distributions/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
FactorizedBernoulli,
Categorical,
RelaxedCategorical,
Multinomial,
Dirichlet,
Beta,
Laplace,
Expand Down Expand Up @@ -45,6 +46,7 @@
'FactorizedBernoulli',
'Categorical',
'RelaxedCategorical',
'Multinomial',
'Dirichlet',
'Beta',
'Laplace',
Expand Down
17 changes: 16 additions & 1 deletion pixyz/distributions/exponential_distributions.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import RelaxedOneHotCategorical as RelaxedOneHotCategoricalTorch
from torch.distributions.one_hot_categorical\
import OneHotCategorical as CategoricalTorch
from torch.distributions import Multinomial as MultinomialTorch
from torch.distributions import Dirichlet as DirichletTorch
from torch.distributions import Beta as BetaTorch
from torch.distributions import Laplace as LaplaceTorch
Expand Down Expand Up @@ -167,6 +168,21 @@ def log_likelihood(self, x):
log_like = self._get_log_like(x)
return sum_samples(log_like)

class Multinomial(DistributionBase):
"""
Multinomial distribution parameterized by :attr:`total_count` and :attr:`probs`.
"""

def __init__(self, cond_var=[], var=["x"], name="p", dim=None, **kwargs):
self.params_keys = ["total_count", "probs"]
self.DistributionTorch = MultinomialTorch

super().__init__(cond_var=cond_var, var=var, name=name, dim=dim, **kwargs)

@property
def distribution_name(self):
return "Multinomial"


class Dirichlet(DistributionBase):
"""
Expand Down Expand Up @@ -230,4 +246,3 @@ def __init__(self, cond_var=[], var=["x"], name="p", dim=None, **kwargs):
@property
def distribution_name(self):
return "Gamma"