Changeset 820df88 in sasview

Timestamp:

Sep 10, 2014 3:57:22 PM (10 years ago)

Author:

pkienzle

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:

9939b16

Parents:

9f32c57

Message:

reenable c model build

File:

• setup.py (modified) (1 diff)

setup.py

@@ -303 +303 @@
     smearer_sources.append(os.path.join(igordir, "winFuncs.c"))
     geni_sources.append(os.path.join(igordir, "winFuncs.c"))
-no_ext = []
-#ext_modules.extend( [ Extension("sans.models.sans_extension.c_models",
-no_ext.extend( [ Extension("sans.models.sans_extension.c_models",
-                                sources=model_sources,                 
-                                include_dirs=[igordir, includedir, 
-                                              c_model_dir, numpy_incl_path, cephes_dir],
-                                ),       
-                    # Smearer extension
-                    Extension("sans.models.sans_extension.smearer",
-                              sources = smearer_sources,
-                              include_dirs=[igordir, 
-                                            smear_dir, numpy_incl_path],
-                              ),
+
+c_models = [ 
+    Extension("sans.models.sans_extension.c_models",
+        sources=model_sources,                 
+        include_dirs=[
+            igordir, includedir, c_model_dir, numpy_incl_path, cephes_dir
+        ],
+    ),
+
+    # Smearer extension
+    Extension("sans.models.sans_extension.smearer",
+        sources = smearer_sources,
+        include_dirs=[igordir,  smear_dir, numpy_incl_path],
+    ),
                     
-                    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],
-                              ),
+    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],
+    ),
                     
-                    Extension("sans.models.sans_extension.sld2i",
-                              sources = [os.path.join(gen_dir, 
-                                                "sld2i_module.cpp"),
-                                         os.path.join(gen_dir, 
-                                                "sld2i.cpp"),
-                                         os.path.join(c_model_dir, 
-                                                "libfunc.c"),
-                                         os.path.join(c_model_dir, 
-                                                "librefl.c"),],
-                              include_dirs=[gen_dir, includedir, 
-                                            c_model_dir, numpy_incl_path],
-                              )
-                    ] )
-        
+    Extension("sans.models.sans_extension.sld2i",
+        sources = [
+            os.path.join(gen_dir, "sld2i_module.cpp"),
+            os.path.join(gen_dir, "sld2i.cpp"),
+            os.path.join(c_model_dir, "libfunc.c"),
+            os.path.join(c_model_dir, "librefl.c"),
+        ],
+        include_dirs=[gen_dir, includedir,  c_model_dir, numpy_incl_path],
+    ),
+]
+
+# Comment out the following to avoid rebuilding all the models
+ext_modules.extend(c_models)
+
 # SasView