Code

Initial support for Implicit TPMs#105

Code

Open

isacdaavid wants to merge 191 commits intofeature/iit-4.0wmayner/pyphi:feature/iit-4.0from feature/tpm-classwmayner/pyphi:feature/tpm-classCopy head branch name to clipboard

+1,994-592

Commits

Commits on Jan 3, 2023

• tpm.ProxyMetaclass: Change list to generator expression

  isacdaavid

  committed
  a9be5c2

• tpm: Improve documentation

  isacdaavid

  committed
  d0000b1

• Move TPM documentation to tpm.ExplicitTPM class

  isacdaavid

  committed
  39796ca

Commits on Jan 5, 2023

• tpm.ExplicitTPM: Remove superfluous call to super constructor

  isacdaavid

  committed
  a357031

• tpm.ExplicitTPM: Preserve column alignment in string representation.

  isacdaavid

  committed
  b15924a

Commits on Jan 6, 2023

• subsystem: Complete ExplicitTPM.enforce cleanup

  Show description for 9c349e2
  isacdaavid

  committed
  9c349e2

Commits on Jan 7, 2023

• Refactor Node to use xarray DataArray (accessor namespace for now)

  isacdaavid

  committed
  91772ac

Commits on Jan 10, 2023

• Node: Add support for multivalued and heterogeneous units

  isacdaavid

  committed
  db0a505

Commits on Jan 11, 2023

• Node: Fix docstring

  isacdaavid

  committed
  b77efbb

• Node.node: Singleton coords aren't necessarily due to marginalization

  isacdaavid

  committed
  890ed62

Commits on Jan 12, 2023

• tpm: Add abstract class ImplicitTPM and decorate for xr.Dataset

  isacdaavid

  committed
  f31a38a

Commits on Jan 13, 2023

• Refactor Network and Node for future implicit TPM support

  isacdaavid

  committed
  5c8c626

Commits on Jan 16, 2023

• Send duplicate state space filtering to utils.build_state_space()

  isacdaavid

  committed
  7e43f6f

• Network.__init__: Avoid transient storage of nodes beyond the TPM

  isacdaavid

  committed
  b3687c7

• Network.to_json Include state_space attribute.

  isacdaavid

  committed
  34e7032

• Network.__len__: Go back to counting nodes in the TPM (now a Dataset).

  isacdaavid

  committed
  0dd6036

Commits on Jan 17, 2023

• build_state_space(): Fix Union declaration

  dviggiano

  committed
  ed3bce3

• Fix widespread Union declaration typo

  dviggiano

  committed
  3c9760c

• Squeeze singleton dimensions in Node

  isacdaavid

  committed
  5c1f1b5

Commits on Jan 18, 2023

• Implement ImplicitTPM validation

  isacdaavid

  committed
  5351aec

• Merge remote-tracking branch

  isacdaavid

  committed
  bf64cfc

• Update Network __eq__() method.

  isacdaavid

  committed
  955fe69

• Network: revert to a __repr__ ammenable to JSON serialization.

  isacdaavid

  committed
  03f6a04

• Miscellaneous bug fixes in Node attribute setters and getters.

  isacdaavid

  committed
  d192cbf

• tpm.ImplicitTPM: Implement condition_tpm()

  isacdaavid

  committed
  60e67ec

• Minor import and docstring cleanup in subsystem

  isacdaavid

  committed
  6301380

Commits on Jan 27, 2023

• Change state space structure to use a dictionary.

  Show description for f4b7d74
  isacdaavid

  committed
  f4b7d74

Commits on Feb 2, 2023

• Revert to using dummy singleton dimensions in multidimensional node TPMs

  Show description for 1687293
  isacdaavid

  committed
  1687293

• Node._hash: temporary workaround when the TPM array is mutable.

  isacdaavid

  committed
  719cb7c

Commits on Feb 17, 2023

• Implement function to properly unalign DataArray's

  isacdaavid

  committed
  db89127

Commits on Feb 20, 2023

• Node.streamline(): use more consistent variable declarations.

  isacdaavid

  committed
  819b34f

• Avoid xarray Dataset altogether

  Show description for fd35bcc
  isacdaavid

  committed
  fd35bcc

• Network.__init__(): Handle network as tpm argument

  dviggiano

  committed
  ebe1c3a

• Fix error message

  dviggiano

  committed
  db8ce13

• Merge pull request #87 from dviggiano/feature/tpm-class

  Show description for 52adc21
  dviggiano

  authored
  52adc21

• Network: Fix build_cm() when None is provided.

  isacdaavid

  committed
  ded144b

• Network.__init__(): maximum line length.

  isacdaavid

  committed
  db677d1

Commits on Feb 21, 2023

• Network.__init__(): Pass xarray nodes to the ImplicitTPM constructor.

  isacdaavid

  committed
  a6c3b3a

• Implement proper indexing for the ImplicitTPM

  isacdaavid

  committed
  3ca0284

Commits on Feb 22, 2023

• Node.project_index(): remove leftover print statements.

  isacdaavid

  committed
  83c64bb

• tpm: miscellaneous cleanup.

  isacdaavid

  committed
  88989c3

• tpm.ImplicitTPM: implement __len__ method.

  isacdaavid

  committed
  47e09f3

• Node.project_index: make positional indexing consistent with name indexing.

  Show description for 150b8c3
  isacdaavid

  committed
  150b8c3

• tpm.ImplicitTPM: implement ndim property

  isacdaavid

  committed
  8d89879

• Modularize code to compute the shape of an ImplicitTPM

  isacdaavid

  committed
  a615250

Commits on Feb 23, 2023

• tpm: refactor ImplicitTPM.condition_tpm()

  isacdaavid

  committed
  92b216d

• Handle potential KeyError if user passes nonexisting dimension labels.

  isacdaavid

  committed
  102691d

• Subsystem: remove unused property.

  isacdaavid

  committed
  2efa780

Commits on Feb 24, 2023

• Fix ImplicitTPM.condition_tpm and generalize argument

  isacdaavid

  committed
  cb6f289

• Filter .nodes attribute based on membership to Subsystem.node_indices

  isacdaavid

  committed
  a3deedf

• Call Node directly and DataArray through callback-like reference to parent

  isacdaavid

  committed
  d0c4787

Commits on Feb 27, 2023

• Network.__init__(): Verify nodes against CM

  dviggiano

  committed
  2630552

• Merge branch 'feature/tpm-class' of https://github.com/dviggiano/pyphi into feature/tpm-class

  dviggiano

  committed
  d93f037

• Fix bad merge

  dviggiano

  committed
  8d27f2c

• Network: Include attrs in repr, remove redundancy

  dviggiano

  committed
  074dcfb

• Network.__init__(): Exclude cache

  dviggiano

  committed
  eb5fac6

• Network.__init__(): Properly grab CM columns

  dviggiano

  committed
  0621de5

• Update error message

  dviggiano

  committed
  d700e87

• Fix operator, error message

  dviggiano

  committed
  05165c5

• Fix _state_space assignment

  dviggiano

  committed
  63ba053

• Merge pull request #88 from dviggiano/feature/tpm-class

  Show description for 2ab4c4a
  dviggiano

  authored
  2ab4c4a

• Fix bug in tpm.ImplicitTPM.shape

  isacdaavid

  committed
  9da3677

• Network._build_cm(): Account for multiple nodes

  dviggiano

  committed
  3c32d34

• Network.__init__(): Assign attributes in all cases

  dviggiano

  committed
  6e3fd48

• Fix redundancy

  dviggiano

  committed
  694b681

• Merge branch 'wmayner:feature/tpm-class' into feature/tpm-class

  dviggiano

  authored
  87f939c

• Merge pull request #89 from dviggiano/feature/tpm-class

  Show description for a9ef879
  dviggiano

  authored
  a9ef879

• Merge branch 'feature/tpm-class' of github.com:wmayner/pyphi into feature/tpm-class

  isacdaavid

  committed
  23918bd

Commits on Mar 1, 2023

• network.py: format source code

  isacdaavid

  committed
  95e7b31

• Fix bug in Network._build_cm() for explicit TPMs.

  isacdaavid

  committed
  8425577

• Cosmetic refactoring of Network._build_cm()

  isacdaavid

  committed
  fa535ad

• Don't reference self.cm before it has been set.

  isacdaavid

  committed
  75e5fe1

• _build_cm(): Should use cm param, not self.cm

  dviggiano

  committed
  1a6d7ec

• Merge branch 'feature/tpm-class' of https://github.com/dviggiano/pyphi into feature/tpm-class

  dviggiano

  committed
  6099530

• test_network(): Add test_build_cm_implicit_tpm()

  dviggiano

  committed
  f2be2d4

• Merge pull request #90 from dviggiano/feature/tpm-class

  Show description for 127303a
  dviggiano

  authored
  127303a

• test_network: Add test_build_cm_explicit_tpm()

  dviggiano

  committed
  ad75e77

• DictCache: allow for reconstruction with __repr__

  dviggiano

  committed
  bac25b7

• test_network.test_build_cm_explicit_tpm(); Allow for DictCache reconstruction with __repr__()

  Show description for 40a4fe5
  dviggiano

  authored
  40a4fe5

• test_build_cm_explicit_tpm(): Use np.ones()

  dviggiano

  committed
  7c89049

• Merge pull request #92 from dviggiano/feature/tpm-class

  Show description for e981209
  dviggiano

  authored
  e981209

• Don't assume network state_space dict is ordered.

  isacdaavid

  committed
  902c90c

• test_build_cm(): Combine into one test

  dviggiano

  committed
  cbe9255

• Merge pull request #93 from dviggiano/feature/tpm-class

  Show description for 328c965
  dviggiano

  authored
  328c965

• Network.__repr__(): Only use dict for state_space

  dviggiano

  committed
  f959a5d

• Merge branch 'wmayner:feature/tpm-class' into feature/tpm-class

  dviggiano

  authored
  0de955f

• Merge pull request #94 from dviggiano/feature/tpm-class

  Show description for 9b8ba10
  dviggiano

  authored
  9b8ba10

• Set the state of the subsystem nodes.

  isacdaavid

  committed
  434cd29

• test_network: Add test_init_with_explicit_tpm()

  dviggiano

  committed
  aa8e67f

• Merge pull request #95 from dviggiano/feature/tpm-class

  Show description for a36e2f8
  dviggiano

  authored
  a36e2f8

Commits on Mar 2, 2023

• Change semantics of Node.tpm for direct access to ExplicitTPM methods.

  isacdaavid

  committed
  8a1c3fd

• Merge branch 'feature/tpm-class' of github.com:wmayner/pyphi into feature/tpm-class

  isacdaavid

  committed
  b299e3a

• Avoid reuse of subsystem nodes after cut

  isacdaavid

  committed
  50faed6

• Guarantee marginalization of non_inputs when generating Nodes.

  isacdaavid

  committed
  9fd3b11

Commits on Mar 3, 2023

• Inherit TPM.tpm_indices() and make it agnostic to state cardinality

  isacdaavid

  committed
  3011435

Commits on Mar 4, 2023

• Rehabilitate validate.network()

  isacdaavid

  committed
  dfdde3a

Commits on Mar 7, 2023

• test_network.py: add fixture for making implicit TPMs

  isacdaavid

  committed
  37da9b7

• Infer network shape from nodes' last dimension.

  Show description for 1671e08
  isacdaavid

  committed
  1671e08

Commits on Mar 8, 2023

• Deduplicate code and turn into ImplicitTPM.shapes attribute

  isacdaavid

  committed
  68e4808

• Add equals method to ImplicitTPM

  dviggiano

  committed
  38740ae

• Merge pull request #96 from dviggiano/feature/tpm-class

  Show description for fe8fb01
  dviggiano

  authored
  fe8fb01

• Fix bug in ImplicitTPM._node_shapes_to_shape()

  isacdaavid

  committed
  1c79fd0

• Merge branch 'feature/tpm-class' of github.com:wmayner/pyphi into feature/tpm-class

  isacdaavid

  committed
  d293340

• Ibidem

  isacdaavid

  committed
  9c773e5

• Add state space reroute

  dviggiano

  committed
  faa98cf

• Merge pull request #97 from dviggiano/feature/tpm-class

  Show description for 9820b04
  dviggiano

  authored
  9820b04

• Include state_space in node declarations

  dviggiano

  committed
  5695358

• Merge branch 'wmayner:feature/tpm-class' into feature/tpm-class

  dviggiano

  authored
  14df30b

• Merge pull request #98 from dviggiano/feature/tpm-class

  Show description for 74c66ac
  dviggiano

  authored
  74c66ac

• Use hasattr instead of try-catch

  dviggiano

  committed
  59f82f0

• Merge pull request #99 from dviggiano/feature/tpm-class

  Show description for c8c2dff
  dviggiano

  authored
  c8c2dff

• Do not use tpm.tpm

  dviggiano

  committed
  81b1e18

• Merge pull request #100 from dviggiano/feature/tpm-class

  Show description for 9dd8c10
  dviggiano

  authored
  9dd8c10

Commits on Mar 10, 2023

• tpm.py: extend subtpm() and reconstitute_tpm()

  isacdaavid

  committed
  4cc5909

• Merge branch 'feature/tpm-class' of github.com:wmayner/pyphi into feature/tpm-class

  isacdaavid

  committed
  5b2bc17

Commits on Mar 14, 2023

• test_tpm.py: Convert to np.ndarray when comparing matrices.

  isacdaavid

  committed
  432a0a7

• tpm: inherit infer_cm() and infer_edge from parent class

  isacdaavid

  committed
  552c4a6

• Implement marginalize_out() for ImplicitTPM

  isacdaavid

  committed
  6f21890

Commits on Mar 15, 2023

• Fix reconstitute_tpm so that it considers singletons

  isacdaavid

  committed
  53d4e15

Commits on Mar 16, 2023

• Implement ImplicitTPM.squeeze

  isacdaavid

  committed
  2a71b04

• Refactor remove_singleton_dimensions()

  isacdaavid

  committed
  a49c2e9

Commits on Mar 17, 2023

• Sync macro.py with latest TPM code

  isacdaavid

  committed
  62a821e

Commits on Mar 19, 2023

• Fix bug in auxilary method _node_shapes_to_shape

  isacdaavid

  committed
  8bce05d

Commits on Mar 20, 2023

• Make node_labels parameter mandatory when building a state space

  isacdaavid

  committed
  c2cc056

• macro.py: cast TPM type if necessary

  isacdaavid

  committed
  57c51e4

• test_node: Convert ImplicitTPMs for generate_nodes

  dviggiano

  committed
  e26c555

• MacroSubsystem.nodes(): Reconstitute TPM

  dviggiano

  committed
  a721f4f

• test_macro.test_pack_attrs(): Fix TPM comparison

  dviggiano

  committed
  cbfa0c2

• Merge branch 'feature/tpm-class' of https://github.com/dviggiano/pyphi into feature/tpm-class

  dviggiano

  committed
  98d309e

• generate_nodes(): Handle Implicit network TPMs

  dviggiano

  committed
  a8aa4ae

• Merge pull request #101 from dviggiano/feature/tpm-class

  Show description for 6a1a4f7
  dviggiano

  authored
  6a1a4f7

• node.py: Avoid circular import

  dviggiano

  committed
  057c52c

• Merge branch 'wmayner:feature/tpm-class' into feature/tpm-class

  dviggiano

  authored
  69e96a8

• Merge pull request #102 from dviggiano/feature/tpm-class

  Show description for 5b85b06
  dviggiano

  authored
  5b85b06

• Catch calls to ImplicitTPM.array_equals and route accordingly

  isacdaavid

  committed
  1e22c86

• Merge branch 'feature/tpm-class' of github.com:wmayner/pyphi into feature/tpm-class

  isacdaavid

  committed
  4ea97f7

• Subsystem: set node TPM state early

  isacdaavid

  committed
  317c560

• (Cleanup) Exclude ExplicitTPM from top-level namespace

  isacdaavid

  committed
  02981cf

Commits on Mar 21, 2023

• TPM: allow tpm_indices to discard singletons

  isacdaavid

  committed
  861ef9d

• macro: tidy remaining references to reconstitute_tpm

  isacdaavid

  committed
  7a89612

Commits on Mar 22, 2023

• Harmonize {MacroSubsystem._,ImplicitTPM.}squeeze and fix test_blackbox_external

  isacdaavid

  committed
  336ff75

• validate.state_reachable(): Reconstitute TPM

  dviggiano

  committed
  7d8e21a

• Implement ImplicitTPM.__hash__()

  dviggiano

  committed
  f19439a

• Merge pull request #103 from dviggiano/feature/tpm-class

  Show description for a4f342f
  dviggiano

  authored
  a4f342f

• ImplicitTPM.__hash__(): Fix syntax

  dviggiano

  committed
  ebb68eb

• Merge branch 'wmayner:feature/tpm-class' into feature/tpm-class

  dviggiano

  authored
  fd3b454

• Merge pull request #104 from dviggiano/feature/tpm-class

  Show description for 058a257
  dviggiano

  authored
  058a257

Commits on Mar 23, 2023

• validate.state_reachable: only cast if necessary

  isacdaavid

  committed
  6b8f36c

• Re-enable validation at Subsystem constructor

  isacdaavid

  committed
  52d0fcc

• test_validate: Don't refer to tpm.tpm

  isacdaavid

  committed
  273ca3e

Commits on Mar 24, 2023

• Refactor _validate_probabilities (and use utils.eq)

  isacdaavid

  committed
  d2b3fec

• distribution.is_unitary: Remove superfluous flattening

  isacdaavid

  committed
  0281d42

• Make sure node shapes are validated if CM is passed

  isacdaavid

  committed
  6c79407

• tpm: Remove old ProxyMetaclass code

  isacdaavid

  committed
  f268f4d

Commits on Mar 25, 2023

• Remove validate.node_states, deprecated by Node.state setter

  isacdaavid

  committed
  3525ae7

• Add support for state labels in validate.state_reachable

  isacdaavid

  committed
  2e958f9

Commits on Mar 26, 2023

• Fix Network creation from existing ImplicitTPM

  isacdaavid

  committed
  45646f2

• Remove Node.streamline

  isacdaavid

  committed
  818164f

• Refactor implicit_tpm fixture

  isacdaavid

  committed
  b7d5537

Commits on Apr 10, 2023

• Disable state reachability validation until reimplemented in implicit way

  isacdaavid

  committed
  7f04bac

Commits on Nov 21, 2023

• Merge feature/iit-4.0 into feature/tpm-class

  isacdaavid

  committed
  f66101a

• tpm: Simplify subtpm method

  isacdaavid

  committed
  89bad27

Commits on Nov 22, 2023

• Refactor TPM validation

  isacdaavid

  committed
  20808fe

Commits on Nov 24, 2023

• subsystem: Fix proper_tpm

  isacdaavid

  committed
  e687f26

• Tidy documentation

  isacdaavid

  committed
  0454ad7

• node.py: Improve code formatting

  isacdaavid

  committed
  460e9c8

• Rename DataArray accessor to something more explicit

  isacdaavid

  committed
  0f8bafc

Commits on Dec 5, 2023

• validate: Disable state reachability warning for now

  isacdaavid

  committed
  74ac75f

Commits on Dec 12, 2023

• tpm: add number_of_units getter in the ImplicitTPM case

  isacdaavid

  committed
  6593f21

Commits on Dec 21, 2023

• ImplicitTPM.number_of_units: more efficient implementation

  isacdaavid

  committed
  ac5fc86

Commits on Dec 26, 2023

• test_tpm: validate arguments in implicit_tpm test

  isacdaavid

  committed
  685cb7f

Commits on Dec 28, 2023

• tpm: implement probability_of_current_state() and backward_tpm() for ImplicitTPMs

  isacdaavid

  committed
  e4f1757

• Refactor backward_tpm as instance methods

  isacdaavid

  committed
  1014cec

• Rename DataArray accessor to something more expressive

  isacdaavid

  committed
  1d5939a

Commits on Dec 29, 2023

• test_tpm: Add test_backward_tpm

  isacdaavid

  committed
  f69f7a4

Commits on Jan 3, 2024

• Move Fig 8 counter network to examples

  isacdaavid

  committed
  a357ee4

• utils: Add equivalent_states generator

  isacdaavid

  committed
  1740585

• Rework state reachability validation to avoid computing joint prob.

  isacdaavid

  committed
  53b56c3

Commits on Mar 22, 2024

• Merge branch feature/iit-4.0.

  isacdaavid

  committed
  5ae32c5

Commits on Mar 23, 2024

• Merge branch 'feature/iit-4.0' into feature/tpm-class

  isacdaavid

  committed
  34aae42

Commits on Mar 27, 2024

• Only compute potential purviews if not overriden

  Show description for 64331cc
  wmayner

  committed
  64331cc

• Merge remote-tracking branch 'refs/remotes/origin/feature/tpm-class' into feature/tpm-class

  wmayner

  committed
  78ff393

Commits on May 25, 2024

• validate.state_reachable: Shortcircuit intersection as soon as possible

  isacdaavid

  committed
  d44b760

Commits on May 27, 2024

• validate.state_reachable: Don't expand equivalence classes, use symbolic intersection.

  isacdaavid

  committed
  8083a71

Commits on May 28, 2024

• validate.state_reachable: parallelize intersection between symbolic equivalence classes

  isacdaavid

  committed
  fa9a3e4

• Merge branch 'feature/tpm-class' of github.com:wmayner/pyphi into feature/tpm-class

  isacdaavid

  committed
  484f3b4

• validate: Refactor scope and add documentation/tests.

  isacdaavid

  committed
  a08fc2b

Commits on May 29, 2024

• Improve state validation when creating subsystems

  isacdaavid

  committed
  4b93ca1

• validate.state_value: Fix off-by-one error

  isacdaavid

  committed
  34010f6

• Remove parallelization of state_reachable for now

  isacdaavid

  committed
  ab4c202

Commits on Aug 6, 2024

• Backport unified subsystem interface to tpm-class branch

  isacdaavid

  committed
  bec9e9b