diff options
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/SConscript | 2 | ||||
| -rw-r--r-- | numpy/core/code_generators/genapi.py | 2 | ||||
| -rw-r--r-- | numpy/core/setup.py | 4 | ||||
| -rw-r--r-- | numpy/core/src/umath_funcs_c99.inc.src (renamed from numpy/core/src/math_c99.inc.src) | 0 | ||||
| -rw-r--r-- | numpy/core/src/umath_ufunc_object.inc (renamed from numpy/core/src/ufuncobject.c) | 0 | ||||
| -rw-r--r-- | numpy/core/src/umathmodule.c.src | 10 |
6 files changed, 9 insertions, 9 deletions
diff --git a/numpy/core/SConscript b/numpy/core/SConscript index 569c33bba..517bbfdcd 100644 --- a/numpy/core/SConscript +++ b/numpy/core/SConscript @@ -251,7 +251,7 @@ env.Append(BUILDERS = {'GenerateMultiarrayApi' : array_api_gen_bld, # Generate generated code #------------------------ scalartypes_src = env.GenerateFromTemplate(pjoin('src', 'scalartypes.inc.src')) -math_c99_src = env.GenerateFromTemplate(pjoin('src', 'math_c99.inc.src')) +math_c99_src = env.GenerateFromTemplate(pjoin('src', 'umath_funcs_c99.inc.src')) arraytypes_src = env.GenerateFromTemplate(pjoin('src', 'arraytypes.inc.src')) sortmodule_src = env.GenerateFromTemplate(pjoin('src', '_sortmodule.c.src')) umathmodule_src = env.GenerateFromTemplate(pjoin('src', 'umathmodule.c.src')) diff --git a/numpy/core/code_generators/genapi.py b/numpy/core/code_generators/genapi.py index 1d6db59d3..59789b3bb 100644 --- a/numpy/core/code_generators/genapi.py +++ b/numpy/core/code_generators/genapi.py @@ -17,7 +17,7 @@ API_FILES = ['arraymethods.c', 'arraytypes.inc.src', 'multiarraymodule.c', 'scalartypes.inc.src', - 'ufuncobject.c', + 'umath_ufunc_object.inc', 'umathmodule.c.src' ] THIS_DIR = os.path.dirname(__file__) diff --git a/numpy/core/setup.py b/numpy/core/setup.py index d249034f5..463d1dc29 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -357,9 +357,9 @@ def configuration(parent_package='',top_path=None): generate_ufunc_api, join('src','scalartypes.inc.src'), join('src','arraytypes.inc.src'), - join('src','math_c99.inc.src'), + join('src','umath_funcs_c99.inc.src'), ], - depends = [join('src','ufuncobject.c'), + depends = [join('src','umath_ufunc_object.inc'), generate_umath_py, join(codegen_dir,'generate_ufunc_api.py'), ]+deps, diff --git a/numpy/core/src/math_c99.inc.src b/numpy/core/src/umath_funcs_c99.inc.src index 828331875..828331875 100644 --- a/numpy/core/src/math_c99.inc.src +++ b/numpy/core/src/umath_funcs_c99.inc.src diff --git a/numpy/core/src/ufuncobject.c b/numpy/core/src/umath_ufunc_object.inc index 6c704b6c6..6c704b6c6 100644 --- a/numpy/core/src/ufuncobject.c +++ b/numpy/core/src/umath_ufunc_object.inc diff --git a/numpy/core/src/umathmodule.c.src b/numpy/core/src/umathmodule.c.src index b9e8b56a7..d07bffa2a 100644 --- a/numpy/core/src/umathmodule.c.src +++ b/numpy/core/src/umathmodule.c.src @@ -21,7 +21,7 @@ #define M_PI 3.14159265358979323846264338328 #endif -#include "math_c99.inc" +#include "umath_funcs_c99.inc" /* ***************************************************************************** @@ -182,9 +182,9 @@ npy_Object@Kind@(PyObject *i1, PyObject *i2) /* * Don't pass structures between functions (only pointers) because how - * structures are passed is compiler dependent and could cause - * segfaults if ufuncobject.c is compiled with a different compiler - * than an extension that makes use of the UFUNC API + * structures are passed is compiler dependent and could cause segfaults if + * umath_ufunc_object.inc is compiled with a different compiler than an + * extension that makes use of the UFUNC API */ /**begin repeat @@ -1939,7 +1939,7 @@ OBJECT_sign(char **args, intp *dimensions, intp *steps, void *NPY_UNUSED(func)) */ #include "__umath_generated.c" -#include "ufuncobject.c" +#include "umath_ufunc_object.inc" #include "__ufunc_api.c" static PyUFuncGenericFunction frexp_functions[] = { |