Changeset b9d9e95 in sasview

Timestamp:

Feb 13, 2015 3:47:09 AM (9 years ago)

Author:

smk78

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:

8042dbb

Parents:

b52f47f (diff), 8934fef (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview.git

Files:

• .gitignore (added)
• setup.py (modified) (3 diffs)
• check_packages.py (modified) (1 diff)

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}
     )   

check_packages.py

@@ -4 +4 @@
 import os
 import sys
+
+# Fix for error: hash-collision-3-both-1-and-1/
+# See http://jaredforsyth.com/blog/2010/apr/28/accessinit-hash-collision-3-both-1-and-1/
+import PIL.Image
+sys.modules['Image'] = PIL.Image
 
 common_required_package_list = {