Skip to content

Commit 0d3129b

Browse files
committed
Merge pull request #747 from satra/fix/sparse_matrix
fix: construct sparse matrix using topological sort order
2 parents ebf4ced + 6892a91 commit 0d3129b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

nipype/pipeline/plugins/base.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -410,13 +410,13 @@ def _generate_dependency_list(self, graph):
410410
""" Generates a dependency list for a list of graphs.
411411
"""
412412
self.procs, _ = topological_sort(graph)
413-
nodes = graph.nodes()
414-
indices = [nodes.index(proc) for proc in self.procs]
415413
try:
416-
self.depidx = nx.to_scipy_sparse_matrix(graph, format='lil')
414+
self.depidx = nx.to_scipy_sparse_matrix(graph,
415+
nodelist=self.procs,
416+
format='lil')
417417
except:
418-
self.depidx = nx.to_scipy_sparse_matrix(graph)
419-
self.depidx = self.depidx[:, indices][indices, :]
418+
self.depidx = nx.to_scipy_sparse_matrix(graph,
419+
nodelist=self.procs)
420420
self.refidx = deepcopy(self.depidx)
421421
self.refidx.astype = np.int
422422
self.proc_done = np.zeros(len(self.procs), dtype=bool)

0 commit comments

Comments
 (0)