Merge pull request miykael#105 from miykael/dynamic_number_of_threads

miykael · web-flow · commit ee41e32b0802 · 2018-07-25T16:14:43.000+02:00
reduction of n_procs=8 to n_procs=4
diff --git a/notebooks/example_1stlevel.ipynb b/notebooks/example_1stlevel.ipynb
@@ -394,7 +394,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "l1analysis.run('MultiProc', plugin_args={'n_procs': 8})"
+    "l1analysis.run('MultiProc', plugin_args={'n_procs': 4})"
    ]
   },
   {
diff --git a/notebooks/example_normalize.ipynb b/notebooks/example_normalize.ipynb
@@ -288,7 +288,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "antsflow.run('MultiProc', plugin_args={'n_procs': 8})"
+    "antsflow.run('MultiProc', plugin_args={'n_procs': 4})"
    ]
   },
   {
@@ -494,7 +494,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "spmflow.run('MultiProc', plugin_args={'n_procs': 8})"
+    "spmflow.run('MultiProc', plugin_args={'n_procs': 4})"
    ]
   },
   {
diff --git a/notebooks/example_preprocessing.ipynb b/notebooks/example_preprocessing.ipynb
@@ -403,7 +403,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "preproc.run('MultiProc', plugin_args={'n_procs': 8})"
+    "preproc.run('MultiProc', plugin_args={'n_procs': 4})"
    ]
   },
   {
diff --git a/notebooks/handson_analysis.ipynb b/notebooks/handson_analysis.ipynb
@@ -854,7 +854,7 @@
    },
    "outputs": [],
    "source": [
-    "analysis1st.run('MultiProc', plugin_args={'n_procs': 8})"
+    "analysis1st.run('MultiProc', plugin_args={'n_procs': 4})"
    ]
   },
   {
@@ -1551,7 +1551,7 @@
    },
    "outputs": [],
    "source": [
-    "analysis2nd.run('MultiProc', plugin_args={'n_procs': 8})"
+    "analysis2nd.run('MultiProc', plugin_args={'n_procs': 4})"
    ]
   },
   {
diff --git a/notebooks/handson_preprocessing.ipynb b/notebooks/handson_preprocessing.ipynb
@@ -1208,7 +1208,7 @@
    },
    "outputs": [],
    "source": [
-    "preproc.run('MultiProc', plugin_args={'n_procs': 8})"
+    "preproc.run('MultiProc', plugin_args={'n_procs': 4})"
    ]
   },
   {
@@ -1587,7 +1587,7 @@
    },
    "outputs": [],
    "source": [
-    "preproc.run('MultiProc', plugin_args={'n_procs': 8})"
+    "preproc.run('MultiProc', plugin_args={'n_procs': 4})"
    ]
   },
   {
@@ -1658,7 +1658,7 @@
    "outputs": [],
    "source": [
     "# Runs the preprocessing workflow again, this time with substitutions\n",
-    "preproc.run('MultiProc', plugin_args={'n_procs': 8})"
+    "preproc.run('MultiProc', plugin_args={'n_procs': 4})"
    ]
   },
   {
@@ -1738,7 +1738,7 @@
    "outputs": [],
    "source": [
     "# Runs the preprocessing workflow again, this time with substitutions\n",
-    "preproc.run('MultiProc', plugin_args={'n_procs': 8})"
+    "preproc.run('MultiProc', plugin_args={'n_procs': 4})"
    ]
   },
   {
diff --git a/notebooks/wip_resource_sched_profiler.ipynb b/notebooks/wip_resource_sched_profiler.ipynb
@@ -47,7 +47,7 @@
     "The ``MultiProc`` workflow plugin schedules node execution based on the resources used by the current running nodes and the total resources available to the workflow. The plugin utilizes the plugin arguments ``n_procs`` and ``memory_gb`` to set the maximum resources a workflow can utilize. To limit a workflow to using 8 cores and 10 GB of RAM:\n",
     "\n",
     "```python\n",
-    "args_dict = {'n_procs' : 8, 'memory_gb' : 10}\n",
+    "args_dict = {'n_procs': 8, 'memory_gb': 10}\n",
     "workflow.run(plugin='MultiProc', plugin_args=args_dict)\n",
     "```\n",
     "\n",
@@ -78,7 +78,7 @@
    "outputs": [],
    "source": [
     "from nipype.utils.profiler import log_nodes_cb\n",
-    "args_dict = {'n_procs' : 8, 'memory_gb' : 10, 'status_callback' : log_nodes_cb}"
+    "args_dict = {'n_procs': 8, 'memory_gb': 10, 'status_callback': log_nodes_cb}"
    ]
   },
   {
@@ -191,7 +191,7 @@
    "outputs": [],
    "source": [
     "from nipype.utils.profiler import log_nodes_cb\n",
-    "args_dict = {'n_procs' : 8, 'memory_gb' : 10, 'status_callback' : log_nodes_cb}\n",
+    "args_dict = {'n_procs': 8, 'memory_gb': 10, 'status_callback': log_nodes_cb}\n",
     "workflow.run(plugin='MultiProc', plugin_args=args_dict)\n",
     "\n",
     "# ...workflow finishes and writes callback log to '/home/user/run_stats.log'\n",

Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@`
`394`	`394`	`"metadata": {},`
`395`	`395`	`"outputs": [],`
`396`	`396`	`"source": [`
`397`		`- "l1analysis.run('MultiProc', plugin_args={'n_procs': 8})"`
	`397`	`+ "l1analysis.run('MultiProc', plugin_args={'n_procs': 4})"`
`398`	`398`	`]`
`399`	`399`	`},`
`400`	`400`	`{`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@`
`288`	`288`	`"metadata": {},`
`289`	`289`	`"outputs": [],`
`290`	`290`	`"source": [`
`291`		`- "antsflow.run('MultiProc', plugin_args={'n_procs': 8})"`
	`291`	`+ "antsflow.run('MultiProc', plugin_args={'n_procs': 4})"`
`292`	`292`	`]`
`293`	`293`	`},`
`294`	`294`	`{`
`@@ -494,7 +494,7 @@`
`494`	`494`	`"metadata": {},`
`495`	`495`	`"outputs": [],`
`496`	`496`	`"source": [`
`497`		`- "spmflow.run('MultiProc', plugin_args={'n_procs': 8})"`
	`497`	`+ "spmflow.run('MultiProc', plugin_args={'n_procs': 4})"`
`498`	`498`	`]`
`499`	`499`	`},`
`500`	`500`	`{`
Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@`
`403`	`403`	`"metadata": {},`
`404`	`404`	`"outputs": [],`
`405`	`405`	`"source": [`
`406`		`- "preproc.run('MultiProc', plugin_args={'n_procs': 8})"`
	`406`	`+ "preproc.run('MultiProc', plugin_args={'n_procs': 4})"`
`407`	`407`	`]`
`408`	`408`	`},`
`409`	`409`	`{`
Original file line number	Diff line number	Diff line change
`@@ -854,7 +854,7 @@`
`854`	`854`	`},`
`855`	`855`	`"outputs": [],`
`856`	`856`	`"source": [`
`857`		`- "analysis1st.run('MultiProc', plugin_args={'n_procs': 8})"`
	`857`	`+ "analysis1st.run('MultiProc', plugin_args={'n_procs': 4})"`
`858`	`858`	`]`
`859`	`859`	`},`
`860`	`860`	`{`
`@@ -1551,7 +1551,7 @@`
`1551`	`1551`	`},`
`1552`	`1552`	`"outputs": [],`
`1553`	`1553`	`"source": [`
`1554`		`- "analysis2nd.run('MultiProc', plugin_args={'n_procs': 8})"`
	`1554`	`+ "analysis2nd.run('MultiProc', plugin_args={'n_procs': 4})"`
`1555`	`1555`	`]`
`1556`	`1556`	`},`
`1557`	`1557`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1208,7 +1208,7 @@`
`1208`	`1208`	`},`
`1209`	`1209`	`"outputs": [],`
`1210`	`1210`	`"source": [`
`1211`		`- "preproc.run('MultiProc', plugin_args={'n_procs': 8})"`
	`1211`	`+ "preproc.run('MultiProc', plugin_args={'n_procs': 4})"`
`1212`	`1212`	`]`
`1213`	`1213`	`},`
`1214`	`1214`	`{`
`@@ -1587,7 +1587,7 @@`
`1587`	`1587`	`},`
`1588`	`1588`	`"outputs": [],`
`1589`	`1589`	`"source": [`
`1590`		`- "preproc.run('MultiProc', plugin_args={'n_procs': 8})"`
	`1590`	`+ "preproc.run('MultiProc', plugin_args={'n_procs': 4})"`
`1591`	`1591`	`]`
`1592`	`1592`	`},`
`1593`	`1593`	`{`
`@@ -1658,7 +1658,7 @@`
`1658`	`1658`	`"outputs": [],`
`1659`	`1659`	`"source": [`
`1660`	`1660`	`"# Runs the preprocessing workflow again, this time with substitutions\n",`
`1661`		`- "preproc.run('MultiProc', plugin_args={'n_procs': 8})"`
	`1661`	`+ "preproc.run('MultiProc', plugin_args={'n_procs': 4})"`
`1662`	`1662`	`]`
`1663`	`1663`	`},`
`1664`	`1664`	`{`
`@@ -1738,7 +1738,7 @@`
`1738`	`1738`	`"outputs": [],`
`1739`	`1739`	`"source": [`
`1740`	`1740`	`"# Runs the preprocessing workflow again, this time with substitutions\n",`
`1741`		`- "preproc.run('MultiProc', plugin_args={'n_procs': 8})"`
	`1741`	`+ "preproc.run('MultiProc', plugin_args={'n_procs': 4})"`
`1742`	`1742`	`]`
`1743`	`1743`	`},`
`1744`	`1744`	`{`