Make distributions and graph talk to each other #30
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Will Graham <[email protected]>
Co-authored-by: Will Graham <[email protected]>
…nto mscroggs/normal-example
Co-authored-by: Will Graham <[email protected]>
…nto mscroggs/normal-example
This was referenced Mar 20, 2025
mscroggs
commented
Mar 20, 2025
| outcome_node_label: str, | ||
| samples: int, | ||
| *, | ||
| rng_key: jax.Array, |
| concrete_dist = self._dist.construct( | ||
| **parameters, **self._constant_parameters | ||
| ) | ||
| output[sample] = concrete_dist.sample(new_key[sample], 1)[0][0] |
| return concrete_dist.sample(rng_key, samples) | ||
| output = np.zeros(samples) | ||
| new_key = jax.random.split(rng_key, samples) | ||
| for sample in range(samples): |
| new_key = jax.random.split(rng_key, samples) | ||
| for sample in range(samples): | ||
| parameters = { | ||
| i: sampled_dependencies[j][sample] for i, j in self._parameters.items() |
mscroggs
commented
Mar 20, 2025
| @@ -76,7 +78,7 @@ def __init__(self) -> None: | |||
| """Create a family of normal distributions.""" | |||
| super().__init__(Normal, family_name="Normal") | |||
|
|
|||
| def construct(self, mean: ArrayCompatible, cov: ArrayCompatible) -> Normal: | |||
| def construct(self, mean: ArrayCompatible, cov: ArrayCompatible) -> Normal: # type: ignore # noqa: PGH003 | |||
There was a problem hiding this comment.
mypy was very unhappy with everything I tried putting here. @willGraham01: Any idea what it should be?
There was a problem hiding this comment.
Also, we originally had this as the following, but either ruff or mypy was not happy that the base class didn't have the *,, but having *, **parameters in the base class is a syntax error...
Suggested change
| def construct(self, mean: ArrayCompatible, cov: ArrayCompatible) -> Normal: # type: ignore # noqa: PGH003 | |
| def construct(self, *, mean: ArrayCompatible, cov: ArrayCompatible) -> Normal: # type: ignore # noqa: PGH003 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Builds on top of #16.
Removes placeholder distribution classes in graph, and plugs in the proper distribution classes in their place