Merge pull request #19 from DCAN-Labs/develop

Fix for too many threads.
DCAN-Labs · Mar 22, 2021 · bead30d · bead30d
2 parents 0af56eb + d38d152
commit bead30d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -18,7 +18,8 @@ RUN python3 -m pip install -r "/app/requirements.txt"
 
 # insert pipeline code
 ADD https://github.com/DCAN-Labs/dcan-infant-pipeline.git version.json
-RUN git clone -b 'v0.0.9' --single-branch --depth 1 https://github.com/DCAN-Labs/dcan-infant-pipeline.git /opt/pipeline
+#RUN git clone -b 'v0.0.9' --single-branch --depth 1 https://github.com/DCAN-Labs/dcan-infant-pipeline.git /opt/pipeline
+RUN git clone -b 'master' --single-branch --depth 1 https://github.com/DCAN-Labs/dcan-infant-pipeline.git /opt/pipeline
 
 
 # unless otherwise specified...

diff --git a/app/pipelines.py b/app/pipelines.py
@@ -1146,7 +1146,9 @@ def _call(cmd, out_log, err_log, num_threads=1):
     if num_threads > 1:
         # set parallel environment variables
         env['OMP_NUM_THREADS'] = str(num_threads)
-        env['ITK_GLOBAL_DEFAULT_NUMBER_OF_THREADS'] = str(num_threads)
+        env['ITK_GLOBAL_DEFAULT_NUMBER_OF_THREADS'] = str(2) # str(num_threads)
+        if num_threads != 1:
+            print('Keep ITK_GLOBAL_DEFAULT_NUMBER_OF_THREADS at 1 instead of %s.' % num_threads)
     with open(out_log, 'w') as out, open(err_log, 'w') as err:
         result = subprocess.call(cmd.split(), stdout=out, stderr=err, env=env)
         if type(result) is list: