WIP: Implement oindex

numpy · seberg · Jul 14, 2015 · Nov 29, 2015 · Nov 29, 2015 · Jan 3, 2016
commit c74243aeb32e36931659fdd53f323cd5cf2a6fde
diff --git a/numpy/core/code_generators/numpy_api.py b/numpy/core/code_generators/numpy_api.py
@@ -74,6 +74,8 @@
     'PyHalfArrType_Type':               (217,),
     'NpyIter_Type':                     (218,),
     # End 1.6 API
+    # Start 1.10 API
+    'PyArrayAttributeIndexer_Type':     (301,),
 }
 
 #define NPY_NUMUSERTYPES (*(int *)PyArray_API[6])

diff --git a/numpy/core/include/numpy/ndarraytypes.h b/numpy/core/include/numpy/ndarraytypes.h
@@ -1315,8 +1315,9 @@ typedef struct {
         char                  *baseoffset;
 
         /*
-         * after binding consec denotes at which axis the fancy axes
-         * are inserted.
+         * after binding consec != 0 means that a transpose is
+         * necessary. The exact value carries (temporarely unused) info for
+         * fancy indexing transpose. (Did not rename for API compat)
          */
         int                   consec;
         char                  *dataptr;
@@ -1355,9 +1356,15 @@ typedef struct {
 
         /* Count for the external loop (which ever it is) for API iteration */
         npy_intp              iter_count;
+        /* 
+         * Specify how to transpose for MapIterSwapAxes
+         */
+        npy_intp              set_perm[NPY_MAXDIMS];
+        npy_intp              get_perm[NPY_MAXDIMS];
 
 } PyArrayMapIterObject;
 
+
 enum {
     NPY_NEIGHBORHOOD_ITER_ZERO_PADDING,
     NPY_NEIGHBORHOOD_ITER_ONE_PADDING,

diff --git a/numpy/core/src/multiarray/getset.c b/numpy/core/src/multiarray/getset.c
@@ -21,6 +21,8 @@
 #include "mem_overlap.h"
 #include "alloc.h"
 
+#include "mapping.h"
+
 /*******************  array attribute get and set routines ******************/
 
 static PyObject *
@@ -961,6 +963,24 @@ array_transpose_get(PyArrayObject *self)
     return PyArray_Transpose(self, NULL);
 }
 
+static PyObject *
+array_oindex_get(PyArrayObject *self)
+{
+    return PyArray_AttributeIndexerNew(self, OUTER_INDEXING);
+}
+
+static PyObject *
+array_vindex_get(PyArrayObject *self)
+{
+    return PyArray_AttributeIndexerNew(self, VECTOR_INDEXING);
+}
+
+static PyObject *
+array_lindex_get(PyArrayObject *self)
+{
+    return PyArray_AttributeIndexerNew(self, FANCY_INDEXING);
+}
+
 /* If this is None, no function call is made
    --- default sub-class behavior
 */
@@ -1031,6 +1051,18 @@ NPY_NO_EXPORT PyGetSetDef array_getsetlist[] = {
         (getter)array_transpose_get,
         NULL,
         NULL, NULL},
+    {"oindex",
+        (getter)array_oindex_get,
+        NULL,
+        NULL, NULL},
+    {"vindex",
+        (getter)array_vindex_get,
+        NULL,
+        NULL, NULL},
+    {"lindex",
+        (getter)array_lindex_get,
+        NULL,
+        NULL, NULL},
     {"__array_interface__",
         (getter)array_interface_get,
         NULL,