Moved dotblas back to scipy.corelib (scipy.base.numeric tries to import it)

8 files changed, 21 insertions, 20 deletions

diff --git a/scipy/__init__.py b/scipy/__init__.py
index ed79dac18..c1b429dfd 100644
--- a/scipy/__init__.py
+++ b/scipy/__init__.py
@@ -30,7 +30,7 @@ else:
     from _import_tools import PackageImport
     from core_version import version as __core_version__
     __doc__ += PackageImport().import_packages(\
-        ['test','basic','base'])
+        ['test','base','basic'])
     test = ScipyTest('scipy').test
 
 __scipy_doc__ = """
diff --git a/scipy/_import_tools.py b/scipy/_import_tools.py
index 68c14c638..77cd87f79 100644
--- a/scipy/_import_tools.py
+++ b/scipy/_import_tools.py
@@ -121,6 +121,7 @@ class PackageImport:
             except Exception,msg:
                 print >> sys.stderr, 'Failed to import',package_name
                 print >> sys.stderr, msg
+                raise
                 continue
 
             self.imported_packages.append(fullname)
diff --git a/scipy/base/numeric.py b/scipy/base/numeric.py
index b3dc38d97..f81195e13 100644
--- a/scipy/base/numeric.py
+++ b/scipy/base/numeric.py
@@ -152,7 +152,7 @@ def vdot(a, b):
 try:
     # importing this changes the dot function for basic 4 types
     # to blas-optimized versions.
-    from scipy.basic._dotblas import dot, vdot, inner, alterdot, restoredot
+    from scipy.lib._dotblas import dot, vdot, inner, alterdot, restoredot
 except ImportError:
     def alterdot():
         pass
diff --git a/scipy/basic/__init__.py b/scipy/basic/__init__.py
index 88c9c19b7..a724df58d 100644
--- a/scipy/basic/__init__.py
+++ b/scipy/basic/__init__.py
@@ -3,7 +3,7 @@ from info import __doc__
 
 import fftpack
 from fftpack import fft, ifft
-#import linalg
+import linalg
 import random
 from random import rand, randn
 
diff --git a/scipy/basic/setup.py b/scipy/basic/setup.py
index 1d8d33cdf..bcee73e35 100644
--- a/scipy/basic/setup.py
+++ b/scipy/basic/setup.py
@@ -8,23 +8,6 @@ def configuration(parent_package='',top_path=None):
 
     config.add_data_dir('tests')
 
-    # Configure blasdot
-    blas_info = get_info('blas_opt',0)
-    #blas_info = {}
-    def get_dotblas_sources(ext, build_dir):
-        if blas_info:
-            return ext.depends[:1]
-        return None # no extension module will be built
-
-    config.add_extension('_dotblas',
-                         sources = [get_dotblas_sources],
-                         depends=[join('blasdot','_dotblas.c'),
-                                  join('blasdot','cblas.h'),
-                                  ],
-                         include_dirs = ['blasdot'],
-                         extra_info = blas_info
-                         )
-
     # Configure fftpack_lite
     config.add_extension('fftpack_lite',
                          sources=[join('fftpack_lite', x) for x in \
diff --git a/scipy/basic/blasdot/_dotblas.c b/scipy/corelib/blasdot/_dotblas.c
index 648ea397f..648ea397f 100644
--- a/scipy/basic/blasdot/_dotblas.c
+++ b/scipy/corelib/blasdot/_dotblas.c
diff --git a/scipy/basic/blasdot/cblas.h b/scipy/corelib/blasdot/cblas.h
index 3e0faebbe..3e0faebbe 100644
--- a/scipy/basic/blasdot/cblas.h
+++ b/scipy/corelib/blasdot/cblas.h
diff --git a/scipy/corelib/setup.py b/scipy/corelib/setup.py
index a3e45abd6..aeb168b93 100644
--- a/scipy/corelib/setup.py
+++ b/scipy/corelib/setup.py
@@ -8,6 +8,23 @@ def configuration(parent_package='',top_path=None):
 
     config = Configuration('lib',parent_package,top_path)
 
+    # Configure blasdot
+    blas_info = get_info('blas_opt',0)
+    #blas_info = {}
+    def get_dotblas_sources(ext, build_dir):
+        if blas_info:
+            return ext.depends[:1]
+        return None # no extension module will be built
+
+    config.add_extension('_dotblas',
+                         sources = [get_dotblas_sources],
+                         depends=[join('blasdot','_dotblas.c'),
+                                  join('blasdot','cblas.h'),
+                                  ],
+                         include_dirs = ['blasdot'],
+                         extra_info = blas_info
+                         )
+
     # Configure mtrand
     config.add_extension('mtrand',
                          sources=[join('mtrand', x) for x in