Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 12 additions & 4 deletions backends/nxp/backend/neutron_converter_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,27 @@ def __init__(
module.name
for module in pkgutil.iter_modules()
if module.name.startswith("neutron_converter")
or module.name == "eiq_neutron_sdk"
]

requested_module_name = f"neutron_converter_{neutron_converter_flavor}"
if neutron_converter_flavor:
requested_module_name = f"neutron_converter_{neutron_converter_flavor}"
logging.warning(
"The use of converter flavors will be deprecated. Use empty string to select 'eiq_neutron_sdk' module."
)
else:
requested_module_name = "eiq_neutron_sdk"

if requested_module_name not in neutron_converter_modules:
if len(neutron_converter_modules) > 0:
raise RuntimeError(
f"Neutron Converter module with flavor '{neutron_converter_flavor}' "
f"Neutron Converter module '{requested_module_name}' "
f"not found. Available modules: {neutron_converter_modules}."
)
else:
raise RuntimeError(
f"Neutron Converter module with flavor '{neutron_converter_flavor}' "
f"not found. Install 'neutron_converter_[flavor]' Python package."
f"Neutron Converter module '{requested_module_name}' "
f"not found. Install 'eiq_neutron_sdk' or 'neutron_converter_[flavor]' Python package."
)

self.neutron_converter = importlib.import_module(
Expand Down
2 changes: 1 addition & 1 deletion backends/nxp/tests/test_neutron_converter_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ def test__conv2d_neutron_conversion__invalid_flavor():
with pytest.raises(RuntimeError) as excinfo:
_ = NeutronConverterManager("bad_flavor").convert(tflite_model, "imxrt700")

assert "Neutron Converter module with flavor 'bad_flavor' not found." in str(
assert "Neutron Converter module 'neutron_converter_bad_flavor' not found." in str(
excinfo
)
Loading