[Numpy-svn] r8082 - trunk/numpy/core/src/multiarray

numpy-svn@scip... numpy-svn@scip...
Mon Feb 1 04:56:51 CST 2010


Author: cdavid
Date: 2010-02-01 04:56:51 -0600 (Mon, 01 Feb 2010)
New Revision: 8082

Modified:
   trunk/numpy/core/src/multiarray/multiarraymodule.c
Log:
BUG: fix performance issue (#1308).

Modified: trunk/numpy/core/src/multiarray/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarray/multiarraymodule.c	2010-01-29 22:50:54 UTC (rev 8081)
+++ trunk/numpy/core/src/multiarray/multiarraymodule.c	2010-02-01 10:56:51 UTC (rev 8082)
@@ -626,12 +626,12 @@
 
     typec = PyArray_DescrFromType(typenum);
     Py_INCREF(typec);
-    ap1 = (PyArrayObject *)PyArray_FromAny(op1, typec, 0, 0, BEHAVED, NULL);
+    ap1 = (PyArrayObject *)PyArray_FromAny(op1, typec, 0, 0, ALIGNED, NULL);
     if (ap1 == NULL) {
         Py_DECREF(typec);
         return NULL;
     }
-    ap2 = (PyArrayObject *)PyArray_FromAny(op2, typec, 0, 0, BEHAVED, NULL);
+    ap2 = (PyArrayObject *)PyArray_FromAny(op2, typec, 0, 0, ALIGNED, NULL);
     if (ap2 == NULL) {
         goto fail;
     }
@@ -733,12 +733,12 @@
     typenum = PyArray_ObjectType(op2, typenum);
     typec = PyArray_DescrFromType(typenum);
     Py_INCREF(typec);
-    ap1 = (PyArrayObject *)PyArray_FromAny(op1, typec, 0, 0, BEHAVED, NULL);
+    ap1 = (PyArrayObject *)PyArray_FromAny(op1, typec, 0, 0, ALIGNED, NULL);
     if (ap1 == NULL) {
         Py_DECREF(typec);
         return NULL;
     }
-    ap2 = (PyArrayObject *)PyArray_FromAny(op2, typec, 0, 0, BEHAVED, NULL);
+    ap2 = (PyArrayObject *)PyArray_FromAny(op2, typec, 0, 0, ALIGNED, NULL);
     if (ap2 == NULL) {
         goto fail;
     }



More information about the Numpy-svn mailing list