Changeset 13f00a0 in sasview for sansmodels

Timestamp:

Dec 9, 2011 4:27:02 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

2cef9d3

Parents:

849fa92

Message:

Re #7 fix sansmodels setup.py

File:

• sansmodels/setup.py (modified) (5 diffs)

sansmodels/setup.py

@@ -11 +11 @@
 # Then build and install the modules
 from distutils.core import Extension, setup
-#from setuptools import setup#, find_packages
+from distutils.command.build_ext import build_ext
+
+# Options to enable OpenMP
+copt =  {'msvc': ['/openmp'],
+         'mingw32' : ['-fopenmp'],
+         'unix' : ['-fopenmp']}
+lopt =  {'msvc': ['/MANIFEST'],
+         'mingw32' : ['-fopenmp'],
+         'unix' : ['-lgomp']}
+
+class build_ext_subclass( build_ext ):
+    def build_extensions(self):
+        # Get 64-bitness
+        is_64bits = sys.maxsize > 2**32
+        
+        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):
+               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 ]
+                    
+        build_ext.build_extensions(self)
 
 # Build the module name
@@ -70 +96 @@
     smearer_sources.append(os.path.join(igordir, "winFuncs.c"))
 
-# Enable OpenMP
-extra_compile_args = []
-extra_link_args = []
-if sys.platform=='linux2' or (sys.platform=='darwin' and platform.architecture()[0]=='64bit'):
-    extra_compile_args = ['-fopenmp']
-    extra_link_args = ['-lgomp']
-elif sys.platform=='win32':
-    extra_compile_args = ['/openmp']    
-    extra_link_args = ['/MANIFEST']
-
 dist = setup(
     name="sansmodels",
@@ -103 +119 @@
                               sources=model_sources,                 
                               include_dirs=[igordir, srcdir, c_model_dir, numpy_incl_path],   
-                              extra_compile_args=extra_compile_args,
-                              extra_link_args=extra_link_args
                               ),
     
@@ -110 +124 @@
         Extension("sans.models.sans_extension.smearer",
                    sources = smearer_sources,
-                   include_dirs=[igordir, smear_dir, numpy_incl_path]),
+                   include_dirs=[igordir, smear_dir, numpy_incl_path],
+                   ),
+                   
         Extension("sans.models.sans_extension.smearer2d_helper",
                   sources = [os.path.join(smear_dir, 
@@ -116 +132 @@
                              os.path.join(smear_dir, "smearer2d_helper.cpp"),],
                   include_dirs=[smear_dir,numpy_incl_path],
-                  extra_compile_args=extra_compile_args,
-                  extra_link_args=extra_link_args
-        )
-        ]
+                  )
+        ],
+    cmdclass = {'build_ext': build_ext_subclass }
     )