nipy · oesteban · Oct 4, 2017 · Sep 21, 2017 · Sep 22, 2017 · Sep 22, 2017
diff --git a/.circle/tests.sh b/.circle/tests.sh
@@ -17,8 +17,8 @@ fi
 # They may need to be rebalanced in the future.
 case ${CIRCLE_NODE_INDEX} in
   0)
-    docker run --rm=false -it -e FSL_COURSE_DATA="/data/examples/nipype-fsl_course_data" -v $HOME/examples:/data/examples:ro -v $WORKDIR:/work -w /work nipype/nipype:py36 /usr/bin/run_pytests.sh && \
-    docker run --rm=false -it -e FSL_COURSE_DATA="/data/examples/nipype-fsl_course_data" -v $HOME/examples:/data/examples:ro -v $WORKDIR:/work -w /work nipype/nipype:py27 /usr/bin/run_pytests.sh && \
+    docker run --rm=false -it -e CI_SKIP_TEST=1 -e NIPYPE_RESOURCE_MONITOR=1 -e FSL_COURSE_DATA="/data/examples/nipype-fsl_course_data" -v $HOME/examples:/data/examples:ro -v $WORKDIR:/work -w /work nipype/nipype:py36 /usr/bin/run_pytests.sh && \
+    docker run --rm=false -it -e CI_SKIP_TEST=1 -e NIPYPE_RESOURCE_MONITOR=1 -e FSL_COURSE_DATA="/data/examples/nipype-fsl_course_data" -v $HOME/examples:/data/examples:ro -v $WORKDIR:/work -w /work nipype/nipype:py27 /usr/bin/run_pytests.sh && \
     docker run --rm=false -it -v $WORKDIR:/work -w /src/nipype/doc --entrypoint=/usr/bin/run_builddocs.sh nipype/nipype:py36 /usr/bin/run_builddocs.sh && \
     docker run --rm=false -it -v $HOME/examples:/data/examples:ro -v $WORKDIR:/work -w /work nipype/nipype:py36 /usr/bin/run_examples.sh test_spm Linear /data/examples/ workflow3d && \
     docker run --rm=false -it -v $HOME/examples:/data/examples:ro -v $WORKDIR:/work -w /work nipype/nipype:py36 /usr/bin/run_examples.sh test_spm Linear /data/examples/ workflow4d
@@ -30,8 +30,8 @@ case ${CIRCLE_NODE_INDEX} in
     exitcode=$?
     ;;
   2)
-    docker run --rm=false -it -e NIPYPE_NUMBER_OF_CPUS=4 -v $HOME/examples:/data/examples:ro -v $WORKDIR:/work -w /work nipype/nipype:py27 /usr/bin/run_examples.sh fmri_spm_nested MultiProc /data/examples/ level1 && \
-    docker run --rm=false -it -e NIPYPE_NUMBER_OF_CPUS=4 -v $HOME/examples:/data/examples:ro -v $WORKDIR:/work -w /work nipype/nipype:py36 /usr/bin/run_examples.sh fmri_spm_nested MultiProc /data/examples/ l2pipeline
+    docker run --rm=false -it -e NIPYPE_NUMBER_OF_CPUS=4 -v $HOME/examples:/data/examples:ro -v $WORKDIR:/work -w /work nipype/nipype:py36 /usr/bin/run_examples.sh fmri_spm_nested MultiProc /data/examples/ level1 && \
+    docker run --rm=false -it -e NIPYPE_NUMBER_OF_CPUS=4 -e NIPYPE_RESOURCE_MONITOR=1 -v $HOME/examples:/data/examples:ro -v $WORKDIR:/work -w /work nipype/nipype:py27 /usr/bin/run_examples.sh fmri_spm_nested MultiProc /data/examples/ l2pipeline
     exitcode=$?
     ;;
   3)

diff --git a/.travis.yml b/.travis.yml
@@ -8,10 +8,10 @@ python:
 - 3.5
 - 3.6
 env:
-- INSTALL_DEB_DEPENDECIES=true NIPYPE_EXTRAS="doc,tests,fmri,profiler"
-- INSTALL_DEB_DEPENDECIES=false NIPYPE_EXTRAS="doc,tests,fmri,profiler"
-- INSTALL_DEB_DEPENDECIES=true NIPYPE_EXTRAS="doc,tests,fmri,profiler,duecredit"
-- INSTALL_DEB_DEPENDECIES=true NIPYPE_EXTRAS="doc,tests,fmri,profiler" PIP_FLAGS="--pre"
+- INSTALL_DEB_DEPENDECIES=true NIPYPE_EXTRAS="doc,tests,fmri,profiler" CI_SKIP_TEST=1
+- INSTALL_DEB_DEPENDECIES=false NIPYPE_EXTRAS="doc,tests,fmri,profiler" CI_SKIP_TEST=1
+- INSTALL_DEB_DEPENDECIES=true NIPYPE_EXTRAS="doc,tests,fmri,profiler,duecredit" CI_SKIP_TEST=1
+- INSTALL_DEB_DEPENDECIES=true NIPYPE_EXTRAS="doc,tests,fmri,profiler" PIP_FLAGS="--pre" CI_SKIP_TEST=1
 before_install:
 - function apt_inst {
   if $INSTALL_DEB_DEPENDECIES; then sudo rm -rf /dev/shm; fi &&

diff --git a/doc/users/config_file.rst b/doc/users/config_file.rst
@@ -14,93 +14,97 @@ Logging
 ~~~~~~~
 
 *workflow_level*
-	How detailed the logs regarding workflow should be (possible values:
-	``INFO`` and ``DEBUG``; default value: ``INFO``)
-*filemanip_level*
-	How detailed the logs regarding file operations (for example overwriting
-	warning) should be (possible values: ``INFO`` and ``DEBUG``; default value:
-	``INFO``)
+    How detailed the logs regarding workflow should be (possible values:
+    ``INFO`` and ``DEBUG``; default value: ``INFO``)
+*utils_level*
+    How detailed the logs regarding nipype utils, like file operations
+    (for example overwriting warning) or the resource profiler, should be
+    (possible values: ``INFO`` and ``DEBUG``; default value:
+    ``INFO``)
 *interface_level*
-	How detailed the logs regarding interface execution should be (possible
-	values: ``INFO`` and ``DEBUG``; default value: ``INFO``)
+    How detailed the logs regarding interface execution should be (possible
+    values: ``INFO`` and ``DEBUG``; default value: ``INFO``)
+*filemanip_level* (deprecated as of 1.0)
+    How detailed the logs regarding file operations (for example overwriting
+    warning) should be (possible values: ``INFO`` and ``DEBUG``)
 *log_to_file*
     Indicates whether logging should also send the output to a file (possible
     values: ``true`` and ``false``; default value: ``false``)
 *log_directory*
-	Where to store logs. (string, default value: home directory)
+    Where to store logs. (string, default value: home directory)
 *log_size*
-	Size of a single log file. (integer, default value: 254000)
+    Size of a single log file. (integer, default value: 254000)
 *log_rotate*
-	How many rotation should the log file make. (integer, default value: 4)
+    How many rotation should the log file make. (integer, default value: 4)
 
 Execution
 ~~~~~~~~~
 
 *plugin*
-	This defines which execution plugin to use. (possible values: ``Linear``,
-	``MultiProc``, ``SGE``, ``IPython``; default value: ``Linear``)
+    This defines which execution plugin to use. (possible values: ``Linear``,
+    ``MultiProc``, ``SGE``, ``IPython``; default value: ``Linear``)
 
 *stop_on_first_crash*
-	Should the workflow stop upon first node crashing or try to execute as many
-	nodes as possible? (possible values: ``true`` and ``false``; default value:
-	``false``)
+    Should the workflow stop upon first node crashing or try to execute as many
+    nodes as possible? (possible values: ``true`` and ``false``; default value:
+    ``false``)
 
 *stop_on_first_rerun*
-	Should the workflow stop upon first node trying to recompute (by that we
-	mean rerunning a node that has been run before - this can happen due changed
-	inputs and/or hash_method since the last run). (possible values: ``true``
-	and ``false``; default value: ``false``)
+    Should the workflow stop upon first node trying to recompute (by that we
+    mean rerunning a node that has been run before - this can happen due changed
+    inputs and/or hash_method since the last run). (possible values: ``true``
+    and ``false``; default value: ``false``)
 
 *hash_method*
-	Should the input files be checked for changes using their content (slow, but
-	100% accurate) or just their size and modification date (fast, but
-	potentially prone to errors)? (possible values: ``content`` and
-	``timestamp``; default value: ``timestamp``)
+    Should the input files be checked for changes using their content (slow, but
+    100% accurate) or just their size and modification date (fast, but
+    potentially prone to errors)? (possible values: ``content`` and
+    ``timestamp``; default value: ``timestamp``)
 
 *keep_inputs*
     Ensures that all inputs that are created in the nodes working directory are
     kept after node execution (possible values: ``true`` and ``false``; default
     value: ``false``)
 
 *single_thread_matlab*
-	Should all of the Matlab interfaces (including SPM) use only one thread?
-	This is useful if you are parallelizing your workflow using MultiProc or
-	IPython on a single multicore machine. (possible values: ``true`` and
-	``false``; default value: ``true``)
+    Should all of the Matlab interfaces (including SPM) use only one thread?
+    This is useful if you are parallelizing your workflow using MultiProc or
+    IPython on a single multicore machine. (possible values: ``true`` and
+    ``false``; default value: ``true``)
 
 *display_variable*
-	What ``DISPLAY`` variable should all command line interfaces be
-	run with. This is useful if you are using `xnest
-	<http://www.x.org/archive/X11R7.5/doc/man/man1/Xnest.1.html>`_
-	or `Xvfb <http://www.x.org/archive/X11R6.8.1/doc/Xvfb.1.html>`_
-	and you would like to redirect all spawned windows to
-	it. (possible values: any X server address; default value: not
-	set)
+    What ``DISPLAY`` variable should all command line interfaces be
+    run with. This is useful if you are using `xnest
+    <http://www.x.org/archive/X11R7.5/doc/man/man1/Xnest.1.html>`_
+    or `Xvfb <http://www.x.org/archive/X11R6.8.1/doc/Xvfb.1.html>`_
+    and you would like to redirect all spawned windows to
+    it. (possible values: any X server address; default value: not
+    set)
 
 *remove_unnecessary_outputs*
-	This will remove any interface outputs not needed by the workflow. If the
-	required outputs from a node changes, rerunning the workflow will rerun the
-	node. Outputs of leaf nodes (nodes whose outputs are not connected to any
-	other nodes) will never be deleted independent of this parameter. (possible
-	values: ``true`` and ``false``; default value: ``true``)
+    This will remove any interface outputs not needed by the workflow. If the
+    required outputs from a node changes, rerunning the workflow will rerun the
+    node. Outputs of leaf nodes (nodes whose outputs are not connected to any
+    other nodes) will never be deleted independent of this parameter. (possible
+    values: ``true`` and ``false``; default value: ``true``)
 
 *try_hard_link_datasink*
-	When the DataSink is used to produce an orginized output file outside
-	of nipypes internal cache structure, a file system hard link will be
-	attempted first. A hard link allow multiple file paths to point to the
-	same physical storage location on disk if the conditions allow. By
-	refering to the same physical file on disk (instead of copying files
-	byte-by-byte) we can avoid unnecessary data duplication.  If hard links
-	are not supported for the source or destination paths specified, then
-	a standard byte-by-byte copy is used.  (possible values: ``true`` and
-	``false``; default value: ``true``)
+    When the DataSink is used to produce an orginized output file outside
+    of nipypes internal cache structure, a file system hard link will be
+    attempted first. A hard link allow multiple file paths to point to the
+    same physical storage location on disk if the conditions allow. By
+    refering to the same physical file on disk (instead of copying files
+    byte-by-byte) we can avoid unnecessary data duplication.  If hard links
+    are not supported for the source or destination paths specified, then
+    a standard byte-by-byte copy is used.  (possible values: ``true`` and
+    ``false``; default value: ``true``)
 
 *use_relative_paths*
-	Should the paths stored in results (and used to look for inputs)
-	be relative or absolute. Relative paths allow moving the whole
-	working directory around but may cause problems with
-	symlinks. (possible values: ``true`` and ``false``; default
-	value: ``false``)
+    Should the paths stored in results (and used to look for inputs)
+    be relative or absolute. Relative paths allow moving the whole
+    working directory around but may cause problems with
+    symlinks. (possible values: ``true`` and ``false``; default
+    value: ``false``)
 
 *local_hash_check*
     Perform the hash check on the job submission machine. This option minimizes
@@ -115,10 +119,10 @@ Execution
     done after a job finish is detected. (float in seconds; default value: 5)
 
 *remove_node_directories (EXPERIMENTAL)*
-	Removes directories whose outputs have already been used
-	up. Doesn't work with IdentiInterface or any node that patches
-	data through (without copying) (possible values: ``true`` and
-	``false``; default value: ``false``)
+    Removes directories whose outputs have already been used
+    up. Doesn't work with IdentiInterface or any node that patches
+    data through (without copying) (possible values: ``true`` and
+    ``false``; default value: ``false``)
 
 *stop_on_unknown_version*
     If this is set to True, an underlying interface will raise an error, when no
@@ -146,18 +150,27 @@ Execution
     crashfiles allow portability across machines and shorter load time.
     (possible values: ``pklz`` and ``txt``; default value: ``pklz``)
 
+*resource_monitor*
+    Enables monitoring the resources occupation (possible values: ``true`` and
+    ``false``; default value: ``false``)
+
+*resource_monitor_frequency*
+    Sampling period (in seconds) between measurements of resources (memory, cpus)
+    being used by an interface. Requires ``resource_monitor`` to be ``true``.
+    (default value: ``1``)
+
 Example
 ~~~~~~~
 
 ::
 
-	[logging]
-	workflow_level = DEBUG
+    [logging]
+    workflow_level = DEBUG
 
-	[execution]
-	stop_on_first_crash = true
-	hash_method = timestamp
-	display_variable = :1
+    [execution]
+    stop_on_first_crash = true
+    hash_method = timestamp
+    display_variable = :1
 
 Workflow.config property has a form of a nested dictionary reflecting the
 structure of the .cfg file.

diff --git a/doc/users/plugins.rst b/doc/users/plugins.rst
@@ -74,6 +74,14 @@ Optional arguments::
   n_procs :  Number of processes to launch in parallel, if not set number of
   processors/threads will be automatically detected
 
+  memory_gb : Total memory available to be shared by all simultaneous tasks
+  currently running, if not set it will be automatically set to 90\% of
+  system RAM.
+
+  raise_insufficient : Raise exception when the estimated resources of a node
+  exceed the total amount of resources available (memory and threads), when
+  ``False`` (default), only a warning will be issued.
+
 To distribute processing on a multicore machine, simply call::
 
   workflow.run(plugin='MultiProc')

diff --git a/doc/users/resource_sched_profiler.rst b/doc/users/resource_sched_profiler.rst
@@ -82,7 +82,7 @@ by setting the ``status_callback`` parameter to point to this function in the
 
 ::
 
-	from nipype.pipeline.plugins.callback_log import log_nodes_cb
+	from nipype.utils.profiler import log_nodes_cb
 	args_dict = {'n_procs' : 8, 'memory_gb' : 10, 'status_callback' : log_nodes_cb}
 
 To set the filepath for the callback log the ``'callback'`` logger must be
@@ -141,7 +141,7 @@ The pandas_ Python package is required to use this feature.
 
 ::
 
-	from nipype.pipeline.plugins.callback_log import log_nodes_cb
+	from nipype.utils.profiler import log_nodes_cb
 	args_dict = {'n_procs' : 8, 'memory_gb' : 10, 'status_callback' : log_nodes_cb}
 	workflow.run(plugin='MultiProc', plugin_args=args_dict)
 

diff --git a/docker/files/run_examples.sh b/docker/files/run_examples.sh
@@ -12,10 +12,18 @@ mkdir -p ${HOME}/.nipype ${WORKDIR}/logs/example_${example_id} ${WORKDIR}/tests
 echo "[logging]" > ${HOME}/.nipype/nipype.cfg
 echo "workflow_level = DEBUG" >> ${HOME}/.nipype/nipype.cfg
 echo "interface_level = DEBUG" >> ${HOME}/.nipype/nipype.cfg
-echo "filemanip_level = DEBUG" >> ${HOME}/.nipype/nipype.cfg
+echo "utils_level = DEBUG" >> ${HOME}/.nipype/nipype.cfg
 echo "log_to_file = true" >> ${HOME}/.nipype/nipype.cfg
 echo "log_directory = ${WORKDIR}/logs/example_${example_id}" >> ${HOME}/.nipype/nipype.cfg
 
+echo '[execution]' >> ${HOME}/.nipype/nipype.cfg
+echo 'crashfile_format = txt' >> ${HOME}/.nipype/nipype.cfg
+
+if [[ "${NIPYPE_RESOURCE_MONITOR:-0}" == "1" ]]; then
+    echo 'resource_monitor = true' >> ${HOME}/.nipype/nipype.cfg
+    echo 'resource_monitor_frequency = 3' >> ${HOME}/.nipype/nipype.cfg
+fi
+
 # Set up coverage
 export COVERAGE_FILE=${WORKDIR}/tests/.coverage.${example_id}
 if [ "$2" == "MultiProc" ]; then
@@ -25,8 +33,10 @@ fi
 coverage run /src/nipype/tools/run_examples.py $@
 exit_code=$?
 
+if [[ "${NIPYPE_RESOURCE_MONITOR:-0}" == "1" ]]; then
+	cp resource_monitor.json 2>/dev/null ${WORKDIR}/logs/example_${example_id}/ || :
+fi
 # Collect crashfiles and generate xml report
 coverage xml -o ${WORKDIR}/tests/smoketest_${example_id}.xml
-find /work -name "crash-*" -maxdepth 1 -exec mv {} ${WORKDIR}/crashfiles/ \;
+find /work -maxdepth 1 -name "crash-*" -exec mv {} ${WORKDIR}/crashfiles/ \;
 exit $exit_code
-
diff --git a/docker/files/run_pytests.sh b/docker/files/run_pytests.sh
@@ -17,28 +17,20 @@ echo '[logging]' > ${HOME}/.nipype/nipype.cfg
 echo 'log_to_file = true' >> ${HOME}/.nipype/nipype.cfg
 echo "log_directory = ${WORKDIR}/logs/py${PYTHON_VERSION}" >> ${HOME}/.nipype/nipype.cfg
 
-# Enable profile_runtime tests only for python 2.7
-if [[ "${PYTHON_VERSION}" -lt "30" ]]; then
-    echo '[execution]' >> ${HOME}/.nipype/nipype.cfg
-    echo 'profile_runtime = true' >> ${HOME}/.nipype/nipype.cfg
+echo '[execution]' >> ${HOME}/.nipype/nipype.cfg
+echo 'crashfile_format = txt' >> ${HOME}/.nipype/nipype.cfg
+
+if [[ "${NIPYPE_RESOURCE_MONITOR:-0}" == "1" ]]; then
+    echo 'resource_monitor = true' >> ${HOME}/.nipype/nipype.cfg
 fi
 
 # Run tests using pytest
 export COVERAGE_FILE=${WORKDIR}/tests/.coverage.py${PYTHON_VERSION}
 py.test -v --junitxml=${WORKDIR}/tests/pytests_py${PYTHON_VERSION}.xml --cov nipype --cov-config /src/nipype/.coveragerc --cov-report xml:${WORKDIR}/tests/coverage_py${PYTHON_VERSION}.xml ${TESTPATH}
 exit_code=$?
 
-# Workaround: run here the profiler tests in python 3
-if [[ "${PYTHON_VERSION}" -ge "30" ]]; then
-    echo '[execution]' >> ${HOME}/.nipype/nipype.cfg
-    echo 'profile_runtime = true' >> ${HOME}/.nipype/nipype.cfg
-    export COVERAGE_FILE=${WORKDIR}/tests/.coverage.py${PYTHON_VERSION}_extra
-    py.test -v --junitxml=${WORKDIR}/tests/pytests_py${PYTHON_VERSION}_extra.xml --cov nipype --cov-report xml:${WORKDIR}/tests/coverage_py${PYTHON_VERSION}_extra.xml /src/nipype/nipype/interfaces/tests/test_runtime_profiler.py /src/nipype/nipype/pipeline/plugins/tests/test_multiproc*.py
-    exit_code=$(( $exit_code + $? ))
-fi
-
 # Collect crashfiles
-find ${WORKDIR} -name "crash-*" -maxdepth 1 -exec mv {} ${WORKDIR}/crashfiles/ \;
+find ${WORKDIR} -maxdepth 1 -name "crash-*" -exec mv {} ${WORKDIR}/crashfiles/ \;
 
 echo "Unit tests finished with exit code ${exit_code}"
 exit ${exit_code}

diff --git a/nipype/info.py b/nipype/info.py
@@ -159,7 +159,7 @@ def get_nipype_gitversion():
     'doc': ['Sphinx>=1.4', 'matplotlib', 'pydotplus', 'pydot>=1.2.3'],
     'tests': TESTS_REQUIRES,
     'nipy': ['nitime', 'nilearn', 'dipy', 'nipy', 'matplotlib'],
-    'profiler': ['psutil'],
+    'profiler': ['psutil>=5.0'],
     'duecredit': ['duecredit'],
     'xvfbwrapper': ['xvfbwrapper'],
     'pybids' : ['pybids']