ENH: Optimization in subscript_simple for arrays with size > 1

1 files changed, 31 insertions, 22 deletions

diff --git a/numpy/core/src/multiarray/mapping.c b/numpy/core/src/multiarray/mapping.c
index c514cfe14..19cf8aad8 100644
--- a/numpy/core/src/multiarray/mapping.c
+++ b/numpy/core/src/multiarray/mapping.c
@@ -565,31 +565,40 @@ array_subscript_simple(PyArrayObject *self, PyObject *op)
     PyArrayObject *ret;
     npy_intp value;
 
-    /*
-     * PyNumber_Index was introduced in Python 2.5 because of NumPy.
-     * http://www.python.org/dev/peps/pep-0357/
-     * Let's use it for indexing!
-     *
-     * Unfortunately, SciPy and possibly other code seems to rely
-     * on the lenient coercion. :(
-     */
+
+    if (!(PyArray_Check(op) && (PyArray_SIZE((PyArrayObject*)op) > 1))) {
+        /*
+         * PyNumber_Index was introduced in Python 2.5 because of NumPy.
+         * http://www.python.org/dev/peps/pep-0357/
+         * Let's use it for indexing!
+         *
+         * Unfortunately, SciPy and possibly other code seems to rely
+         * on the lenient coercion. :(
+         */
 #if 0 /*PY_VERSION_HEX >= 0x02050000*/
-    PyObject *ind = PyNumber_Index(op);
-    if (ind != NULL) {
-        value = PyArray_PyIntAsIntp(ind);
-        Py_DECREF(ind);
-    }
-    else {
-        value = -1;
-    }
+        PyObject *ind = PyNumber_Index(op);
+        if (ind != NULL) {
+            value = PyArray_PyIntAsIntp(ind);
+            Py_DECREF(ind);
+        }
+        else {
+            value = -1;
+        }
 #else
-    value = PyArray_PyIntAsIntp(op);
+        value = PyArray_PyIntAsIntp(op);
 #endif
-    if (value == -1 && PyErr_Occurred()) {
-        PyErr_Clear();
-    }
-    else {
-        return array_item_asarray(self, value);
+        if (value == -1 && PyErr_Occurred()) {
+            if (PyErr_ExceptionMatches(PyExc_TypeError)) {
+                /* Operand is not an integer type */
+                PyErr_Clear();
+            }
+            else {
+                return NULL;
+            }
+        }
+        else {
+            return array_item_asarray(self, value);
+        }
     }
 
     /* Standard (view-based) Indexing */