diff options
| -rw-r--r-- | numpy/core/src/umath/loops.c.src | 6 | ||||
| -rw-r--r-- | numpy/core/src/umath/loops.h | 3 | ||||
| -rw-r--r-- | numpy/core/src/umath/loops.h.src | 2 | ||||
| -rw-r--r-- | numpy/core/src/umath/ufunc_object.c | 12 | ||||
| -rw-r--r-- | numpy/core/src/umath/umath_tests.c.src | 2 |
5 files changed, 11 insertions, 14 deletions
diff --git a/numpy/core/src/umath/loops.c.src b/numpy/core/src/umath/loops.c.src index 26cee7fa0..79d9da077 100644 --- a/numpy/core/src/umath/loops.c.src +++ b/numpy/core/src/umath/loops.c.src @@ -64,7 +64,7 @@ intp n = dimensions[0]; \ intp i; \ for(i = 0; i < n; i++, ip2 += is2) - + #define BINARY_REDUCE_LOOP(TYPE)\ char *iop1 = args[0]; \ TYPE io1 = *(TYPE *)iop1; \ @@ -1026,7 +1026,7 @@ NPY_NO_EXPORT void /**end repeat**/ -/* FIXME: implement the following correctly using the metadata: data is the +/* FIXME: implement the following correctly using the metadata: data is the sequence of ndarrays in the same order as args. */ NPY_NO_EXPORT void @@ -2089,5 +2089,3 @@ OBJECT_sign(char **args, intp *dimensions, intp *steps, void *NPY_UNUSED(func)) ** END LOOPS ** ***************************************************************************** */ - - diff --git a/numpy/core/src/umath/loops.h b/numpy/core/src/umath/loops.h index 2d8343b47..abd8de23e 100644 --- a/numpy/core/src/umath/loops.h +++ b/numpy/core/src/umath/loops.h @@ -22,7 +22,7 @@ * command line as follows: * * $ cd <NumPy source root directory> - * $ python numpy/distutils/conv_template.py numpy/core/src/umath/loops.h.src + * $ python numpy/distutils/conv_template.py numpy/core/src/umath/loops.h.src * $ */ @@ -2716,4 +2716,3 @@ OBJECT_sign(char **args, intp *dimensions, intp *steps, void *NPY_UNUSED(func)); */ #endif - diff --git a/numpy/core/src/umath/loops.h.src b/numpy/core/src/umath/loops.h.src index d4ec0a78d..1def8ba0f 100644 --- a/numpy/core/src/umath/loops.h.src +++ b/numpy/core/src/umath/loops.h.src @@ -13,7 +13,7 @@ * command line as follows: * * $ cd <NumPy source root directory> - * $ python numpy/distutils/conv_template.py numpy/core/src/umath/loops.h.src + * $ python numpy/distutils/conv_template.py numpy/core/src/umath/loops.h.src * $ */ diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c index 5aa089258..9006a9db6 100644 --- a/numpy/core/src/umath/ufunc_object.c +++ b/numpy/core/src/umath/ufunc_object.c @@ -1541,7 +1541,7 @@ find_specified_ufunc_inner_loop(PyUFuncObject *self, return 0; } } - + NPY_UF_DBG_PRINTF("Searching loops for specified sig\n"); for (i = 0; i < self->ntypes; ++i) { char *orig_types = self->types + i*self->nargs; @@ -3066,7 +3066,7 @@ PyUFunc_ReductionOp(PyUFuncObject *self, PyArrayObject *arr, stride = NpyIter_GetInnerStrideArray(iter); count_ptr = NpyIter_GetInnerLoopSizePtr(iter); - + /* Execute the loop with two nested iterators */ if (iter_inner) { /* Only UFUNC_REDUCE uses iter_inner */ @@ -3110,7 +3110,7 @@ PyUFunc_ReductionOp(PyUFuncObject *self, PyArrayObject *arr, else { memcpy(dataptr_inner[0], dataptr_inner[1], itemsize); } - + stride_copy[0] = 0; stride_copy[2] = 0; do { @@ -3157,7 +3157,7 @@ PyUFunc_ReductionOp(PyUFuncObject *self, PyArrayObject *arr, } do { - + dataptr_copy[0] = dataptr[0]; dataptr_copy[1] = dataptr[1]; dataptr_copy[2] = dataptr[0]; @@ -3240,7 +3240,7 @@ PyUFunc_ReductionOp(PyUFuncObject *self, PyArrayObject *arr, else { memcpy(dataptr_inner[0], dataptr_inner[1], itemsize); } - + stride_copy[0] = 0; stride_copy[2] = 0; do { @@ -3611,7 +3611,7 @@ PyUFunc_Reduceat(PyUFuncObject *self, PyArrayObject *arr, PyArrayObject *ind, stride = NpyIter_GetInnerStrideArray(iter); count_ptr = NpyIter_GetInnerLoopSizePtr(iter); - + /* Execute the loop with just the outer iterator */ npy_intp count_m1 = PyArray_DIM(op[1], axis)-1; npy_intp stride0 = 0, stride1 = PyArray_STRIDE(op[1], axis); diff --git a/numpy/core/src/umath/umath_tests.c.src b/numpy/core/src/umath/umath_tests.c.src index 1fd27a296..829422090 100644 --- a/numpy/core/src/umath/umath_tests.c.src +++ b/numpy/core/src/umath/umath_tests.c.src @@ -313,7 +313,7 @@ initumath_tests(void) #if defined(NPY_PY3K) m = PyModule_Create(&moduledef); -#else +#else m = Py_InitModule("umath_tests", UMath_TestsMethods); #endif if (m == NULL) |