Changeset b9d9e95 in sasview


Ignore:
Timestamp:
Feb 13, 2015 3:47:09 AM (8 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:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • setup.py

    rb44da61 r5972029  
    6868    is_64bits = sys.maxsize > 2**32 
    6969     
    70 enable_openmp = False if "--disable-open-mp" in sys.argv else True 
     70enable_openmp = True 
    7171 
    7272if sys.platform =='darwin': 
     
    104104        print "PROBLEM determining Darwin version" 
    105105 
    106  
     106class DisableOpenMPCommand(Command): 
     107    description = "The version of MinGW that comes with Anaconda does not come with OpenMP :( "\ 
     108                  "This commands means we can turn off compiling with OpenMP for this or any "\ 
     109                  "other reason." 
     110    user_options = [] 
     111 
     112    def initialize_options(self): 
     113        self.cwd = None 
     114 
     115    def finalize_options(self): 
     116        self.cwd = os.getcwd() 
     117        global enable_openmp 
     118        enable_openmp = False 
     119 
     120    def run(self): 
     121        pass 
    107122 
    108123class build_ext_subclass( build_ext ): 
     
    386401                    }, 
    387402    cmdclass = {'build_ext': build_ext_subclass, 
    388                 'docs': BuildSphinxCommand} 
     403                'docs': BuildSphinxCommand, 
     404                'disable_openmp': DisableOpenMPCommand} 
    389405    )    
  • check_packages.py

    rb44da61 rb52f47f  
    44import os 
    55import sys 
     6 
     7# Fix for error: hash-collision-3-both-1-and-1/ 
     8# See http://jaredforsyth.com/blog/2010/apr/28/accessinit-hash-collision-3-both-1-and-1/ 
     9import PIL.Image 
     10sys.modules['Image'] = PIL.Image 
    611 
    712common_required_package_list = { 
Note: See TracChangeset for help on using the changeset viewer.