Changeset 5972029 in sasview

Timestamp:

Feb 12, 2015 8:38:12 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:

8934fef

Parents:

f3efa09

Message:

Allow proper disabling of OpenMP so that we can build using Anaconda.

File:

• setup.py (modified) (3 diffs)

setup.py

@@ -68 +68 @@
     is_64bits = sys.maxsize > 2**32
     
-enable_openmp = False if "--disable-open-mp" in sys.argv else True
+enable_openmp = True
 
 if sys.platform =='darwin':
@@ -104 +104 @@
         print "PROBLEM determining Darwin version"
 
-
+class DisableOpenMPCommand(Command):
+    description = "The version of MinGW that comes with Anaconda does not come with OpenMP :( "\
+                  "This commands means we can turn off compiling with OpenMP for this or any "\
+                  "other reason."
+    user_options = []
+
+    def initialize_options(self):
+        self.cwd = None
+
+    def finalize_options(self):
+        self.cwd = os.getcwd()
+        global enable_openmp
+        enable_openmp = False
+
+    def run(self):
+        pass
 
 class build_ext_subclass( build_ext ):
@@ -386 +401 @@
                     },
     cmdclass = {'build_ext': build_ext_subclass,
-                'docs': BuildSphinxCommand}
+                'docs': BuildSphinxCommand,
+                'disable_openmp': DisableOpenMPCommand}
     )