diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2014-06-04 17:18:13 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2014-06-04 17:18:13 -0600 |
| commit | 805e11a4345d42b0cddc9ea0f59ae5f23eb99f4c (patch) | |
| tree | bfd2fc20dd0ceb07e30248fc9be5e57f480c3000 /numpy/core | |
| parent | b3ecb0957997684cd83c141649b8a4ea98b42654 (diff) | |
| parent | b9b9add7276a31447aba3caf0eeb68ab2f20fa1b (diff) | |
| download | numpy-805e11a4345d42b0cddc9ea0f59ae5f23eb99f4c.tar.gz | |
Merge pull request #4783 from juliantaylor/flat-assign-improve
ENH: use copyswap instead of memmove for flat assignment
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/src/multiarray/getset.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/numpy/core/src/multiarray/getset.c b/numpy/core/src/multiarray/getset.c index 182942ac9..5374f42e7 100644 --- a/numpy/core/src/multiarray/getset.c +++ b/numpy/core/src/multiarray/getset.c @@ -869,10 +869,7 @@ array_flat_set(PyArrayObject *self, PyObject *val) } while(selfit->index < selfit->size) { - memmove(selfit->dataptr, arrit->dataptr, PyArray_DESCR(self)->elsize); - if (swap) { - copyswap(selfit->dataptr, NULL, swap, self); - } + copyswap(selfit->dataptr, arrit->dataptr, swap, self); PyArray_ITER_NEXT(selfit); PyArray_ITER_NEXT(arrit); if (arrit->index == arrit->size) { |