[Scipy-svn] r3552 - branches/scipy.scons/scipy/linalg

[scipy-svn@scip...]

Author: cdavid
Date: 2007-11-20 06:04:20 -0600 (Tue, 20 Nov 2007)
New Revision: 3552

Modified:
   branches/scipy.scons/scipy/linalg/setup.py
Log:
Revert setup.py, whose diff were commited by accident

Modified: branches/scipy.scons/scipy/linalg/setup.py
===================================================================
--- branches/scipy.scons/scipy/linalg/setup.py	2007-11-20 11:53:08 UTC (rev 3551)
+++ branches/scipy.scons/scipy/linalg/setup.py	2007-11-20 12:04:20 UTC (rev 3552)
@@ -125,53 +125,53 @@
                join('src','fblaswrap.f'),
                ]
 
-    # # fblas:
-    # if needs_cblas_wrapper(lapack_opt):
-    #     config.add_extension('fblas',
-    #                          sources = [generate_pyf,
-    #                                     join('src','fblaswrap_veclib_c.c')],
-    #                          depends = depends,
-    #                          extra_info = lapack_opt
-    #                          )
-    # else:
-    #     config.add_extension('fblas',
-    #                          sources = [generate_pyf,
-    #                                     join('src','fblaswrap.f')],
-    #                          depends = depends,
-    #                          extra_info = lapack_opt
-    #                          )
+    # fblas:
+    if needs_cblas_wrapper(lapack_opt):
+        config.add_extension('fblas',
+                             sources = [generate_pyf,
+                                        join('src','fblaswrap_veclib_c.c')],
+                             depends = depends,
+                             extra_info = lapack_opt
+                             )
+    else:
+        config.add_extension('fblas',
+                             sources = [generate_pyf,
+                                        join('src','fblaswrap.f')],
+                             depends = depends,
+                             extra_info = lapack_opt
+                             )
 
-    # # cblas:
-    # config.add_extension('cblas',
-    #                      sources = [generate_pyf],
-    #                      depends = ['generic_cblas.pyf',
-    #                                 'generic_cblas1.pyf',
-    #                                 'interface_gen.py'],
-    #                      extra_info = lapack_opt
-    #                      )
+    # cblas:
+    config.add_extension('cblas',
+                         sources = [generate_pyf],
+                         depends = ['generic_cblas.pyf',
+                                    'generic_cblas1.pyf',
+                                    'interface_gen.py'],
+                         extra_info = lapack_opt
+                         )
 
-    # # flapack:
-    # config.add_extension('flapack',
-    #                      sources = [generate_pyf],
-    #                      depends = ['generic_flapack.pyf',
-    #                                 'flapack_user_routines.pyf',
-    #                                 'interface_gen.py'],
-    #                      extra_info = lapack_opt
-    #                      )
+    # flapack:
+    config.add_extension('flapack',
+                         sources = [generate_pyf],
+                         depends = ['generic_flapack.pyf',
+                                    'flapack_user_routines.pyf',
+                                    'interface_gen.py'],
+                         extra_info = lapack_opt
+                         )
 
-    # # clapack:
-    # config.add_extension('clapack',
-    #                      sources = [generate_pyf],
-    #                      depends = ['generic_clapack.pyf',
-    #                                 'interface_gen.py'],
-    #                      extra_info = lapack_opt
-    #                      )
+    # clapack:
+    config.add_extension('clapack',
+                         sources = [generate_pyf],
+                         depends = ['generic_clapack.pyf',
+                                    'interface_gen.py'],
+                         extra_info = lapack_opt
+                         )
 
-    # # _flinalg:
-    # config.add_extension('_flinalg',
-    #                      sources = [join('src','det.f'),join('src','lu.f')],
-    #                      extra_info = lapack_opt
-    #                      )
+    # _flinalg:
+    config.add_extension('_flinalg',
+                         sources = [join('src','det.f'),join('src','lu.f')],
+                         extra_info = lapack_opt
+                         )
 
     # calc_lwork:
     config.add_extension('calc_lwork',
@@ -179,30 +179,30 @@
                          extra_info = lapack_opt
                          )
 
-    # # atlas_version:
+    # atlas_version:
 
-    # config.add_extension('atlas_version',
-    #                      ['atlas_version.c'],
-    #                      extra_info = lapack_opt
-    #                      )
+    config.add_extension('atlas_version',
+                         ['atlas_version.c'],
+                         extra_info = lapack_opt
+                         )
 
-#     # iterative methods
-#     methods = ['BiCGREVCOM.f.src',
-#                'BiCGSTABREVCOM.f.src',
-#                'CGREVCOM.f.src',
-#                'CGSREVCOM.f.src',
-# #               'ChebyREVCOM.f.src',
-#                'GMRESREVCOM.f.src',
-# #               'JacobiREVCOM.f.src',
-#                'QMRREVCOM.f.src',
-# #               'SORREVCOM.f.src'
-#                ]
-#     Util = ['STOPTEST2.f.src','getbreak.f.src']
-#     sources = Util + methods + ['_iterative.pyf.src']
-#     config.add_extension('_iterative',
-#                          sources = [join('iterative',x) for x in sources],
-#                          extra_info = lapack_opt
-#                          )
+    # iterative methods
+    methods = ['BiCGREVCOM.f.src',
+               'BiCGSTABREVCOM.f.src',
+               'CGREVCOM.f.src',
+               'CGSREVCOM.f.src',
+#               'ChebyREVCOM.f.src',
+               'GMRESREVCOM.f.src',
+#               'JacobiREVCOM.f.src',
+               'QMRREVCOM.f.src',
+#               'SORREVCOM.f.src'
+               ]
+    Util = ['STOPTEST2.f.src','getbreak.f.src']
+    sources = Util + methods + ['_iterative.pyf.src']
+    config.add_extension('_iterative',
+                         sources = [join('iterative',x) for x in sources],
+                         extra_info = lapack_opt
+                         )
 
     config.add_data_dir('tests')