Skip to content

bpo-38639: Optimize floor(), ceil() and trunc() for floats. #16991

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
merged 3 commits into from
Nov 16, 2019
Merged

bpo-38639: Optimize floor(), ceil() and trunc() for floats. #16991

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d80f7bd
bpo-38639: Optimize floor(), ceil() and trunc() for floats.
serhiy-storchaka Oct 30, 2019
265271a
Get rid of math_1_to_int.
serhiy-storchaka Oct 30, 2019
864845a
Add tests.
serhiy-storchaka Nov 7, 2019
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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2019-10-30-11-31-47.bpo-38639.9-vKtO.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Optimized :func:`math.floor()`, :func:`math.ceil()` and :func:`math.trunc()`
for floats.
32 changes: 20 additions & 12 deletions Modules/mathmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1114,15 +1114,17 @@ math_ceil(PyObject *module, PyObject *number)
_Py_IDENTIFIER(__ceil__);
PyObject *method, *result;

method = _PyObject_LookupSpecial(number, &PyId___ceil__);
if (method == NULL) {
if (!PyFloat_CheckExact(number)) {
method = _PyObject_LookupSpecial(number, &PyId___ceil__);
if (method != NULL) {
result = _PyObject_CallNoArg(method);
Py_DECREF(method);
return result;
}
if (PyErr_Occurred())
return NULL;
return math_1_to_int(number, ceil, 0);
}
result = _PyObject_CallNoArg(method);
Py_DECREF(method);
return result;
return math_1_to_int(number, ceil, 0);
}

FUNC2(copysign, copysign,
Expand Down Expand Up @@ -1172,15 +1174,17 @@ math_floor(PyObject *module, PyObject *number)
_Py_IDENTIFIER(__floor__);
PyObject *method, *result;

method = _PyObject_LookupSpecial(number, &PyId___floor__);
if (method == NULL) {
if (!PyFloat_CheckExact(number)) {
method = _PyObject_LookupSpecial(number, &PyId___floor__);
if (method != NULL) {
result = _PyObject_CallNoArg(method);
Py_DECREF(method);
return result;
}
if (PyErr_Occurred())
return NULL;
return math_1_to_int(number, floor, 0);
}
result = _PyObject_CallNoArg(method);
Py_DECREF(method);
return result;
return math_1_to_int(number, floor, 0);
}

FUNC1A(gamma, m_tgamma,
Expand Down Expand Up @@ -2061,6 +2065,10 @@ math_trunc(PyObject *module, PyObject *x)
_Py_IDENTIFIER(__trunc__);
PyObject *trunc, *result;

if (PyFloat_CheckExact(x)) {
return PyFloat_Type.tp_as_number->nb_int(x);
}

if (Py_TYPE(x)->tp_dict == NULL) {
if (PyType_Ready(Py_TYPE(x)) < 0)
return NULL;
Expand Down