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

Jump to bottom

Add a single normal form for sum-product contractions #157

Merged
merged 89 commits into from
Sep 17, 2019
Merged

Add a single normal form for sum-product contractions #157

merged 89 commits into from
Sep 17, 2019

Commits on Jul 10, 2019

  1. Add Contraction normal form for multilinear ops and normalize interpr… 

    …etation
    @eb8680
    eb8680 committed Jul 10, 2019
    Configuration menu
    Copy the full SHA
    f724719 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2019

  1. switch to variadic patterns and remove contraction subclasses

    @eb8680
    eb8680 committed Jul 13, 2019
    Configuration menu
    Copy the full SHA
    1b3d5ba View commit details
    Browse the repository at this point in the history

  2. add tests and push down unary reduce

    @eb8680
    eb8680 committed Jul 13, 2019
    Configuration menu
    Copy the full SHA
    281e6a6 View commit details
    Browse the repository at this point in the history

  3. add joint smoke tests

    @eb8680
    eb8680 committed Jul 13, 2019
    Configuration menu
    Copy the full SHA
    1f7db9a View commit details
    Browse the repository at this point in the history

  4. add plated einsum test cases

    @eb8680
    eb8680 committed Jul 13, 2019
    Configuration menu
    Copy the full SHA
    4bd5123 View commit details
    Browse the repository at this point in the history

  5. update negation test cases

    @eb8680
    eb8680 committed Jul 13, 2019
    Configuration menu
    Copy the full SHA
    6d68667 View commit details
    Browse the repository at this point in the history

  6. add joint-gaussian smoke tests

    @eb8680
    eb8680 committed Jul 13, 2019
    Configuration menu
    Copy the full SHA
    aef75ec View commit details
    Browse the repository at this point in the history

  7. make all tests pass

    @eb8680
    eb8680 committed Jul 13, 2019
    Configuration menu
    Copy the full SHA
    db77777 View commit details
    Browse the repository at this point in the history

  8. nit

    @eb8680
    eb8680 committed Jul 13, 2019
    Configuration menu
    Copy the full SHA
    c0289d8 View commit details
    Browse the repository at this point in the history

  9. add moment matching pattern

    @eb8680
    eb8680 committed Jul 13, 2019
    Configuration menu
    Copy the full SHA
    911b74a View commit details
    Browse the repository at this point in the history

  10. nits

    @eb8680
    eb8680 committed Jul 13, 2019
    Configuration menu
    Copy the full SHA
    7c7b7be View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2019

  1. add FUNSOR_NORMALIZE flag to interpreter

    @eb8680
    eb8680 committed Jul 17, 2019
    Configuration menu
    Copy the full SHA
    8f6ab12 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2019

  1. pull in changes

    @eb8680
    eb8680 committed Jul 18, 2019
    Configuration menu
    Copy the full SHA
    2284213 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2019

  1. Update eager patterns in contraction and interpretation resolution or… 

    …der in eager
    @eb8680
    eb8680 committed Jul 19, 2019
    Configuration menu
    Copy the full SHA
    2935568 View commit details
    Browse the repository at this point in the history

  2. nit

    @eb8680
    eb8680 committed Jul 19, 2019
    Configuration menu
    Copy the full SHA
    104da75 View commit details
    Browse the repository at this point in the history

  3. Add unit propagation

    @eb8680
    eb8680 committed Jul 19, 2019
    Configuration menu
    Copy the full SHA
    14e8355 View commit details
    Browse the repository at this point in the history

  4. remove dead code

    @eb8680
    eb8680 committed Jul 19, 2019
    Configuration menu
    Copy the full SHA
    74df439 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2019

  1. Merge branch 'master' into contraction-normal-form

    @eb8680
    eb8680 committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    8f0e64a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into contraction-normal-form

    @eb8680
    eb8680 committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    e860e42 View commit details
    Browse the repository at this point in the history

  3. remove __future__ impotrs

    @eb8680
    eb8680 committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    127adc4 View commit details
    Browse the repository at this point in the history

  4. skip adjoint tests

    @eb8680
    eb8680 committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    48367db View commit details
    Browse the repository at this point in the history

  5. Fix tests and lint

    @eb8680
    eb8680 committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    1433561 View commit details
    Browse the repository at this point in the history

  6. ignore annoying test case

    @eb8680
    eb8680 committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    1f5f5fc View commit details
    Browse the repository at this point in the history

  7. lint

    @eb8680
    eb8680 committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    6323b04 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into contraction-normal-form

    @eb8680
    eb8680 committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    7338362 View commit details
    Browse the repository at this point in the history

  9. fix examples

    @eb8680
    eb8680 committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    f69b2e8 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into contraction-normal-form

    @eb8680
    eb8680 committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    6fa04c6 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2019

  1. Refactor optimizer to use Contraction and normalize (#165) 

    * Add a type-aware eager contraction evaluator

* Update optimizer to use Contraction

* Remove funsor.contract

* Make tests pass and resolve recursion issues

* revert file removal
    @eb8680
    eb8680 authored Jul 26, 2019
    Configuration menu
    Copy the full SHA
    a4b2ec2 View commit details
    Browse the repository at this point in the history

  2. Refactor Affine into Contraction (#173) 

    * Remove Affine

* remove duplicated test

* nit

* generalize is_affine

* register Funsor reciprocal
    @eb8680
    eb8680 authored Jul 26, 2019
    Configuration menu
    Copy the full SHA
    e209789 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'contraction-normal-form' of github.com:pyro-ppl/funsor … 

    …into contraction-normal-form
    @eb8680
    eb8680 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    3259855 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into contraction-normal-form

    @eb8680
    eb8680 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    880d912 View commit details
    Browse the repository at this point in the history

  5. fix recursion error and joint test

    @eb8680
    eb8680 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    9f08ca9 View commit details
    Browse the repository at this point in the history

  6. pull in some upstream changes to cnf

    @eb8680
    eb8680 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    c71a840 View commit details
    Browse the repository at this point in the history

  7. lint

    @eb8680
    eb8680 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    f0d3d89 View commit details
    Browse the repository at this point in the history

  8. cons-cache result of normalize interpretation

    @eb8680
    eb8680 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    de5cabf View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2019

  1. Merge branch 'master' into contraction-normal-form

    @eb8680
    eb8680 committed Jul 27, 2019
    Configuration menu
    Copy the full SHA
    18af1be View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2019

  1. update naive_contract_einsum

    @eb8680
    eb8680 committed Jul 30, 2019
    Configuration menu
    Copy the full SHA
    48b605c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into contraction-normal-form

    @eb8680
    eb8680 committed Jul 30, 2019
    Configuration menu
    Copy the full SHA
    3a6ad54 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2019

  1. Add pass and fail cases to test_reduce_subset

    @eb8680
    eb8680 committed Jul 31, 2019
    Configuration menu
    Copy the full SHA
    f74bbea View commit details
    Browse the repository at this point in the history

  2. tweak sequential test

    @eb8680
    eb8680 committed Jul 31, 2019
    Configuration menu
    Copy the full SHA
    06dacfc View commit details
    Browse the repository at this point in the history

  3. Pull in changes from cnf-joint that are not joint-related

    @eb8680
    eb8680 committed Jul 31, 2019
    Configuration menu
    Copy the full SHA
    fe64b25 View commit details
    Browse the repository at this point in the history

  4. Pull in cnf-joint changes to cnf.py that are unrelated to joint

    @eb8680
    eb8680 committed Jul 31, 2019
    Configuration menu
    Copy the full SHA
    74e2460 View commit details
    Browse the repository at this point in the history

  5. Refactor Joint into multivariate Delta and Contraction (#169) 

    * start removing some joint patterns

* Update joint smoke tests

* add a rule for permuting joint inputs

* make more joint and gaussian tests pass

* Add multidelta term

* remove Joint, integrator, dead code

* remove remaining Joint appearances

* remove duplicate test cases

* fix smoke tests

* lint

* remove duplicate moment matching test

* make commutativity pattern less of a hack

* fix bug in delta

* move joint patterns to joint.py

* remove redundant pattern

* remove Delta entirely in favor of MultiDelta

* refactor MultiDelta to have a single log-density tensor

* have Tensor.unscaled_sample return a single MultiDelta

* revert Tensor.unscaled_sample to Delta

* fix moment matching

* lint

* remove incorrect tensor contraction

* another attempt at scaling

* removed faulty pattern that was causing gaussian integration tests to fail

* fix one bug in minipyro and expose another

* fix minipyro.Distribution.expand_inputs

* increase tolerance in sequential_sum_product test

* fix a couple more tests

* fix wrong log pattern

* sketch independent?

* All integrate tests pass

* Add basic align method to Contraction

* nit

* remove inplace op in reciprocal

* fix advanced indexing tests

* fix independent
    @eb8680
    eb8680 authored Jul 31, 2019
    Configuration menu
    Copy the full SHA
    d2c79b0 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2019

  1. Add normalize patterns for eliminating log(exp), exp(log), neg(neg), and 

    remove cons-caching in normalize interpreter
    @eb8680
    eb8680 committed Aug 7, 2019
    Configuration menu
    Copy the full SHA
    b461e47 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into contraction-normal-form

    @eb8680
    eb8680 committed Aug 7, 2019
    Configuration menu
    Copy the full SHA
    b5c9844 View commit details
    Browse the repository at this point in the history

  3. fix smoke tests

    @eb8680
    eb8680 committed Aug 7, 2019
    Configuration menu
    Copy the full SHA
    9f93f9d View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2019

  1. Merge branch 'master' into contraction-normal-form

    @eb8680
    eb8680 committed Aug 17, 2019
    Configuration menu
    Copy the full SHA
    6cc4a1f View commit details
    Browse the repository at this point in the history

  2. fix adjoint

    @eb8680
    eb8680 committed Aug 17, 2019
    Configuration menu
    Copy the full SHA
    2575e97 View commit details
    Browse the repository at this point in the history

  3. use normalize when computing adjoints

    @eb8680
    eb8680 committed Aug 17, 2019
    Configuration menu
    Copy the full SHA
    4a6cc0c View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2019

  1. Merge branch 'master' into contraction-normal-form

    @eb8680
    eb8680 committed Aug 19, 2019
    Configuration menu
    Copy the full SHA
    6fca2ba View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2019

  1. Squashed commit of the following: 

    commit c8b851615cbf7c3da9526cc42383805fda34464b
Author: Eli <[email protected]>
Date:   Sat Aug 31 19:39:32 2019 -0700

    fix fusion condition

commit 211379337db7912f70ce09e9ad4903f27b2e1c0e
Author: Eli <[email protected]>
Date:   Sat Aug 31 19:12:42 2019 -0700

    fix affine

commit 31b2e4dc7680e428bcbb6cb422ebbf3cc8483086
Merge: 7d18851 6fca2ba
Author: Eli <[email protected]>
Date:   Mon Aug 19 14:14:12 2019 -0700

    Merge branch 'contraction-normal-form' into separate-unfold-from-cnf

commit 7d1885129d262fbb0c6c7d27360987a09c0da78f
Merge: 1edfa18 4a6cc0c
Author: Eli <[email protected]>
Date:   Fri Aug 16 21:23:09 2019 -0700

    Merge branch 'contraction-normal-form' into separate-unfold-from-cnf

commit 1edfa1880ff9361b909d5ee6c906dc69ad344560
Author: Eli <[email protected]>
Date:   Fri Aug 16 21:17:57 2019 -0700

    change semiring

commit 354277b3249a8e0d6a93ecc5d2c954bd8f43fd10
Merge: 2038544 2575e97
Author: Eli <[email protected]>
Date:   Fri Aug 16 18:50:36 2019 -0700

    Merge branch 'contraction-normal-form' into separate-unfold-from-cnf

commit 2038544ac0314153b8b3a4527b8aa7c33b358366
Author: Eli <[email protected]>
Date:   Fri Aug 16 18:46:28 2019 -0700

    change to new api

commit 69c5f639b1c24cde651d310110f8967eb80da12d
Merge: 6e33dd4 6cc4a1f
Author: Eli <[email protected]>
Date:   Fri Aug 16 18:09:16 2019 -0700

    Merge branch 'contraction-normal-form' into separate-unfold-from-cnf

commit 6e33dd42a76d1b0aef6cd58f8d3740974e58f652
Author: Eli <[email protected]>
Date:   Thu Aug 15 14:42:46 2019 -0700

    separate unfolding from normalization
    @eb8680
    eb8680 committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    ffdd381 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into contraction-normal-form

    @eb8680
    eb8680 committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    57a43bd View commit details
    Browse the repository at this point in the history

  3. fix merge errors

    @eb8680
    eb8680 committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    e7ed3bf View commit details
    Browse the repository at this point in the history

  4. update moment matching to match master

    @eb8680
    eb8680 committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    df056c2 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into contraction-normal-form

    @eb8680
    eb8680 committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    4ce4adc View commit details
    Browse the repository at this point in the history

  6. use pattern matching in cnf

    @eb8680
    eb8680 committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    b8f7e9f View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2019

  1. add number-gaussian mixture

    @eb8680
    eb8680 committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    8714349 View commit details
    Browse the repository at this point in the history

  2. simplify some patterns

    @eb8680
    eb8680 committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    4cb9546 View commit details
    Browse the repository at this point in the history

  3. remove some obsolete patterns

    @eb8680
    eb8680 committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    1187edc View commit details
    Browse the repository at this point in the history

  4. remove obsolete sample patterns

    @eb8680
    eb8680 committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    e1bf2a0 View commit details
    Browse the repository at this point in the history

  5. remove obsolete joint pattern

    @eb8680
    eb8680 committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    e59d85f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into contraction-normal-form

    @eb8680
    eb8680 committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    a3c00a6 View commit details
    Browse the repository at this point in the history

  7. switch MultiDelta to one density per part

    @eb8680
    eb8680 committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    30cbcb1 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into contraction-normal-form

    @eb8680
    eb8680 committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    d8532d3 View commit details
    Browse the repository at this point in the history

  9. remove dead code

    @eb8680
    eb8680 committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    0ca8e96 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into contraction-normal-form

    @eb8680
    eb8680 committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    15ac285 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2019

  1. tweak persistently failing tests

    @eb8680
    eb8680 committed Sep 5, 2019
    Configuration menu
    Copy the full SHA
    23d2551 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into contraction-normal-form

    @eb8680
    eb8680 committed Sep 5, 2019
    Configuration menu
    Copy the full SHA
    09d8e4f View commit details
    Browse the repository at this point in the history

  3. use nested union types

    @eb8680
    eb8680 committed Sep 5, 2019
    Configuration menu
    Copy the full SHA
    85b189c View commit details
    Browse the repository at this point in the history

  4. make moment matching pattern more specific

    @eb8680
    eb8680 committed Sep 5, 2019
    Configuration menu
    Copy the full SHA
    a09648b View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2019

  1. fixed infinite loop in Integrate evaluation, now seeing different err… 

    …ors in adjoint and einsum
    @eb8680
    eb8680 committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    c4240dd View commit details
    Browse the repository at this point in the history

  2. fix regressions in adjoint and einsum

    @eb8680
    eb8680 committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    aadf5e3 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2019

  1. nit

    @eb8680
    eb8680 committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    0ac8791 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2019

  1. Merge branch 'master' into contraction-normal-form

    @eb8680
    eb8680 committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    f93141a View commit details
    Browse the repository at this point in the history

  2. patch test_reduce_subset

    @eb8680
    eb8680 committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    44fea35 View commit details
    Browse the repository at this point in the history

  3. xfail test_joint.py::test_reduce_moment_matching_moment for missing p… 

    …atterns, all other tests and examples now pass
    @eb8680
    eb8680 committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    1d089a4 View commit details
    Browse the repository at this point in the history

  4. normalize by default

    @eb8680
    eb8680 committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    bb416b1 View commit details
    Browse the repository at this point in the history

  5. move all joint-specific patterns out of cnf and into joint

    @eb8680
    eb8680 committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    847e208 View commit details
    Browse the repository at this point in the history

  6. revert code movement, is there an import missing somewhere?

    @eb8680
    eb8680 committed Sep 12, 2019
    Configuration menu
    Copy the full SHA
    e285c2f View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2019

  1. rename AnyOp to NullOp

    @eb8680
    eb8680 committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    8eb0930 View commit details
    Browse the repository at this point in the history

  2. remove Delta alias, rename MultiDelta to Delta

    @eb8680
    eb8680 committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    96ba8d3 View commit details
    Browse the repository at this point in the history

  3. remove FUNSOR_NORMALIZE flag and fix error type in cat

    @eb8680
    eb8680 committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    0adc1d3 View commit details
    Browse the repository at this point in the history

  4. fix error in Integrate(Gaussian, Variable)

    @eb8680
    eb8680 committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    98d63e5 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2019

  1. add missing Independent patterns, vae example and bart example pass s… 

    …moke tests
    @eb8680
    eb8680 committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    b066e80 View commit details
    Browse the repository at this point in the history

  2. fix test_normal_independent

    @eb8680
    eb8680 committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    307e7bd View commit details
    Browse the repository at this point in the history

  3. address review comments

    @eb8680
    eb8680 committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    a137c18 View commit details
    Browse the repository at this point in the history

  4. remove commented code

    @eb8680
    eb8680 committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    227fe9c View commit details
    Browse the repository at this point in the history

  5. fix assertion

    @eb8680
    eb8680 committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    76307c4 View commit details
    Browse the repository at this point in the history

  6. remove comment

    @eb8680
    eb8680 committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    b2eb02f View commit details
    Browse the repository at this point in the history