Changeset 0e307de in sasview

Timestamp:

Dec 21, 2011 9:35:40 AM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

8b8a03f

Parents:

490b281

Message:

give option for disabling openmp

File:

• setup.py (modified) (3 diffs)

setup.py

@@ -30 +30 @@
 ext_modules = []
 
-# Options to enable OpenMP
-copt =  {'msvc': ['/openmp'],
-         'mingw32' : ['-fopenmp'],
-         'unix' : ['-fopenmp']}
-lopt =  {'msvc': ['/MANIFEST'],
-         'mingw32' : ['-fopenmp'],
-         'unix' : ['-lgomp']}
+if sys.argv[1] == "-nomp":
+    # Disnable OpenMP
+    copt = {}
+    lopt = {}
+else:
+    # Options to enable OpenMP
+    copt =  {'msvc': ['/openmp'],
+             'mingw32' : ['-fopenmp'],
+             'unix' : ['-fopenmp']}
+    lopt =  {'msvc': ['/MANIFEST'],
+             'mingw32' : ['-fopenmp'],
+             'unix' : ['-lgomp']}
 
 class build_ext_subclass( build_ext ):
@@ -243 +248 @@
 #            'pil','periodictable>=1.3.0', 'scipy>=0.7.2']
 required = ['lxml','periodictable>=1.3.0']
-
+"""
 if os.name=='nt':
     #required.extend(['comtypes', 'pisa', 'html5lib', 'reportlab'])
@@ -251 +256 @@
 else:
     required.extend(['pil'])
-   
+"""   
  # Set up SansView    
 setup(