Removed all of the ResourceMultiProc plugin so the S3 datasink

Author: pintohutch

nipype/interfaces/base.py

@@ -750,8 +750,6 @@ def __init__(self, **inputs):
             raise Exception('No input_spec in class: %s' %
                             self.__class__.__name__)
         self.inputs = self.input_spec(**inputs)
-        self.estimated_memory = 1
-        self.num_threads = 1
 
     @classmethod
     def help(cls, returnhelp=False):
@@ -1197,11 +1195,9 @@ def run_command(runtime, output=None, timeout=0.01, redirect_x=False):
 
     The returned runtime contains a merged stdout+stderr log with timestamps
     """
-
-    # Init variables
     PIPE = subprocess.PIPE
-    cmdline = runtime.cmdline
 
+    cmdline = runtime.cmdline
     if redirect_x:
         exist_xvfb, _ = _exists_in_path('xvfb-run', runtime.environ)
         if not exist_xvfb:
@@ -1230,8 +1226,6 @@ def run_command(runtime, output=None, timeout=0.01, redirect_x=False):
     result = {}
     errfile = os.path.join(runtime.cwd, 'stderr.nipype')
     outfile = os.path.join(runtime.cwd, 'stdout.nipype')
-
-
     if output == 'stream':
         streams = [Stream('stdout', proc.stdout), Stream('stderr', proc.stderr)]
 
@@ -1247,6 +1241,7 @@ def _process(drain=0):
             else:
                 for stream in res[0]:
                     stream.read(drain)
+
         while proc.returncode is None:
             proc.poll()
             _process()
@@ -1261,7 +1256,6 @@ def _process(drain=0):
             result[stream._name] = [r[2] for r in rows]
         temp.sort()
         result['merged'] = [r[1] for r in temp]
-
     if output == 'allatonce':
         stdout, stderr = proc.communicate()
         result['stdout'] = stdout.split('\n')
@@ -1279,7 +1273,6 @@ def _process(drain=0):
         result['stdout'] = []
         result['stderr'] = []
         result['merged'] = ''
-
     runtime.stderr = '\n'.join(result['stderr'])
     runtime.stdout = '\n'.join(result['stdout'])
     runtime.merged = result['merged']

nipype/interfaces/fsl/model.py

@@ -250,17 +250,14 @@ def _create_ev_files(
                                                               element=count,
                                                               ctype=ctype, val=val)
                         ev_txt += "\n"
-
-                    for fconidx in ftest_idx:
-                        fval=0
-                        if con[0] in con_map.keys() and fconidx in con_map[con[0]]:
-                            fval=1
-                        ev_txt += contrast_ftest_element.substitute(
-                            cnum=ftest_idx.index(fconidx) + 1,
-                            element=tidx,
-                            ctype=ctype,
-                            val=fval)
-                    ev_txt += "\n"
+                    if con[0] in con_map.keys():
+                        for fconidx in con_map[con[0]]:
+                            ev_txt += contrast_ftest_element.substitute(
+                                cnum=ftest_idx.index(fconidx) + 1,
+                                element=tidx,
+                                ctype=ctype,
+                                val=1)
+                        ev_txt += "\n"
 
             # add contrast mask info
             ev_txt += contrastmask_header.substitute()
@@ -1959,4 +1956,3 @@ def _list_outputs(self):
                 self.inputs.out_vnscales_name)
 
         return outputs
-

nipype/pipeline/plugins/__init__.py

@@ -9,13 +9,10 @@
 from .condor import CondorPlugin
 from .dagman import CondorDAGManPlugin
 from .multiproc import MultiProcPlugin
-from .multiproc import ResourceMultiProcPlugin
 from .ipython import IPythonPlugin
 from .somaflow import SomaFlowPlugin
 from .pbsgraph import PBSGraphPlugin
 from .sgegraph import SGEGraphPlugin
 from .lsf import LSFPlugin
 from .slurm import SLURMPlugin
 from .slurmgraph import SLURMGraphPlugin
-
-from .callback_log import log_nodes_cb

nipype/pipeline/plugins/base.py

@@ -260,15 +260,10 @@ def run(self, graph, config, updatehash=False):
                                             graph=graph)
             else:
                 logger.debug('Not submitting')
-            self._wait()
+            sleep(float(self._config['execution']['poll_sleep_duration']))
         self._remove_node_dirs()
         report_nodes_not_run(notrun)
 
-
-
-    def _wait(self):
-        sleep(float(self._config['execution']['poll_sleep_duration']))
-
     def _get_result(self, taskid):
         raise NotImplementedError
 

nipype/pipeline/plugins/callback_log.py

@@ -12,7 +12,6 @@
 
 from .base import (DistributedPluginBase, report_crash)
 
-
 def run_node(node, updatehash):
     result = dict(result=None, traceback=None)
     try:
@@ -23,7 +22,6 @@ def run_node(node, updatehash):
         result['result'] = node.result
     return result
 
-
 class NonDaemonProcess(Process):
     """A non-daemon process to support internal multiprocessing.
     """
@@ -68,7 +66,6 @@ def __init__(self, plugin_args=None):
         else:
             self.pool = Pool(processes=n_procs)
 
-
     def _get_result(self, taskid):
         if taskid not in self._taskresult:
             raise RuntimeError('Multiproc task %d not found'%taskid)
@@ -84,7 +81,8 @@ def _submit_job(self, node, updatehash=False):
         except:
             pass
         self._taskresult[self._taskid] = self.pool.apply_async(run_node,
-                                                               (node, updatehash,))
+                                                               (node,
+                                                                updatehash,))
         return self._taskid
 
     def _report_crash(self, node, result=None):
@@ -98,169 +96,3 @@ def _report_crash(self, node, result=None):
 
     def _clear_task(self, taskid):
         del self._taskresult[taskid]
-
-
-
-import numpy as np
-from copy import deepcopy
-from ..engine import (MapNode, str2bool)
-import datetime
-import psutil
-from ... import logging
-import semaphore_singleton
-logger = logging.getLogger('workflow')
-
-def release_lock(args):
-    semaphore_singleton.semaphore.release()
-
-class ResourceMultiProcPlugin(MultiProcPlugin):
-    """Execute workflow with multiprocessing not sending more jobs at once
-    than the system can support.
-
-    The plugin_args input to run can be used to control the multiprocessing
-    execution and defining the maximum amount of memory and threads that 
-    should be used. When those parameters are not specified,
-    the number of threads and memory of the system is used.
-
-    System consuming nodes should be tagged:
-    memory_consuming_node.interface.memory = 8 #Gb
-    thread_consuming_node.interface.num_threads = 16
-
-    The default number of threads and memory for a node is 1. 
-
-    Currently supported options are:
-
-    - num_thread: maximum number of threads to be executed in parallel
-    - memory: maximum memory that can be used at once.
-
-    """
-
-    def __init__(self, plugin_args=None):
-        super(ResourceMultiProcPlugin, self).__init__(plugin_args=plugin_args)
-        self.plugin_args = plugin_args
-        self.processors = cpu_count()
-        memory = psutil.virtual_memory()
-        self.memory = memory.total / (1024*1024*1024)
-        if self.plugin_args:
-            if 'n_procs' in self.plugin_args:
-                self.processors = self.plugin_args['n_procs']
-            if 'memory' in self.plugin_args:
-                self.memory = self.plugin_args['memory']
-
-    def _wait(self):
-        if len(self.pending_tasks) > 0:
-            semaphore_singleton.semaphore.acquire()
-        semaphore_singleton.semaphore.release()
-
-
-    def _submit_job(self, node, updatehash=False):
-        self._taskid += 1
-        try:
-            if node.inputs.terminal_output == 'stream':
-                node.inputs.terminal_output = 'allatonce'
-        except:
-            pass
-        self._taskresult[self._taskid] = self.pool.apply_async(run_node,
-                                                               (node, updatehash,),
-                                                               callback=release_lock)
-        return self._taskid
-
-    def _send_procs_to_workers(self, updatehash=False, graph=None):
-        """ Sends jobs to workers when system resources are available.
-            Check memory (gb) and cores usage before running jobs.
-        """
-        executing_now = []
-
-        # Check to see if a job is available
-        jobids = np.flatnonzero((self.proc_pending == True) & (self.depidx.sum(axis=0) == 0).__array__())
-
-        #check available system resources by summing all threads and memory used
-        busy_memory = 0
-        busy_processors = 0
-        for jobid in jobids:
-            busy_memory+= self.procs[jobid]._interface.estimated_memory
-            busy_processors+= self.procs[jobid]._interface.num_threads
-                
-        free_memory = self.memory - busy_memory
-        free_processors = self.processors - busy_processors
-
-
-        #check all jobs without dependency not run
-        jobids = np.flatnonzero((self.proc_done == False) & (self.depidx.sum(axis=0) == 0).__array__())
-
-
-        #sort jobs ready to run first by memory and then by number of threads
-        #The most resource consuming jobs run first
-        jobids = sorted(jobids, key=lambda item: (self.procs[item]._interface.estimated_memory, self.procs[item]._interface.num_threads))
-
-        logger.debug('Free memory: %d, Free processors: %d', free_memory, free_processors)
-
-
-        #while have enough memory and processors for first job
-        #submit first job on the list
-        for jobid in jobids:
-            logger.debug('Next Job: %d, memory: %d, threads: %d' %(jobid, self.procs[jobid]._interface.estimated_memory, self.procs[jobid]._interface.num_threads))
-
-            if self.procs[jobid]._interface.estimated_memory <= free_memory and self.procs[jobid]._interface.num_threads <= free_processors:
-                logger.info('Executing: %s ID: %d' %(self.procs[jobid]._id, jobid))
-                executing_now.append(self.procs[jobid])
-                
-                if isinstance(self.procs[jobid], MapNode):
-                    try:
-                        num_subnodes = self.procs[jobid].num_subnodes()
-                    except Exception:
-                        self._clean_queue(jobid, graph)
-                        self.proc_pending[jobid] = False
-                        continue
-                    if num_subnodes > 1:
-                        submit = self._submit_mapnode(jobid)
-                        if not submit:
-                            continue
-
-                # change job status in appropriate queues
-                self.proc_done[jobid] = True
-                self.proc_pending[jobid] = True
-
-                free_memory -= self.procs[jobid]._interface.estimated_memory
-                free_processors -= self.procs[jobid]._interface.num_threads
-
-                # Send job to task manager and add to pending tasks
-                if self._status_callback:
-                    self._status_callback(self.procs[jobid], 'start')
-                if str2bool(self.procs[jobid].config['execution']['local_hash_check']):
-                    logger.debug('checking hash locally')
-                    try:
-                        hash_exists, _, _, _ = self.procs[
-                            jobid].hash_exists()
-                        logger.debug('Hash exists %s' % str(hash_exists))
-                        if (hash_exists and (self.procs[jobid].overwrite == False or (self.procs[jobid].overwrite == None and not self.procs[jobid]._interface.always_run))):
-                            self._task_finished_cb(jobid)
-                            self._remove_node_dirs()
-                            continue
-                    except Exception:
-                        self._clean_queue(jobid, graph)
-                        self.proc_pending[jobid] = False
-                        continue
-                logger.debug('Finished checking hash')
-
-                if self.procs[jobid].run_without_submitting:
-                    logger.debug('Running node %s on master thread' %self.procs[jobid])
-                    try:
-                        self.procs[jobid].run()
-                    except Exception:
-                        self._clean_queue(jobid, graph)
-                    self._task_finished_cb(jobid)
-                    self._remove_node_dirs()
-
-                else:
-                    logger.debug('submitting', jobid)
-                    tid = self._submit_job(deepcopy(self.procs[jobid]), updatehash=updatehash)
-                    if tid is None:
-                        self.proc_done[jobid] = False
-                        self.proc_pending[jobid] = False
-                    else:
-                        self.pending_tasks.insert(0, (tid, jobid))
-            else:
-                break
-
-        logger.debug('No jobs waiting to execute')