FIX: Import nx, topological sort in correct locations

Author: effigies

nipype/pipeline/plugins/base.py

@@ -20,6 +20,7 @@
 from ... import logging
 from ...utils.filemanip import loadpkl
 from ...utils.misc import str2bool
+from ..engine.utils import topological_sort
 from ..engine import MapNode
 from .tools import report_crash, report_nodes_not_run, create_pyscript
 
@@ -391,11 +392,6 @@ def _generate_dependency_list(self, graph):
         """ Generates a dependency list for a list of graphs.
         """
         import networkx as nx
-        from ..engine.utils import topological_sort
-        try:
-            dfs_preorder = nx.dfs_preorder
-        except AttributeError:
-            dfs_preorder = nx.dfs_preorder_nodes
 
         self.procs, _ = topological_sort(graph)
         try:
@@ -409,6 +405,11 @@ def _generate_dependency_list(self, graph):
         self.proc_pending = np.zeros(len(self.procs), dtype=bool)
 
     def _remove_node_deps(self, jobid, crashfile, graph):
+        import networkx as nx
+        try:
+            dfs_preorder = nx.dfs_preorder
+        except AttributeError:
+            dfs_preorder = nx.dfs_preorder_nodes
         subnodes = [s for s in dfs_preorder(graph, self.procs[jobid])]
         for node in subnodes:
             idx = self.procs.index(node)

nipype/pipeline/plugins/linear.py

@@ -9,6 +9,7 @@
 import os
 from .base import (PluginBase, logger, report_crash, report_nodes_not_run,
                    str2bool)
+from ..engine.utils import topological_sort
 
 
 class LinearPlugin(PluginBase):
@@ -25,7 +26,6 @@ def run(self, graph, config, updatehash=False):
             defines order of execution
         """
         import networkx as nx
-        from ..engine.utils import topological_sort
         try:
             dfs_preorder = nx.dfs_preorder
         except AttributeError: