Author: Brian Kearns <[email protected]>
Branch: numpy-refactor
Changeset: r69475:61e06779d82e
Date: 2014-02-26 14:59 -0500
http://bitbucket.org/pypy/pypy/changeset/61e06779d82e/
Log: kill arrayimpl subdirectory
diff --git a/pypy/module/micronumpy/arrayimpl/__init__.py
b/pypy/module/micronumpy/arrayimpl/__init__.py
deleted file mode 100644
diff --git a/pypy/module/micronumpy/base.py b/pypy/module/micronumpy/base.py
--- a/pypy/module/micronumpy/base.py
+++ b/pypy/module/micronumpy/base.py
@@ -27,14 +27,14 @@
__metaclass__ = extendabletype
def __init__(self, implementation):
- from pypy.module.micronumpy.arrayimpl.concrete import BaseConcreteArray
+ from pypy.module.micronumpy.concrete import BaseConcreteArray
assert isinstance(implementation, BaseConcreteArray)
assert isinstance(self, W_NDimArray)
self.implementation = implementation
@staticmethod
def from_shape(space, shape, dtype, order='C', w_instance=None):
- from pypy.module.micronumpy.arrayimpl import concrete
+ from pypy.module.micronumpy import concrete
strides, backstrides = calc_strides(shape, dtype.base, order)
impl = concrete.ConcreteArray(shape, dtype.base, order, strides,
@@ -46,7 +46,7 @@
@staticmethod
def from_shape_and_storage(space, shape, storage, dtype, order='C',
owning=False,
w_subtype=None, w_base=None, writable=True):
- from pypy.module.micronumpy.arrayimpl import concrete
+ from pypy.module.micronumpy import concrete
assert shape
strides, backstrides = calc_strides(shape, dtype, order)
if w_base is not None:
@@ -77,7 +77,7 @@
@staticmethod
def new_slice(space, offset, strides, backstrides, shape, parent,
orig_arr, dtype=None):
- from pypy.module.micronumpy.arrayimpl import concrete
+ from pypy.module.micronumpy import concrete
impl = concrete.SliceArray(offset, strides, backstrides, shape, parent,
orig_arr, dtype)
diff --git a/pypy/module/micronumpy/arrayimpl/concrete.py
b/pypy/module/micronumpy/concrete.py
rename from pypy/module/micronumpy/arrayimpl/concrete.py
rename to pypy/module/micronumpy/concrete.py
--- a/pypy/module/micronumpy/arrayimpl/concrete.py
+++ b/pypy/module/micronumpy/concrete.py
@@ -360,11 +360,11 @@
self.dtype = dtype
def argsort(self, space, w_axis):
- from pypy.module.micronumpy.arrayimpl.sort import argsort_array
+ from pypy.module.micronumpy.sort import argsort_array
return argsort_array(self, space, w_axis)
def sort(self, space, w_axis, w_order):
- from pypy.module.micronumpy.arrayimpl.sort import sort_array
+ from pypy.module.micronumpy.sort import sort_array
return sort_array(self, space, w_axis, w_order)
def base(self):
diff --git a/pypy/module/micronumpy/interp_boxes.py
b/pypy/module/micronumpy/interp_boxes.py
--- a/pypy/module/micronumpy/interp_boxes.py
+++ b/pypy/module/micronumpy/interp_boxes.py
@@ -10,7 +10,7 @@
from rpython.rlib.rarithmetic import LONG_BIT
from rpython.rtyper.lltypesystem import rffi
from rpython.tool.sourcetools import func_with_new_name
-from pypy.module.micronumpy.arrayimpl.concrete import VoidBoxStorage
+from pypy.module.micronumpy.concrete import VoidBoxStorage
from pypy.module.micronumpy.base import W_NDimArray
from pypy.module.micronumpy.interp_flagsobj import W_FlagsObject
from pypy.interpreter.mixedmodule import MixedModule
diff --git a/pypy/module/micronumpy/interp_flatiter.py
b/pypy/module/micronumpy/interp_flatiter.py
--- a/pypy/module/micronumpy/interp_flatiter.py
+++ b/pypy/module/micronumpy/interp_flatiter.py
@@ -1,6 +1,6 @@
from pypy.module.micronumpy.base import W_NDimArray, convert_to_array
from pypy.module.micronumpy import loop
-from pypy.module.micronumpy.arrayimpl.concrete import BaseConcreteArray
+from pypy.module.micronumpy.concrete import BaseConcreteArray
from pypy.interpreter.error import OperationError
diff --git a/pypy/module/micronumpy/interp_numarray.py
b/pypy/module/micronumpy/interp_numarray.py
--- a/pypy/module/micronumpy/interp_numarray.py
+++ b/pypy/module/micronumpy/interp_numarray.py
@@ -19,7 +19,7 @@
from rpython.tool.sourcetools import func_with_new_name
from rpython.rlib import jit
from rpython.rlib.rstring import StringBuilder
-from pypy.module.micronumpy.arrayimpl.concrete import BaseConcreteArray
+from pypy.module.micronumpy.concrete import BaseConcreteArray
from pypy.module.micronumpy.conversion_utils import order_converter,
multi_axis_converter
from pypy.module.micronumpy import support
from pypy.module.micronumpy import constants as NPY
@@ -1077,7 +1077,7 @@
def descr_reduce(self, space):
from rpython.rlib.rstring import StringBuilder
from pypy.interpreter.mixedmodule import MixedModule
- from pypy.module.micronumpy.arrayimpl.concrete import SliceArray
+ from pypy.module.micronumpy.concrete import SliceArray
numpypy = space.getbuiltinmodule("_numpypy")
assert isinstance(numpypy, MixedModule)
@@ -1142,7 +1142,7 @@
@unwrap_spec(offset=int)
def descr_new_array(space, w_subtype, w_shape, w_dtype=None, w_buffer=None,
offset=0, w_strides=None, w_order=None):
- from pypy.module.micronumpy.arrayimpl.concrete import ConcreteArray
+ from pypy.module.micronumpy.concrete import ConcreteArray
from pypy.module.micronumpy.support import calc_strides
dtype = space.interp_w(interp_dtype.W_Dtype,
space.call_function(space.gettypefor(interp_dtype.W_Dtype), w_dtype))
diff --git a/pypy/module/micronumpy/arrayimpl/sort.py
b/pypy/module/micronumpy/sort.py
rename from pypy/module/micronumpy/arrayimpl/sort.py
rename to pypy/module/micronumpy/sort.py
diff --git a/pypy/module/micronumpy/types.py b/pypy/module/micronumpy/types.py
--- a/pypy/module/micronumpy/types.py
+++ b/pypy/module/micronumpy/types.py
@@ -4,7 +4,7 @@
from pypy.interpreter.error import OperationError, oefmt
from pypy.module.micronumpy import interp_boxes
from pypy.module.micronumpy import support
-from pypy.module.micronumpy.arrayimpl.concrete import SliceArray,
VoidBoxStorage
+from pypy.module.micronumpy.concrete import SliceArray, VoidBoxStorage
from pypy.objspace.std.floatobject import float2string
from pypy.objspace.std.complexobject import str_format
from rpython.rlib import rfloat, clibffi, rcomplex
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
