summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorJay Bourque <jay.bourque@continuum.io>2013-03-16 14:56:57 -0500
committerJay Bourque <jay.bourque@continuum.io>2013-05-06 14:39:40 -0500
commitfdb42c4f9b27c6cfe5b071bd89eae97c0053297f (patch)
tree7fdae0da741edac0059cc635648ebff4862e44b8 /numpy
parent486a5377e776fdb811103ff956a156a409ffd1ec (diff)
downloadnumpy-fdb42c4f9b27c6cfe5b071bd89eae97c0053297f.tar.gz
Remove guard against read+write output operands
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/src/umath/ufunc_object.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c
index 10fee0c23..6a82eb0db 100644
--- a/numpy/core/src/umath/ufunc_object.c
+++ b/numpy/core/src/umath/ufunc_object.c
@@ -1205,12 +1205,6 @@ iterator_loop(PyUFuncObject *ufunc,
NPY_ITER_ALLOCATE|
NPY_ITER_NO_BROADCAST|
NPY_ITER_NO_SUBTYPE;
-
- if (ufunc->op_flags[i] > 0) {
- PyErr_SetString(PyExc_ValueError, "manually setting ufunc operand " \
- "flags for output operand is not supported at this time");
- return -1;
- }
}
iter_flags = ufunc->iter_flags|
@@ -1518,12 +1512,6 @@ execute_fancy_ufunc_loop(PyUFuncObject *ufunc,
NPY_ITER_ALLOCATE |
NPY_ITER_NO_BROADCAST |
NPY_ITER_NO_SUBTYPE;
-
- if (ufunc->op_flags[i] > 0) {
- PyErr_SetString(PyExc_ValueError, "manually setting ufunc operand " \
- "flags for output operand is not supported at this time");
- return -1;
- }
}
if (wheremask != NULL) {
op_flags[nop] = NPY_ITER_READONLY | NPY_ITER_ARRAYMASK;
@@ -2022,12 +2010,6 @@ PyUFunc_GeneralizedFunction(PyUFuncObject *ufunc,
NPY_ITER_ALIGNED|
NPY_ITER_ALLOCATE|
NPY_ITER_NO_BROADCAST;
-
- if (ufunc->op_flags[i] > 0) {
- PyErr_SetString(PyExc_ValueError, "manually setting ufunc operand " \
- "flags for output operand is not supported at this time");
- return -1;
- }
}
/*