Changeset 249a7c6 in sasview

Timestamp:

Jun 4, 2014 5:13:05 PM (11 years ago)

Author:

pkienzle

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

191c648

Parents:

880f170

Message:

use multiprocessing for bumps fits if OMP_NUM_THREADS=1

File:

• src/sans/fit/BumpsFitting.py (modified) (3 diffs)

src/sans/fit/BumpsFitting.py

@@ -2 +2 @@
 BumpsFitting module runs the bumps optimizer.
 """
+import os
 from datetime import timedelta, datetime
 
@@ -7 +8 @@
 
 from bumps import fitters
-from bumps.mapper import SerialMapper
+from bumps.mapper import SerialMapper, MPMapper
 from bumps import parameter
 from bumps.fitproblem import FitProblem
@@ -294 +295 @@
     fitdriver = fitters.FitDriver(fitclass, problem=problem,
                                   abort_test=abort_test, **options)
-    mapper = SerialMapper 
+    omp_threads = int(os.environ.get('OMP_NUM_THREADS','0'))
+    mapper = MPMapper if omp_threads == 1 else SerialMapper       
     fitdriver.mapper = mapper.start_mapper(problem, None)
     #import time; T0 = time.time()