Changeset 8b8a03f in sasview

Timestamp:

Dec 21, 2011 7:38:38 AM (12 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:

5c77050

Parents:

0e307de

Message:

small correction

Files:

• sansmodels/setup.py (modified) (2 diffs)
• setup.py (modified) (1 diff)

sansmodels/setup.py

@@ -14 +14 @@
 
 # Options to enable OpenMP
-copt =  {'msvc': ['/openmp'],
-         'mingw32' : ['-fopenmp'],
-         'unix' : ['-fopenmp']}
-lopt =  {'msvc': ['/MANIFEST'],
-         'mingw32' : ['-fopenmp'],
-         'unix' : ['-lgomp']}
+if sys.argv[1] == "-nomp":
+    # Disable OpenMP
+    copt = {}
+    lopt = {}
+else:
+    print "openmp ENABLED"
+    copt =  {'msvc': ['/openmp'],
+             'mingw32' : ['-fopenmp'],
+             'unix' : ['-fopenmp']}
+    lopt =  {'msvc': ['/MANIFEST'],
+             'mingw32' : ['-fopenmp'],
+             'unix' : ['-lgomp']}
 
 class build_ext_subclass( build_ext ):
@@ -30 +36 @@
             is_64bits = False
         c = self.compiler.compiler_type
+
         print "Compiling with %s (64bit=%s)" % (c, str(is_64bits))
-        
         if not (sys.platform=='darwin' and not is_64bits):
             if copt.has_key(c):

setup.py

@@ -31 +31 @@
 
 if sys.argv[1] == "-nomp":
-    # Disnable OpenMP
+    # Disable OpenMP
     copt = {}
     lopt = {}