diff options
| -rw-r--r-- | doc/source/reference/c-api.ufunc.rst | 2 | ||||
| -rw-r--r-- | doc/source/user/c-info.ufunc-tutorial.rst | 4 | ||||
| -rw-r--r-- | numpy/core/code_generators/numpy_api.py | 2 | ||||
| -rw-r--r-- | numpy/core/src/umath/struct_ufunc_test.c.src | 2 | ||||
| -rw-r--r-- | numpy/core/src/umath/test_rational.c.src | 4 | ||||
| -rw-r--r-- | numpy/core/src/umath/ufunc_object.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/doc/source/reference/c-api.ufunc.rst b/doc/source/reference/c-api.ufunc.rst index a01f32355..d4de28188 100644 --- a/doc/source/reference/c-api.ufunc.rst +++ b/doc/source/reference/c-api.ufunc.rst @@ -140,7 +140,7 @@ Functions in as *arg_types* which must be a pointer to memory at least as large as ufunc->nargs. -.. cfunction:: int PyUFunc_RegisterLoopByDescr(PyUFuncObject* ufunc, +.. cfunction:: int PyUFunc_RegisterLoopForDescr(PyUFuncObject* ufunc, PyArray_Descr* userdtype, PyUFuncGenericFunction function, PyArray_Descr** arg_dtypes, void* data) diff --git a/doc/source/user/c-info.ufunc-tutorial.rst b/doc/source/user/c-info.ufunc-tutorial.rst index 31ba7984a..d3b1deb26 100644 --- a/doc/source/user/c-info.ufunc-tutorial.rst +++ b/doc/source/user/c-info.ufunc-tutorial.rst @@ -895,7 +895,7 @@ For the example we show a trivial ufunc for adding two arrays with dtype 'u8,u8,u8'. The process is a bit different from the other examples since a call to PyUFunc_FromFuncAndData doesn't fully register ufuncs for custom dtypes and structured array dtypes. We need to also call -PyUFunc_RegisterLoopByDescr to finish setting up the ufunc. +PyUFunc_RegisterLoopForDescr to finish setting up the ufunc. We only give the C code as the setup.py file is exactly the same as the setup.py file in `Example Numpy ufunc for one dtype`_, except that @@ -1033,7 +1033,7 @@ The C file is given below. dtypes[2] = dtype; /* Register ufunc for structured dtype */ - PyUFunc_RegisterLoopByDescr(add_triplet, + PyUFunc_RegisterLoopForDescr(add_triplet, dtype, &add_uint64_triplet, dtypes, diff --git a/numpy/core/code_generators/numpy_api.py b/numpy/core/code_generators/numpy_api.py index 2354f532f..152d0f948 100644 --- a/numpy/core/code_generators/numpy_api.py +++ b/numpy/core/code_generators/numpy_api.py @@ -384,7 +384,7 @@ ufunc_funcs_api = { # End 1.6 API 'PyUFunc_DefaultTypeResolver': 39, 'PyUFunc_ValidateCasting': 40, - 'PyUFunc_RegisterLoopByDescr': 41, + 'PyUFunc_RegisterLoopForDescr': 41, } # List of all the dicts which define the C API diff --git a/numpy/core/src/umath/struct_ufunc_test.c.src b/numpy/core/src/umath/struct_ufunc_test.c.src index fe3ef0bb1..4bd24559f 100644 --- a/numpy/core/src/umath/struct_ufunc_test.c.src +++ b/numpy/core/src/umath/struct_ufunc_test.c.src @@ -106,7 +106,7 @@ PyMODINIT_FUNC initstruct_ufunc_test(void) dtypes[1] = dtype; dtypes[2] = dtype; - PyUFunc_RegisterLoopByDescr(add_triplet, + PyUFunc_RegisterLoopForDescr(add_triplet, dtype, &add_uint64_triplet, dtypes, diff --git a/numpy/core/src/umath/test_rational.c.src b/numpy/core/src/umath/test_rational.c.src index e410572aa..f9153b87c 100644 --- a/numpy/core/src/umath/test_rational.c.src +++ b/numpy/core/src/umath/test_rational.c.src @@ -1322,7 +1322,7 @@ PyMODINIT_FUNC inittest_rational(void) { PyModule_AddObject(m,"test_add",(PyObject*)ufunc); } - /* Create test ufunc with rational types using RegisterLoopByDescr */ + /* Create test ufunc with rational types using RegisterLoopForDescr */ { PyObject* ufunc = PyUFunc_FromFuncAndData(0,0,0,0,2,1, PyUFunc_None,(char*)"test_add_rationals", @@ -1333,7 +1333,7 @@ PyMODINIT_FUNC inittest_rational(void) { PyArray_Descr* types[3] = {&npyrational_descr, &npyrational_descr, &npyrational_descr}; - if (PyUFunc_RegisterLoopByDescr((PyUFuncObject*)ufunc, &npyrational_descr, + if (PyUFunc_RegisterLoopForDescr((PyUFuncObject*)ufunc, &npyrational_descr, rational_ufunc_test_add_rationals, types, 0) < 0) { goto fail; } diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c index 6e7927b89..8a028096a 100644 --- a/numpy/core/src/umath/ufunc_object.c +++ b/numpy/core/src/umath/ufunc_object.c @@ -4439,7 +4439,7 @@ _loop1d_list_free(void *ptr) */ /*UFUNC_API*/ NPY_NO_EXPORT int -PyUFunc_RegisterLoopByDescr(PyUFuncObject *ufunc, +PyUFunc_RegisterLoopForDescr(PyUFuncObject *ufunc, PyArray_Descr *user_dtype, PyUFuncGenericFunction function, PyArray_Descr **arg_dtypes, |