Changeset 9729a6d in sasview

Timestamp:

Nov 30, 2014 7:24:19 AM (10 years ago)

Author:

Peter Parker

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:

c3437260

Parents:

ec3bd65

Message:

Allow for the disabling of openmp during compilation by passing '—disable-open-mp' to setup.py. I'm playing around with Anaconda as a potential python distribution for my builds, and unfortunately the version of MinGW that comes with it does not support MP.

File:

• setup.py (modified) (1 diff)

setup.py

@@ -68 +68 @@
     is_64bits = sys.maxsize > 2**32
     
-    
-enable_openmp = True
+enable_openmp = False if "--disable-open-mp" in sys.argv else True
 
 if sys.platform =='darwin':