Eliminate basic and move everything to corefft, corelinalg, or corerandom

16 files changed, 89 insertions, 50 deletions

diff --git a/scipy/__init__.py b/scipy/__init__.py
index ae4600f50..04d7d3de6 100644
--- a/scipy/__init__.py
+++ b/scipy/__init__.py
@@ -248,7 +248,7 @@ if show_core_config is None:
 else:
     from core_version import version as __core_version__
 
-    pkgload('test','base','basic',verbose=SCIPY_IMPORT_VERBOSE)
+    pkgload('test','base','corefft','corelinalg','corerandom',verbose=SCIPY_IMPORT_VERBOSE)
 
     test = ScipyTest('scipy').test
 
diff --git a/scipy/base/convertcode.py b/scipy/base/convertcode.py
index cf1e9e7a0..f30317f9f 100644
--- a/scipy/base/convertcode.py
+++ b/scipy/base/convertcode.py
@@ -99,11 +99,11 @@ def fromstr(filestr):
     filestr, fromall1 = changeimports(filestr, 'Precision', 'scipy.base')
     filestr, fromall2 = changeimports(filestr, 'numerix', 'scipy.base')
     filestr, fromall3 = changeimports(filestr, 'scipy_base', 'scipy.base')
-    filestr, fromall3 = changeimports(filestr, 'MLab', 'scipy.basic.linalg')
-    filestr, fromall3 = changeimports(filestr, 'LinearAlgebra', 'scipy.basic.linalg')
-    filestr, fromall3 = changeimports(filestr, 'RNG', 'scipy.basic.random')
-    filestr, fromall3 = changeimports(filestr, 'RandomArray', 'scipy.basic.random')
-    filestr, fromall3 = changeimports(filestr, 'FFT', 'scipy.basdic.fft')
+    filestr, fromall3 = changeimports(filestr, 'MLab', 'scipy.corelinalg')
+    filestr, fromall3 = changeimports(filestr, 'LinearAlgebra', 'scipy.corelinalg')
+    filestr, fromall3 = changeimports(filestr, 'RNG', 'scipy.corerandom')
+    filestr, fromall3 = changeimports(filestr, 'RandomArray', 'scipy.corerandom')
+    filestr, fromall3 = changeimports(filestr, 'FFT', 'scipy.corefft')
     filestr, fromall3 = changeimports(filestr, 'MA', 'scipy.base.ma')
     fromall = fromall1 or fromall2 or fromall3
     filestr = replaceattr(filestr)
diff --git a/scipy/base/matrix.py b/scipy/base/matrix.py
index 447cffb00..7729703be 100644
--- a/scipy/base/matrix.py
+++ b/scipy/base/matrix.py
@@ -199,8 +199,8 @@ class matrix(N.ndarray):
             return self.transpose()
 
     def getI(self):
-        from scipy.basic import linalg
-        return matrix(linalg.inv(self))
+        from scipy.corelinalg import inv
+        return matrix(inv(self))
 
     A = property(getA, None, doc="base array")
     T = property(getT, None, doc="transpose")
diff --git a/scipy/base/polynomial.py b/scipy/base/polynomial.py
index eb0856676..0cd8519ff 100644
--- a/scipy/base/polynomial.py
+++ b/scipy/base/polynomial.py
@@ -19,7 +19,7 @@ lstsq = None
 def get_linalg_funcs():
     "Look for linear algebra functions in scipy"
     global eigvals, lstsq
-    from scipy.basic.linalg import eigvals, lstsq
+    from scipy.corelinalg import eigvals, lstsq
     return
 
 def _eigvals(arg):
diff --git a/scipy/base/tests/test_matrix.py b/scipy/base/tests/test_matrix.py
index 7f420c3ef..b504af8a2 100644
--- a/scipy/base/tests/test_matrix.py
+++ b/scipy/base/tests/test_matrix.py
@@ -28,7 +28,7 @@ class test_ctor(ScipyTestCase):
         
 class test_properties(ScipyTestCase):
     def test_basic(self):
-        from scipy.basic import linalg
+        import scipy.corelinalg as linalg
         
         A = array([[1., 2.], 
                    [3., 4.]])
@@ -96,7 +96,7 @@ class test_autocasting(ScipyTestCase):
 
 class test_algebra(ScipyTestCase):
     def test_basic(self):
-        from scipy.basic import linalg
+        import scipy.corelinalg as linalg
         
         A = array([[1., 2.],
                    [3., 4.]])
diff --git a/scipy/corefft/__init__.py b/scipy/corefft/__init__.py
index a724df58d..1a23cfefc 100644
--- a/scipy/corefft/__init__.py
+++ b/scipy/corefft/__init__.py
@@ -1,11 +1,8 @@
 # To get sub-modules
 from info import __doc__
 
-import fftpack
-from fftpack import fft, ifft
-import linalg
-import random
-from random import rand, randn
+from fftpack import *
+from helper import *
 
 from scipy.test.testing import ScipyTest 
 test = ScipyTest().test
diff --git a/scipy/corefft/info.py b/scipy/corefft/info.py
index bb4217419..67b2fa5e5 100644
--- a/scipy/corefft/info.py
+++ b/scipy/corefft/info.py
@@ -1,13 +1,8 @@
 """\
-Basic tools
-===========
-
-linalg - lite version of scipy.linalg
-fftpack - lite version of scipy.fftpack
-helper - lite version of scipy.linalg.helper
+Core FFT routines
+==================
 
 """
 
 depends = ['base']
-global_symbols = ['fft','ifft','rand','randn', 
-                  'linalg','fftpack','random']
+global_symbols = ['fft','ifft']
diff --git a/scipy/corefft/setup.py b/scipy/corefft/setup.py
new file mode 100644
index 000000000..5ff44f37f
--- /dev/null
+++ b/scipy/corefft/setup.py
@@ -0,0 +1,20 @@
+
+from os.path import join
+
+def configuration(parent_package='',top_path=None):
+    from scipy.distutils.misc_util import Configuration
+    config = Configuration('corefft',parent_package,top_path)
+
+    config.add_data_dir('tests')
+
+    # Configure fftpack_lite
+    config.add_extension('fftpack_lite',
+                         sources=['fftpack_litemodule.c', 'fftpack.c']
+                         )
+
+
+    return config
+
+if __name__ == '__main__':
+    from scipy.distutils.core import setup
+    setup(**configuration(top_path='').todict())
diff --git a/scipy/corefft/tests/test_helper.py b/scipy/corefft/tests/test_helper.py
index cd7dd67cc..7bbae9301 100644
--- a/scipy/corefft/tests/test_helper.py
+++ b/scipy/corefft/tests/test_helper.py
@@ -6,7 +6,7 @@
 import sys
 from scipy.test.testing import *
 set_package_path()
-from scipy.basic.helper import fftshift,ifftshift,fftfreq
+from scipy.corefft import fftshift,ifftshift,fftfreq
 del sys.path[0]
 
 from scipy import pi
diff --git a/scipy/corelinalg/__init__.py b/scipy/corelinalg/__init__.py
index a724df58d..b762f32b9 100644
--- a/scipy/corelinalg/__init__.py
+++ b/scipy/corelinalg/__init__.py
@@ -1,11 +1,7 @@
 # To get sub-modules
 from info import __doc__
 
-import fftpack
-from fftpack import fft, ifft
-import linalg
-import random
-from random import rand, randn
+from linalg import *
 
 from scipy.test.testing import ScipyTest 
 test = ScipyTest().test
diff --git a/scipy/corelinalg/info.py b/scipy/corelinalg/info.py
index bb4217419..56c6388d0 100644
--- a/scipy/corelinalg/info.py
+++ b/scipy/corelinalg/info.py
@@ -1,13 +1,8 @@
 """\
-Basic tools
+Core Linear Algebra Tools
 ===========
 
-linalg - lite version of scipy.linalg
-fftpack - lite version of scipy.fftpack
-helper - lite version of scipy.linalg.helper
-
 """
 
 depends = ['base']
-global_symbols = ['fft','ifft','rand','randn', 
-                  'linalg','fftpack','random']
+
diff --git a/scipy/corelinalg/setup.py b/scipy/corelinalg/setup.py
new file mode 100644
index 000000000..b1a8c6c67
--- /dev/null
+++ b/scipy/corelinalg/setup.py
@@ -0,0 +1,31 @@
+
+from os.path import join
+
+def configuration(parent_package='',top_path=None):
+    from scipy.distutils.misc_util import Configuration
+    from scipy.distutils.system_info import get_info
+    config = Configuration('corelinalg',parent_package,top_path)
+
+    # Configure lapack_lite
+    lapack_info = get_info('lapack_opt',0)
+    def get_lapack_lite_sources(ext, build_dir):
+        if not lapack_info:
+            print "### Warning:  Using unoptimized lapack ###"
+            return ext.depends[:-1]
+        else:
+            return ext.depends[:1]
+
+    config.add_extension('lapack_lite',
+                         sources = [get_lapack_lite_sources],
+                         depends=  ['lapack_litemodule.c',
+                                   'zlapack_lite.c', 'dlapack_lite.c',
+                                   'blas_lite.c', 'dlamch.c',
+                                   'f2c_lite.c','f2c.h'],
+                         extra_info = lapack_info
+                         )
+            
+    return config
+
+if __name__ == '__main__':
+    from scipy.distutils.core import setup
+    setup(**configuration(top_path='').todict())
diff --git a/scipy/corerandom/__init__.py b/scipy/corerandom/__init__.py
index a724df58d..90ad1dc8b 100644
--- a/scipy/corerandom/__init__.py
+++ b/scipy/corerandom/__init__.py
@@ -1,11 +1,7 @@
 # To get sub-modules
 from info import __doc__
 
-import fftpack
-from fftpack import fft, ifft
-import linalg
-import random
-from random import rand, randn
+from random import *
 
 from scipy.test.testing import ScipyTest 
 test = ScipyTest().test
diff --git a/scipy/corerandom/info.py b/scipy/corerandom/info.py
index bb4217419..457c2b0fb 100644
--- a/scipy/corerandom/info.py
+++ b/scipy/corerandom/info.py
@@ -1,13 +1,8 @@
 """\
-Basic tools
+Core Random Tools
 ===========
 
-linalg - lite version of scipy.linalg
-fftpack - lite version of scipy.fftpack
-helper - lite version of scipy.linalg.helper
-
 """
 
 depends = ['base']
-global_symbols = ['fft','ifft','rand','randn', 
-                  'linalg','fftpack','random']
+global_symbols = ['rand','randn']
diff --git a/scipy/corerandom/setup.py b/scipy/corerandom/setup.py
new file mode 100644
index 000000000..0d6866047
--- /dev/null
+++ b/scipy/corerandom/setup.py
@@ -0,0 +1,12 @@
+
+from os.path import join
+
+def configuration(parent_package='',top_path=None):
+    from scipy.distutils.misc_util import Configuration
+    config = Configuration('corerandom',parent_package,top_path)
+            
+    return config
+
+if __name__ == '__main__':
+    from scipy.distutils.core import setup
+    setup(**configuration(top_path='').todict())
diff --git a/scipy/setup.py b/scipy/setup.py
index bd66db51c..586674e6e 100644
--- a/scipy/setup.py
+++ b/scipy/setup.py
@@ -10,7 +10,9 @@ def configuration(parent_package='',top_path=None):
     config.add_subpackage('f2py')
     config.add_subpackage('base')
     config.add_subpackage('lib')
-    config.add_subpackage('basic')
+    config.add_subpackage('corefft')
+    config.add_subpackage('corelinalg')
+    config.add_subpackage('corerandom')
     config.add_data_dir('doc')
 
     config.make_config_py(name='__core_config__') # installs __config__.py