Changeset b30ed8f in sasview

Timestamp:

Dec 22, 2011 1:42:07 PM (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:

494f151

Parents:

5c7cb6f

Message:

move plugin log to plugin_models dir

Files:

• fittingview/src/sans/perspectives/fitting/models.py (modified) (1 diff)
• setup.py (modified) (4 diffs)

fittingview/src/sans/perspectives/fitting/models.py

@@ -23 +23 @@
     """
     """
-    out = open("plugins.log", 'a')
+    dir = os.path.join(os.path.expanduser("~"),'.sansview', PLUGIN_DIR)
+    out = open(os.path.join(dir, "plugins.log"), 'a')
     out.write("%10g:  %s\n" % (time.clock(), message))
     out.close()

setup.py

@@ -7 +7 @@
 
 import sys
+
 import os
 import platform
@@ -41 +42 @@
 plugin_model_list = ['polynominal5.py', 'sph_bessel_jn.py', 
                      'sum_Ap1_1_Ap2.py', 'sum_p1_p2.py', 
-                     'testmodel_2.py', 'testmodel.py']
+                     'testmodel_2.py', 'testmodel.py',
+                     'polynominal5.pyc', 'sph_bessel_jn.pyc', 
+                     'sum_Ap1_1_Ap2.pyc', 'sum_p1_p2.pyc', 
+                     'testmodel_2.pyc', 'testmodel.pyc']
 sans_dir = os.path.join(os.path.expanduser("~"),'.sansview')
 if os.path.isdir(sans_dir):
@@ -56 +60 @@
                 file_path =  os.path.join(f_path, file)
                 os.remove(file_path)
-                    
+
+enable_openmp = True                    
 if sys.argv[-1] == "-nomp":
     # Disable OpenMP
-    copt = {}
-    lopt = {}
-else:
-    # Options to enable OpenMP
-    copt =  {'msvc': ['/openmp'],
-             'mingw32' : ['-fopenmp'],
-             'unix' : ['-fopenmp']}
-    lopt =  {'msvc': ['/MANIFEST'],
-             'mingw32' : ['-fopenmp'],
-             'unix' : ['-lgomp']}
+    enable_openmp = False
+if sys.platform =='darwin' and not is_64bits:
+    # Disable OpenMP
+    enable_openmp = False
+
+# Options to enable OpenMP
+copt =  {'msvc': ['/openmp'],
+         'mingw32' : ['-fopenmp'],
+         'unix' : ['-fopenmp']}
+lopt =  {'msvc': ['/MANIFEST'],
+         'mingw32' : ['-fopenmp'],
+         'unix' : ['-lgomp']}
 
 class build_ext_subclass( build_ext ):
@@ -82 +89 @@
         print "Compiling with %s (64bit=%s)" % (c, str(is_64bits))
         
-        if not (sys.platform =='darwin' and not is_64bits):
+        if enable_openmp:
             if copt.has_key(c):
                for e in self.extensions:
                    e.extra_compile_args = copt[ c ]
             if lopt.has_key(c):
+                
                 for e in self.extensions:
                     e.extra_link_args = lopt[ c ]