diff options
| author | Raymond Hettinger <rhettinger@users.noreply.github.com> | 2018-09-29 21:30:38 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-29 21:30:38 (GMT) |
| commit | df8101517aa1c917fdf8aeb466e480c26d4e878c (patch) | |
| tree | 5ad880fe895f2fbb0669678fcde28cd2fe8e4072 /Modules | |
| parent | e45473e3ca31e5b78dc85cab575f5bb60d5b7f8f (diff) | |
| download | cpython-df8101517aa1c917fdf8aeb466e480c26d4e878c.zip cpython-df8101517aa1c917fdf8aeb466e480c26d4e878c.tar.gz cpython-df8101517aa1c917fdf8aeb466e480c26d4e878c.tar.bz2 | |
Speed-up math.dist() by 30% (GH-9628)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/clinic/mathmodule.c.h | 7 | ||||
| -rw-r--r-- | Modules/mathmodule.c | 11 |
2 files changed, 12 insertions, 6 deletions
diff --git a/Modules/clinic/mathmodule.c.h b/Modules/clinic/mathmodule.c.h index c4d2786..b40a227 100644 --- a/Modules/clinic/mathmodule.c.h +++ b/Modules/clinic/mathmodule.c.h @@ -294,8 +294,9 @@ math_dist(PyObject *module, PyObject *const *args, Py_ssize_t nargs) PyObject *p; PyObject *q; - if (!_PyArg_ParseStack(args, nargs, "O!O!:dist", - &PyTuple_Type, &p, &PyTuple_Type, &q)) { + if (!_PyArg_UnpackStack(args, nargs, "dist", + 2, 2, + &p, &q)) { goto exit; } return_value = math_dist_impl(module, p, q); @@ -522,4 +523,4 @@ math_isclose(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject exit: return return_value; } -/*[clinic end generated code: output=d936137c1189b89b input=a9049054013a1b77]*/ +/*[clinic end generated code: output=239c51a5acefbafb input=a9049054013a1b77]*/ diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c index e872e47..e956314 100644 --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -2101,8 +2101,8 @@ vector_norm(Py_ssize_t n, double *vec, double max, int found_nan) /*[clinic input] math.dist - p: object(subclass_of='&PyTuple_Type') - q: object(subclass_of='&PyTuple_Type') + p: object + q: object / Return the Euclidean distance between two points p and q. @@ -2116,7 +2116,7 @@ Roughly equivalent to: static PyObject * math_dist_impl(PyObject *module, PyObject *p, PyObject *q) -/*[clinic end generated code: output=56bd9538d06bbcfe input=937122eaa5f19272]*/ +/*[clinic end generated code: output=56bd9538d06bbcfe input=8c83c07c7a524664]*/ { PyObject *item; double max = 0.0; @@ -2126,6 +2126,11 @@ math_dist_impl(PyObject *module, PyObject *p, PyObject *q) double diffs_on_stack[NUM_STACK_ELEMS]; double *diffs = diffs_on_stack; + if (!PyTuple_Check(p) || !PyTuple_Check(q)) { + PyErr_SetString(PyExc_TypeError, "dist argument must be a tuple"); + return NULL; + } + m = PyTuple_GET_SIZE(p); n = PyTuple_GET_SIZE(q); if (m != n) { |