diff options
| author | sasha <sasha@localhost> | 2006-03-01 03:41:58 +0000 |
|---|---|---|
| committer | sasha <sasha@localhost> | 2006-03-01 03:41:58 +0000 |
| commit | b25ddc20561f810283b7a6ecb49910f45df9770d (patch) | |
| tree | 2bb1dffd738b69d1cc41533fe7fb659e349e413a /numpy/core/src | |
| parent | 8f6eca691ad76cf0264ed9c8e2893e9160efe990 (diff) | |
| download | numpy-b25ddc20561f810283b7a6ecb49910f45df9770d.tar.gz | |
faster ndarray.fill
Diffstat (limited to 'numpy/core/src')
| -rw-r--r-- | numpy/core/src/arrayobject.c | 14 | ||||
| -rw-r--r-- | numpy/core/src/arraytypes.inc.src | 41 |
2 files changed, 52 insertions, 3 deletions
diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c index 55abc36f0..cd83f31e1 100644 --- a/numpy/core/src/arrayobject.c +++ b/numpy/core/src/arrayobject.c @@ -4108,9 +4108,17 @@ PyArray_FillWithScalar(PyArrayObject *arr, PyObject *obj) copyswap = arr->descr->f->copyswap; if (PyArray_ISONESEGMENT(arr)) { char *toptr=PyArray_DATA(arr); - while (size--) { - copyswap(toptr, fromptr, swap, itemsize); - toptr += itemsize; + PyArray_FillWithScalarFunc* fillwithscalar = + arr->descr->f->fillwithscalar; + if (fillwithscalar && PyArray_ISALIGNED(arr)) { + copyswap(fromptr, NULL, swap, itemsize); + fillwithscalar(toptr, size, itemsize, fromptr); + } + else { + while (size--) { + copyswap(toptr, fromptr, swap, itemsize); + toptr += itemsize; + } } } else { diff --git a/numpy/core/src/arraytypes.inc.src b/numpy/core/src/arraytypes.inc.src index 0fd105ab1..2c570b946 100644 --- a/numpy/core/src/arraytypes.inc.src +++ b/numpy/core/src/arraytypes.inc.src @@ -1713,6 +1713,45 @@ static void /**end repeat**/ +/* this requires buffer to be filled with objects or NULL */ +static void +OBJECT_fillwithscalar(PyObject **buffer, intp length, intp ignored, PyObject **value) +{ + intp i; + PyObject *val = *value; + for (i=0; i<length; i++) { + Py_XDECREF(buffer[i]); + Py_INCREF(val); + buffer[i] = val; + } +} +/**begin repeat +#NAME=BOOL,BYTE,UBYTE# +#typ=Bool,byte,ubyte# +*/ +static void +@NAME@_fillwithscalar(@typ@ *buffer, intp length, intp ignored, @typ@ *value) +{ + memset(buffer, *value, length); +} +/**end repeat**/ + +/**begin repeat +#NAME=SHORT,USHORT,INT,UINT,LONG,ULONG,LONGLONG,ULONGLONG,FLOAT,DOUBLE,LONGDOUBLE,CFLOAT,CDOUBLE,CLONGDOUBLE# +#typ=short,ushort,int,uint,long,ulong,longlong,ulonglong,float,double,longdouble,cfloat,cdouble,clongdouble# +*/ +static void +@NAME@_fillwithscalar(@typ@ *buffer, intp length, intp ignored, @typ@ *value) +{ + register intp i; + @typ@ val = *value; + for (i=0; i<length; ++i) { + buffer[i] = val; + } +} + +/**end repeat**/ + #define _ALIGN(type) offsetof(struct {char c; type v;},v) /**begin repeat @@ -1758,6 +1797,7 @@ static PyArray_ArrFuncs _Py@NAME@_ArrFuncs = { (PyArray_FromStrFunc*)@from@_fromstr, (PyArray_NonzeroFunc*)@from@_nonzero, (PyArray_FillFunc*)NULL, + (PyArray_FillWithScalarFunc*)NULL, { NULL, NULL, NULL, NULL }, @@ -1828,6 +1868,7 @@ static PyArray_ArrFuncs _Py@NAME@_ArrFuncs = { (PyArray_FromStrFunc*)@from@_fromstr, (PyArray_NonzeroFunc*)@from@_nonzero, (PyArray_FillFunc*)@from@_fill, + (PyArray_FillWithScalarFunc*)@from@_fillwithscalar, { NULL, NULL, NULL, NULL }, |