Make trace a subclass of networkx.DiGraph again #1191
Merged
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
fritzo
previously requested changes
Jun 18, 2018
pyro/poutine/trace_struct.py
Outdated
| def __init__(self, *args, **kwargs): | ||
| """ | ||
| :param string graph_type: string specifying the kind of trace graph to construct | ||
|
|
||
| Constructor. Currently identical to :meth:`networkx.DiGraph.__init__`, | ||
| except for storing the graph_type attribute | ||
| """ | ||
| self._graph = DiGraph(*args, **kwargs) | ||
| # self._graph = DiGraph(*args, **kwargs) |
|
@fritzo should be good to merge now, |
fritzo
approved these changes
Sep 15, 2018
| @@ -4,5 +4,5 @@ numpy>=1.7 | |||
| contextlib2 | |||
| cloudpickle>=0.3.1 | |||
| graphviz>=0.8 | |||
| networkx>=2.0.0 | |||
| networkx>=2.2rc1 | |||
There was a problem hiding this comment.
Sure, let's just remember to update this to >=2.2 before the next Pyro release.
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.
This PR removes some of the cruft in
poutine.Traceintroduced in #801.After networkx/networkx#3014 the memory leaks that required a wrapper around
networkx.DiGraphinpoutine.Tracehave been fixed. The regression teststests/test_memory.pynow pass on this branch with the master branch ofnetworkx.This PR should not be merged until the next minor release of
networkx. According to networkx/networkx#2885 that should happen fairly soon, so I'm tentatively adding this to the 0.3 release milestone.