Skip to content

Use TFLite Interpreter's public instead of private API to get tensor details #2204

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
merged 3 commits into from
Jul 28, 2023
Merged

Use TFLite Interpreter's public instead of private API to get tensor details #2204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3090262
Hotfix: Circumvent tf-2.12 breaking change on tflite subgraph API to …
Jul 12, 2023
bf5323f
Merge branch 'main' into tf212_hotfix
fatcat-z Jul 28, 2023
0195a76
Merge branch 'main' into tf212_hotfix
fatcat-z Jul 28, 2023
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
11 changes: 3 additions & 8 deletions tests/backend_test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
from tf2onnx.tf_loader import tf_optimize, is_tf2, get_hash_table_info
from tf2onnx.tf_utils import compress_graph_def
from tf2onnx.graph import ExternalTensorStorage
from tf2onnx.tflite.Model import Model


if is_tf2():
Expand Down Expand Up @@ -249,14 +248,10 @@ def convert_to_tflite(self, graph_def, feed_dict, outputs):

def tflite_has_supported_types(self, tflite_path):
try:
with open(tflite_path, 'rb') as f:
buf = f.read()
buf = bytearray(buf)
model = Model.GetRootAsModel(buf, 0)
tensor_cnt = model.Subgraphs(0).TensorsLength()
interpreter = tf.lite.Interpreter(tflite_path)
for i in range(tensor_cnt):
dtype = interpreter._get_tensor_details(i)['dtype'] # pylint: disable=protected-access
tensor_details = interpreter.get_tensor_details()
for tensor_detail in tensor_details:
dtype = tensor_detail.get('dtype')
if np.dtype(dtype).kind == 'O':
return False
return True
Expand Down
16 changes: 8 additions & 8 deletions tf2onnx/tflite_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,14 +196,14 @@ def read_tflite_model(tflite_path):
try:
interpreter = tf.lite.Interpreter(tflite_path)
interpreter.allocate_tensors()
tensor_cnt = model.Subgraphs(0).TensorsLength()
for i in range(tensor_cnt):
name = model.Subgraphs(0).Tensors(i).Name().decode()
details = interpreter._get_tensor_details(i) # pylint: disable=protected-access
if "shape_signature" in details:
tensor_shapes[name] = details["shape_signature"].tolist()
elif "shape" in details:
tensor_shapes[name] = details["shape"].tolist()
tensor_details = interpreter.get_tensor_details()

for tensor_detail in tensor_details:
name = tensor_detail.get('name')
if "shape_signature" in tensor_detail:
tensor_shapes[name] = tensor_detail["shape_signature"].tolist()
elif "shape" in tensor_detail:
tensor_shapes[name] = tensor_detail["shape"].tolist()
except Exception as e: # pylint: disable=broad-except
logger.warning("Error loading model into tflite interpreter: %s", e)
tflite_graphs = get_model_subgraphs(model)
Expand Down