diff options
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/code_generators/generate_ufunc_api.py | 41 |
1 files changed, 29 insertions, 12 deletions
diff --git a/numpy/core/code_generators/generate_ufunc_api.py b/numpy/core/code_generators/generate_ufunc_api.py index a4a6072d3..7f50f88aa 100644 --- a/numpy/core/code_generators/generate_ufunc_api.py +++ b/numpy/core/code_generators/generate_ufunc_api.py @@ -1,5 +1,11 @@ import os import genapi +import genapi2 + +import numpy_api + +from genapi2 import \ + TypeApi, GlobalVarApi, FunctionApi, BoolValuesApi h_template = r""" #ifdef _UMATHMODULE @@ -28,8 +34,6 @@ static void **PyUFunc_API=NULL; #endif #endif -#define PyUFunc_Type (*(PyTypeObject *)PyUFunc_API[0]) - %s static int @@ -68,7 +72,6 @@ c_template = r""" */ void *PyUFunc_API[] = { - (void *) &PyUFunc_Type, %s }; """ @@ -95,21 +98,35 @@ def do_generate_api(targets, sources): c_file = targets[1] doc_file = targets[2] - ufunc_api_list = genapi.get_api_functions('UFUNC_API', sources[0]) + ufunc_api_index = genapi2.merge_api_dicts(( + numpy_api.ufunc_funcs_api, + numpy_api.ufunc_types_api)) + genapi2.check_api_dict(ufunc_api_index) - # API fixes for __arrayobject_api.h + ufunc_api_list = genapi2.get_api_functions('UFUNC_API', numpy_api.ufunc_funcs_api) - fixed = 1 - nummulti = len(ufunc_api_list) - numtotal = fixed + nummulti + # Create dict name -> *Api instance + ufunc_api_dict = {} + api_name = 'PyUFunc_API' + for f in ufunc_api_list: + name = f.name + index = ufunc_api_index[name] + ufunc_api_dict[name] = FunctionApi(f.name, index, f.return_type, + f.args, api_name) + for name, index in numpy_api.ufunc_types_api.items(): + ufunc_api_dict[name] = TypeApi(name, index, 'PyTypeObject', api_name) + + # set up object API module_list = [] extension_list = [] init_list = [] - # set up object API - genapi.add_api_list(fixed, 'PyUFunc_API', ufunc_api_list, - module_list, extension_list, init_list) + for name, index in genapi2.order_dict(ufunc_api_index): + api_item = ufunc_api_dict[name] + extension_list.append(api_item.define_from_array_api_string()) + init_list.append(api_item.array_api_define()) + module_list.append(api_item.internal_define()) # Write to header fid = open(header_file, 'w') @@ -119,7 +136,7 @@ def do_generate_api(targets, sources): # Write to c-code fid = open(c_file, 'w') - s = c_template % '\n'.join(init_list) + s = c_template % ',\n'.join(init_list) fid.write(s) fid.close() |