Skip to content

Commit 19fa289

Browse files
committed
Updated the api names and test cases
1 parent f070fe8 commit 19fa289

File tree

16 files changed

+155
-196
lines changed

16 files changed

+155
-196
lines changed

build/helper/codegen_helper.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,7 @@ def _get_library_interpreter_output_param_return_snippet(output_parameter, param
132132
val_suffix = '' if is_custom_type else '.value'
133133

134134
if output_parameter['use_array']:
135-
if output_parameter['numpy'] and output_parameter['complex_type'] is not None:
136-
snippet = 'list({}_array)'.format(output_parameter['python_name'])
137-
else:
138-
snippet = '{}_array'.format(output_parameter['python_name'])
135+
snippet = '{}_array'.format(output_parameter['python_name'])
139136
elif output_parameter['is_buffer']:
140137
if output_parameter['size']['mechanism'] == 'fixed':
141138
size = str(output_parameter['size']['value'])

build/helper/metadata_add_all.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@ def _add_complex_type(parameter):
133133

134134

135135
def _add_array_dimension(parameter):
136-
'''Adds a array_dimension parameter to the metadata for 3d arrays'''
136+
'''Adds a array_dimension parameter to the metadata for multi dimensional arrays'''
137137
if 'array_dimension' not in parameter:
138-
parameter['array_dimension'] = 0
138+
parameter['array_dimension'] = 1
139139

140140

141141
def _add_numpy_info(parameter, parameters, config):

build/templates/_library_interpreter.py.mako

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ def _get_ctypes_pointer_for_buffer(value=None, library_type=None, size=None):
5555
complex_dtype = numpy.dtype(library_type)
5656
if value.ndim > 1:
5757
# we create a flattened view of the multi-dimensional numpy array
58-
structured_array = value.reshape(-1).view(complex_dtype)
58+
restructured_array_view = value.ravel().view(complex_dtype)
5959
else:
60-
structured_array = value.view(complex_dtype)
61-
return structured_array.ctypes.data_as(ctypes.POINTER(library_type))
60+
restructured_array_view = value.view(complex_dtype)
61+
return restructured_array_view.ctypes.data_as(ctypes.POINTER(library_type))
6262
else:
6363
return numpy.ctypeslib.as_ctypes(value)
6464
% else:

build/templates/session.py/numpy_3d_array_method.py.mako

Lines changed: 0 additions & 44 deletions
This file was deleted.

build/templates/session.py/numpy_write_method.py.mako

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
raise TypeError('${parameter['python_name']} must be in C-order')
3131
if ${parameter['python_name']}.dtype is not numpy.dtype('${parameter['numpy_type']}'):
3232
raise TypeError('${parameter['python_name']} must be numpy.ndarray of dtype=${parameter['numpy_type']}, is ' + str(${parameter['python_name']}.dtype))
33+
% if parameter['array_dimension'] > 1:
34+
if ${parameter['python_name']}.ndim != ${parameter['array_dimension']}:
35+
raise TypeError('${parameter['python_name']} must be numpy.ndarray of dimension=${parameter['array_dimension']}, is ' + str(${parameter['python_name']}.ndim))
36+
% endif
3337
% endfor
3438
% for p in helper.filter_parameters(parameters, helper.ParameterUsageOptions.INTERPRETER_METHOD_CALL):
3539
% if 'python_api_converter_name' in p:

0 commit comments

Comments
 (0)