FIX: Set DistributedPluginBase.refidx type correctly #3340
Merged
Conversation
This file contains hidden or 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
Codecov Report
@@ Coverage Diff @@
## master #3340 +/- ##
=======================================
Coverage 65.01% 65.01%
=======================================
Files 302 302
Lines 40035 40031 -4
Branches 5291 5291
=======================================
- Hits 26029 26027 -2
+ Misses 12935 12933 -2
Partials 1071 1071
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
|
Didn't break things. Will merge before a 1.6.1 release, unless I see an objection. |
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.
Summary
In 39c4ee3, we had
def _generate_dependency_list(self, graph): """ Generates a dependency list for a list of graphs. """ self.procs = graph.nodes() - self.depidx = nx.adj_matrix(graph).__array__() - self.refidx = deepcopy(self.depidx>0) - self.refidx.dtype = np.int8 + self.depidx = ssp.lil_matrix(nx.adj_matrix(graph).__array__()) + self.refidx = deepcopy(self.depidx) + self.refidx.astype = np.int self.proc_done = np.zeros(len(self.procs), dtype=bool) self.proc_pending = np.zeros(len(self.procs), dtype=bool)This looks like a typo, that should have been
self.refidx = deepcopy(self.depidx).astype(np.int)or similar.In this PR, I simply use
self.depidx.astype(int).scipy.sparse.lil_matrix.astypecopies by default.Found while removing a deprecated call to
np.int.I also remove a guard for networkx versions that were old in 2012: b908b84