Skip to content

Complex numbers updates for nifake and nirfsg #2131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcoskirsch merged 10 commits into from
Sep 16, 2025
Merged

Complex numbers updates for nifake and nirfsg #2131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
550f01b
Matching the Azdo generated metadata for nifake
rahulr-NI Sep 4, 2025
1af4ab6
Updated metadata from AzDo
rahulr-NI Sep 11, 2025
f1879fd
Revert "Updated metadata from AzDo"
rahulr-NI Sep 11, 2025
4d3bfe4
Files generated from nirfsg AzDo exports
rahulr-NI Sep 11, 2025
7c50184
Matching the NiRFSG Metadata
rahulr-NI Sep 11, 2025
39f04a7
Making Changes Specific to Complex Changes
rahulr-NI Sep 11, 2025
02b200b
Revert "Making Changes Specific to Complex Changes"
rahulr-NI Sep 11, 2025
096e3b3
Revert "Revert "Making Changes Specific to Complex Changes""
rahulr-NI Sep 11, 2025
2bddbb8
Updating the generated session file
rahulr-NI Sep 11, 2025
b978a13
Minor fix in sparameter table parameter in metadata
rahulr-NI Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build/helper/codegen_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ def get_ctype_variable_declaration_snippet(parameter, parameters, ivi_dance_step
module_name = '_visatype'

# Use _complextype.py file for complex parameter
if parameter['complex_type'] is not None:
if parameter.get('complex_array_representation') is not None:
module_name = '_complextype'

if parameter['is_string'] is True:
Expand Down Expand Up @@ -368,7 +368,7 @@ def _get_ctype_variable_definition_snippet_for_scalar(parameter, parameters, ivi
# Parameter denotes the size of another (the "corresponding") parameter.
# Interleaved array length is going to be double the length of number of samples.
# This is used for complex waveforms, where the real and imaginary parts are interleaved in the array.
if corresponding_buffer_parameters[0]['complex_type'] == 'interleaved':
if corresponding_buffer_parameters[0].get('complex_array_representation') == 'interleaved_real_number_array':
definitions.append(parameter['ctypes_variable_name'] + ' = {0}.{1}(0 if {2} is None else len({2}) // 2) # case S160'.format(module_name, parameter['ctypes_type'], corresponding_buffer_parameters[0]['python_name']))
else:
definitions.append(parameter['ctypes_variable_name'] + ' = {0}.{1}(0 if {2} is None else len({2})) # case S160'.format(module_name, parameter['ctypes_type'], corresponding_buffer_parameters[0]['python_name']))
Expand Down Expand Up @@ -435,7 +435,7 @@ def _get_ctype_variable_definition_snippet_for_buffers(parameter, parameters, iv
definition = None

if parameter['numpy'] is True and use_numpy_array is True:
if parameter['complex_type'] is None:
if parameter.get('complex_array_representation') is None:
definition = '_get_ctypes_pointer_for_buffer(value={}) # case B510'.format(parameter['python_name'])
else:
definition = '_get_ctypes_pointer_for_buffer(value={}, library_type={}.{}) # case B510'.format(parameter['python_name'], module_name, parameter['ctypes_type'])
Expand Down
10 changes: 5 additions & 5 deletions build/helper/metadata_add_all.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@ def _add_ctypes_type(parameter, config):
parameter['ctypes_type_library_call'] = module_name + parameter['ctypes_type']


def _add_complex_type(parameter):
'''Adds a complex_type parameter to the metadata for complex numbers'''
if 'complex_type' not in parameter:
parameter['complex_type'] = None
def _add_complex_array_representation(parameter):
'''Adds a complex_array_representation parameter to the metadata for complex numbers'''
if 'complex_array_representation' not in parameter:
parameter['complex_array_representation'] = None


def _add_array_dimension(parameter):
Expand Down Expand Up @@ -462,7 +462,7 @@ def add_all_function_metadata(functions, config):
_add_python_type(p, config)
_add_ctypes_variable_name(p)
_add_ctypes_type(p, config)
_add_complex_type(p)
_add_complex_array_representation(p)
_add_array_dimension(p)
_add_numpy_info(p, functions[f]['parameters'], config)
_add_default_value_name(p)
Expand Down
44 changes: 22 additions & 22 deletions build/helper/metadata_filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'fixed, passed-in, len',
'python_api_list': True,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.SESSION_METHOD_PASSTHROUGH_CALL: {
'skip_session_handle': True,
Expand All @@ -34,7 +34,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'fixed, passed-in, len',
'python_api_list': True,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.SESSION_NUMPY_INTO_METHOD_DECLARATION: {
'skip_session_handle': True,
Expand All @@ -49,7 +49,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'fixed, passed-in',
'python_api_list': False,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.INTERPRETER_NUMPY_INTO_METHOD_DECLARATION: {
'skip_session_handle': True,
Expand All @@ -64,7 +64,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'fixed, passed-in',
'python_api_list': False,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.SESSION_METHOD_CALL: {
'skip_session_handle': True,
Expand All @@ -79,7 +79,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'fixed, passed-in',
'python_api_list': True,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.DOCUMENTATION_SESSION_METHOD: {
'skip_session_handle': True,
Expand All @@ -94,7 +94,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'any',
'python_api_list': True,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.LIBRARY_METHOD_DECLARATION: {
'skip_session_handle': False,
Expand All @@ -109,7 +109,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'any',
'python_api_list': True,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.LIBRARY_METHOD_CALL: {
'skip_session_handle': False,
Expand All @@ -124,7 +124,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'any',
'python_api_list': True,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.GRPC_REQUEST_PARAMETERS: {
'skip_session_handle': False,
Expand All @@ -139,7 +139,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'any',
'python_api_list': True,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.CTYPES_ARGTYPES: {
'skip_session_handle': False,
Expand All @@ -154,7 +154,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'any',
'python_api_list': True,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.INTERPRETER_METHOD_DECLARATION: {
'skip_session_handle': True,
Expand All @@ -169,7 +169,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'fixed, passed-in, len',
'python_api_list': True,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.INPUT_PARAMETERS: {
'skip_session_handle': True,
Expand All @@ -184,7 +184,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'any',
'python_api_list': True,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.LIBRARY_OUTPUT_PARAMETERS: {
'skip_session_handle': True,
Expand All @@ -199,7 +199,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'any',
'python_api_list': True,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.API_OUTPUT_PARAMETERS: {
'skip_session_handle': True,
Expand All @@ -214,7 +214,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'any',
'python_api_list': False,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.API_NUMPY_OUTPUT_PARAMETERS: {
'skip_session_handle': True,
Expand All @@ -229,7 +229,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'any',
'python_api_list': False,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.GRPC_OUTPUT_PARAMETERS: {
'skip_session_handle': True,
Expand All @@ -244,7 +244,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'any',
'python_api_list': False,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.NUMPY_PARAMETERS: {
'skip_session_handle': True,
Expand All @@ -259,7 +259,7 @@
'skip_all_except_numpy_parameters': True,
'mechanism': 'any',
'python_api_list': True,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.IVI_DANCE_PARAMETER: {
'skip_session_handle': True,
Expand All @@ -274,7 +274,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'ivi-dance, ivi-dance-with-a-twist',
'python_api_list': True,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.LEN_PARAMETER: {
'skip_session_handle': True,
Expand All @@ -289,7 +289,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'len',
'python_api_list': True,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.INPUT_ENUM_PARAMETERS: {
'skip_session_handle': True,
Expand All @@ -304,7 +304,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'any',
'python_api_list': True,
'skip_all_except_complex_type_parameters': False,
'skip_all_except_complex_array_representation_parameters': False,
},
ParameterUsageOptions.COMPLEX_NUMBER_PARAMETERS: {
'skip_session_handle': True,
Expand All @@ -319,7 +319,7 @@
'skip_all_except_numpy_parameters': False,
'mechanism': 'any',
'python_api_list': True,
'skip_all_except_complex_type_parameters': True,
'skip_all_except_complex_array_representation_parameters': True,
},
}

Expand Down Expand Up @@ -384,7 +384,7 @@ def filter_parameters(parameters, parameter_usage_options):
skip = False
if not options_to_use['python_api_list'] and not x['use_in_python_api']:
skip = True
if options_to_use['skip_all_except_complex_type_parameters'] and x['complex_type'] is None:
if options_to_use['skip_all_except_complex_array_representation_parameters'] and x['complex_array_representation'] is None:
skip = True
if not skip:
parameters_to_use.append(x)
Expand Down
Loading