Skip to content

Core tweaks #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
3 commits merged into from
Feb 3, 2011
Merged

Core tweaks #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f60797b
BUG: perf: Operations like "a[10:20] += 10" were doing a redundant copy
mwiebe Jan 31, 2011
fcc6cc7
ENH: core: Small tweaks to streamline things a bit
mwiebe Feb 1, 2011
85993f8
ENH: iter: Add timing code, rewrite some sections to be faster/more c…
mwiebe Feb 1, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 42 additions & 45 deletions numpy/core/src/multiarray/convert_datatype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,9 @@ promote_types(PyArray_Descr *type1, PyArray_Descr *type2,
int is_small_unsigned1, int is_small_unsigned2)
{
if (is_small_unsigned1) {
int type_num1 = type1->type_num, type_num2 = type2->type_num, ret_type_num;
int type_num1 = type1->type_num;
int type_num2 = type2->type_num;
int ret_type_num;

if (type_num2 < NPY_NTYPES && !(PyTypeNum_ISBOOL(type_num2) ||
PyTypeNum_ISUNSIGNED(type_num2))) {
Expand All @@ -503,9 +505,9 @@ promote_types(PyArray_Descr *type1, PyArray_Descr *type2,
return PyArray_PromoteTypes(type1, type2);
}
else if (is_small_unsigned2) {
int type_num1 = type1->type_num,
type_num2 = type2->type_num,
ret_type_num;
int type_num1 = type1->type_num;
int type_num2 = type2->type_num;
int ret_type_num;

if (type_num1 < NPY_NTYPES && !(PyTypeNum_ISBOOL(type_num1) ||
PyTypeNum_ISUNSIGNED(type_num1))) {
Expand Down Expand Up @@ -536,25 +538,6 @@ PyArray_PromoteTypes(PyArray_Descr *type1, PyArray_Descr *type2)
{
int type_num1, type_num2, ret_type_num;

/* If one of the arguments is NULL, return the non-NULL one */
if (type1 == NULL || type2 == NULL) {
if (type1 == NULL) {
if (type2 == NULL) {
PyErr_SetString(PyExc_RuntimeError,
"PromoteTypes received two NULL arguments");
return NULL;
}
else {
Py_INCREF(type2);
return type2;
}
}
else {
Py_INCREF(type1);
return type1;
}
}

type_num1 = type1->type_num;
type_num2 = type2->type_num;

Expand Down Expand Up @@ -1146,9 +1129,12 @@ PyArray_ResultType(npy_intp narrs, PyArrayObject **arr,
Py_INCREF(ret);
}
else {
tmpret = PyArray_PromoteTypes(tmp, ret);
Py_DECREF(ret);
ret = tmpret;
/* Only call promote if the types aren't the same dtype */
if (tmp != ret || !PyArray_ISNBO(ret->byteorder)) {
tmpret = PyArray_PromoteTypes(tmp, ret);
Py_DECREF(ret);
ret = tmpret;
}
}
}
}
Expand All @@ -1163,7 +1149,8 @@ PyArray_ResultType(npy_intp narrs, PyArrayObject **arr,
* unsigned integer which would fit an a signed integer
* of the same size, something not exposed in the public API.
*/
if (PyArray_NDIM(arr[i]) == 0 && PyTypeNum_ISNUMBER(tmp->type_num)) {
if (PyArray_NDIM(arr[i]) == 0 &&
PyTypeNum_ISNUMBER(tmp->type_num)) {
char *data = PyArray_BYTES(arr[i]);
int swap = !PyArray_ISNBO(tmp->byteorder);
int type_num;
Expand Down Expand Up @@ -1199,18 +1186,24 @@ PyArray_ResultType(npy_intp narrs, PyArrayObject **arr,
printf(" (%d) ", ret_is_small_unsigned);
printf("\n");
#endif
tmpret = promote_types(tmp, ret, tmp_is_small_unsigned,
ret_is_small_unsigned);
if (tmpret == NULL) {
/* If they point to the same type, don't call promote */
if (tmp == ret && PyArray_ISNBO(tmp->byteorder)) {
Py_DECREF(tmp);
}
else {
tmpret = promote_types(tmp, ret, tmp_is_small_unsigned,
ret_is_small_unsigned);
if (tmpret == NULL) {
Py_DECREF(tmp);
Py_DECREF(ret);
return NULL;
}
Py_DECREF(tmp);
Py_DECREF(ret);
return NULL;
ret = tmpret;
}
ret_is_small_unsigned = tmp_is_small_unsigned &&
ret_is_small_unsigned;
Py_DECREF(tmp);
Py_DECREF(ret);
ret = tmpret;
}
}

Expand All @@ -1222,19 +1215,23 @@ PyArray_ResultType(npy_intp narrs, PyArrayObject **arr,
Py_INCREF(ret);
}
else {
if (ret_is_small_unsigned) {
tmpret = promote_types(tmp, ret, 0, ret_is_small_unsigned);
if (tmpret == NULL) {
Py_DECREF(tmp);
Py_DECREF(ret);
return NULL;
/* Only call promote if the types aren't the same dtype */
if (tmp != ret || !PyArray_ISNBO(tmp->byteorder)) {
if (ret_is_small_unsigned) {
tmpret = promote_types(tmp, ret, 0,
ret_is_small_unsigned);
if (tmpret == NULL) {
Py_DECREF(tmp);
Py_DECREF(ret);
return NULL;
}
}
else {
tmpret = PyArray_PromoteTypes(tmp, ret);
}
Py_DECREF(ret);
ret = tmpret;
}
else {
tmpret = PyArray_PromoteTypes(tmp, ret);
}
Py_DECREF(ret);
ret = tmpret;
}
}
}
Expand Down
Loading