Changeset 29e96f3 in sasview

Timestamp:

Dec 8, 2011 3:47:48 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:

8969521

Parents:

bdaa334

Message:

Re #7 compile with openmp

File:

• setup.py (modified) (4 diffs)

setup.py

@@ -25 +25 @@
 # TODO check for sans/__init__.py
 
+# Enable OpenMP
+extra_compile_args = []
+extra_link_args = []
+if not os.name=='nt':
+    extra_compile_args = ['-fopenmp']
+    extra_link_args = ['-lgomp']
+
 # sans.invariant
 package_dir["sans.invariant"] = "sansinvariant/src/sans/invariant"
@@ -61 +68 @@
 packages.extend(["sans.pr","sans.pr.core"])
 ext_modules.append( Extension("sans.pr.core.pr_inversion",
- sources = [ os.path.join(srcdir, "Cinvertor.c"),
-            os.path.join(srcdir, "invertor.c"),
-            ],
-         include_dirs=[numpy_incl_path]
- ) )
+                              sources = [ os.path.join(srcdir, "Cinvertor.c"),
+                                         os.path.join(srcdir, "invertor.c"),
+                                         ],
+                              include_dirs=[numpy_incl_path],
+                              extra_compile_args=extra_compile_args,
+                              extra_link_args=extra_link_args                              
+                              ) )
         
 # sans.fit (park integration)
@@ -111 +120 @@
 package_data["park"] = ['park-1.2.1/*.txt', 'park-1.2.1/park.epydoc']
 ext_modules.append( Extension("park._modeling",
-                    sources = [ os.path.join("park-1.2.1", "park", "lib", "modeling.cc"),
-                                os.path.join("park-1.2.1", "park", "lib", "resolution.c"),
-                                ] ) )
+                              sources = [ os.path.join("park-1.2.1", "park", "lib", "modeling.cc"),
+                                         os.path.join("park-1.2.1", "park", "lib", "resolution.c"),
+                                         ],
+                              extra_compile_args=extra_compile_args,
+                              extra_link_args=extra_link_args
+                              ) )
 
 # Sans models
@@ -182 +194 @@
 ext_modules.extend( [ Extension("sans.models.sans_extension.c_models",
                                 sources=model_sources,                 
-                                include_dirs=[igordir, srcdir, c_model_dir, numpy_incl_path]),       
+                                include_dirs=[igordir, srcdir, c_model_dir, numpy_incl_path],
+                                extra_compile_args=extra_compile_args,
+                                extra_link_args=extra_link_args
+                                ),       
                     # Smearer extension
                     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],
+                              extra_compile_args=extra_compile_args,
+                              extra_link_args=extra_link_args
+                              ),
                     
                     Extension("sans.models.sans_extension.smearer2d_helper",
                               sources = [os.path.join(smear_dir, 
-                                          "smearer2d_helper_module.cpp"),
-                                          os.path.join(smear_dir, "smearer2d_helper.cpp"),],
-                              include_dirs=[smear_dir,numpy_incl_path])
+                                                      "smearer2d_helper_module.cpp"),
+                                         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
+                              )
                     ] )