diff options
| author | Jay Bourque <jay.bourque@continuum.io> | 2013-05-06 14:39:14 -0500 |
|---|---|---|
| committer | Jay Bourque <jay.bourque@continuum.io> | 2013-05-06 14:39:40 -0500 |
| commit | 4b4dc5f4754f85becb73b0d621739a801a27210d (patch) | |
| tree | dc19a576e9c42b4800f349c6bd16aab5bc4db922 /numpy | |
| parent | 2ac16285e630acab83be645e2990805f27fe9e16 (diff) | |
| download | numpy-4b4dc5f4754f85becb73b0d621739a801a27210d.tar.gz | |
Fix formatting issues
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/include/numpy/ufuncobject.h | 2 | ||||
| -rw-r--r-- | numpy/core/setup.py | 2 | ||||
| -rw-r--r-- | numpy/core/src/umath/ufunc_object.c | 39 |
3 files changed, 20 insertions, 23 deletions
diff --git a/numpy/core/include/numpy/ufuncobject.h b/numpy/core/include/numpy/ufuncobject.h index 171e4dbe3..686d12c38 100644 --- a/numpy/core/include/numpy/ufuncobject.h +++ b/numpy/core/include/numpy/ufuncobject.h @@ -216,7 +216,7 @@ typedef struct _tagPyUFuncObject { /* * List of flags for each operand when ufunc is called by nditer object. * These flags will be used in addition to the default flags for each - * operand set by nditer object. + * operand set by nditer object. */ npy_uint32 *op_flags; diff --git a/numpy/core/setup.py b/numpy/core/setup.py index b99f1853d..3b08d6edd 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -936,7 +936,7 @@ def configuration(parent_package='',top_path=None): sources = [join('src', 'multiarray', 'multiarray_tests.c.src')]) ####################################################################### - # operand_flag_tests module # + # operand_flag_tests module # ####################################################################### config.add_extension('operand_flag_tests', diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c index 6a82eb0db..976c19837 100644 --- a/numpy/core/src/umath/ufunc_object.c +++ b/numpy/core/src/umath/ufunc_object.c @@ -1181,14 +1181,13 @@ iterator_loop(PyUFuncObject *ufunc, npy_intp *count_ptr; PyArrayObject **op_it; - npy_uint32 iter_flags; NPY_BEGIN_THREADS_DEF; /* Set up the flags */ for (i = 0; i < nin; ++i) { - op_flags[i] = NPY_ITER_READONLY| + op_flags[i] = NPY_ITER_READONLY | NPY_ITER_ALIGNED; /* * If READWRITE flag has been set for this operand, @@ -1200,19 +1199,19 @@ iterator_loop(PyUFuncObject *ufunc, } } for (i = nin; i < nop; ++i) { - op_flags[i] = NPY_ITER_WRITEONLY| - NPY_ITER_ALIGNED| - NPY_ITER_ALLOCATE| - NPY_ITER_NO_BROADCAST| + op_flags[i] = NPY_ITER_WRITEONLY | + NPY_ITER_ALIGNED | + NPY_ITER_ALLOCATE | + NPY_ITER_NO_BROADCAST | NPY_ITER_NO_SUBTYPE; } - iter_flags = ufunc->iter_flags| - NPY_ITER_EXTERNAL_LOOP| - NPY_ITER_REFS_OK| - NPY_ITER_ZEROSIZE_OK| - NPY_ITER_BUFFERED| - NPY_ITER_GROWINNER| + iter_flags = ufunc->iter_flags | + NPY_ITER_EXTERNAL_LOOP | + NPY_ITER_REFS_OK | + NPY_ITER_ZEROSIZE_OK | + NPY_ITER_BUFFERED | + NPY_ITER_GROWINNER | NPY_ITER_DELAY_BUFALLOC; /* @@ -1475,7 +1474,6 @@ execute_fancy_ufunc_loop(PyUFuncObject *ufunc, npy_intp *countptr; PyArrayObject **op_it; - npy_uint32 iter_flags; NPY_BEGIN_THREADS_DEF; @@ -1519,11 +1517,11 @@ execute_fancy_ufunc_loop(PyUFuncObject *ufunc, NPY_UF_DBG_PRINT("Making iterator\n"); - iter_flags = ufunc->iter_flags| - NPY_ITER_EXTERNAL_LOOP| - NPY_ITER_REFS_OK| - NPY_ITER_ZEROSIZE_OK| - NPY_ITER_BUFFERED| + iter_flags = ufunc->iter_flags | + NPY_ITER_EXTERNAL_LOOP | + NPY_ITER_REFS_OK | + NPY_ITER_ZEROSIZE_OK | + NPY_ITER_BUFFERED | NPY_ITER_GROWINNER; /* @@ -1691,7 +1689,6 @@ PyUFunc_GeneralizedFunction(PyUFuncObject *ufunc, npy_intp iter_shape[NPY_MAXARGS]; NpyIter *iter = NULL; - npy_uint32 iter_flags; /* These parameters come from extobj= or from a TLS global */ @@ -1992,8 +1989,8 @@ PyUFunc_GeneralizedFunction(PyUFuncObject *ufunc, * can't do buffering, so must COPY or UPDATEIFCOPY. */ for (i = 0; i < nin; ++i) { - op_flags[i] = NPY_ITER_READONLY| - NPY_ITER_COPY| + op_flags[i] = NPY_ITER_READONLY | + NPY_ITER_COPY | NPY_ITER_ALIGNED; /* * If READWRITE flag has been set for this operand, |