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

Rename funsor.contract module to funsor.sum_product #81

Merged
merged 1 commit into from
Mar 19, 2019
Merged

Rename funsor.contract module to funsor.sum_product #81

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
6 changes: 3 additions & 3 deletions funsor/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
from funsor.terms import Funsor, Number, Variable, of_shape, to_funsor
from funsor.torch import Function, Tensor, arange, function, torch_einsum

from . import (adjoint, contract, delta, distributions, domains, einsum, gaussian, handlers, interpreter, joint,
minipyro, ops, terms, torch)
from . import (adjoint, delta, distributions, domains, einsum, gaussian, handlers, interpreter, joint,
minipyro, ops, sum_product, terms, torch)

__all__ = [
'Domain',
Expand All @@ -19,7 +19,6 @@
'arange',
'backward',
'bint',
'contract',
'delta',
'distributions',
'domains',
Expand All @@ -35,6 +34,7 @@
'ops',
'reals',
'reinterpret',
'sum_product',
'terms',
'to_funsor',
'torch',
Expand Down
2 changes: 1 addition & 1 deletion funsor/einsum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from funsor.interpreter import interpretation, reinterpret
from funsor.optimizer import apply_optimizer
from funsor.terms import Funsor, reflect
from funsor.contract import sum_product
from funsor.sum_product import sum_product


def naive_einsum(eqn, *terms, **kwargs):
Expand Down
4 changes: 2 additions & 2 deletions funsor/minipyro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ def log_prob(self):
factors = list(self.log_probs.values())
plates = frozenset().union(*self.log_probs)
samples = frozenset().union(*(f.inputs for f in factors)) - plates
log_prob = funsor.contract.sum_product(
log_prob = funsor.sum_product.sum_product(
sum_op=ops.logaddexp,
prod_op=ops.add,
factors=factors,
Expand Down Expand Up @@ -278,7 +278,7 @@ def process(self, msg):
# Eliminate samples and plates via tensor variable elimination.
# This is analagous to pyro 0.3's contract_tensor_tree().
with funsor.trace_monte_carlo_approximations() as subs:
factors = funsor.contract.partial_sum_product(
factors = funsor.sum_product.partial_sum_product(
sum_op=ops.logaddexp,
prod_op=ops.add,
factors=self.log_probs.values(),
Expand Down
0 funsor/contract.py → funsor/sum_product.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion test/test_contract.py → test/test_sum_product.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from six.moves import reduce

import funsor.ops as ops
from funsor.contract import _partition, partial_sum_product, sum_product
from funsor.sum_product import _partition, partial_sum_product, sum_product
from funsor.domains import bint
from funsor.testing import assert_close, random_tensor

Expand Down