diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2005-09-26 19:01:50 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2005-09-26 19:01:50 +0000 |
| commit | 8ac222e304fdd59394725d27e82168a95eadaf1c (patch) | |
| tree | c5cfd3f5ff09cc095c1c25620b4ff6887e77243c /weave/accelerate_tools.py | |
| parent | ed8548a9686b70995ff1afdefbba437d84134d08 (diff) | |
| download | numpy-8ac222e304fdd59394725d27e82168a95eadaf1c.tar.gz | |
Adding weave and test
Diffstat (limited to 'weave/accelerate_tools.py')
| -rw-r--r-- | weave/accelerate_tools.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/weave/accelerate_tools.py b/weave/accelerate_tools.py index f9b59a0df..0b6fc581a 100644 --- a/weave/accelerate_tools.py +++ b/weave/accelerate_tools.py @@ -109,7 +109,7 @@ Integer = Integer() Double = Double() String = String() -import scipy_base.numerix as nx +import scipy.base as nx class Vector(Type_Descriptor): cxxtype = 'PyArrayObject*' @@ -121,7 +121,7 @@ class Vector(Type_Descriptor): owned = 0 # Convertion is by casting! prerequisites = Type_Descriptor.prerequisites+\ - [nx.NX_INCLUDE] + ['#include "scipy/arrayobject.h"'] dims = 1 def check(self,s): return "PyArray_Check(%s) && ((PyArrayObject*)%s)->nd == %d && ((PyArrayObject*)%s)->descr->type_num == %s"%( @@ -260,7 +260,7 @@ def lookup_type(x): try: return typedefs[T] except: - import scipy_base.numerix as nx + import scipy.base as nx if isinstance(T,nx.ArrayType): return typedefs[(T,len(x.shape),x.typecode())] elif T == InstanceType: |