glenn-jocher commited on
Commit
dc7e093
·
unverified ·
1 Parent(s): cba4303

Edge TPU TF imports fix (#6542)

Browse files

* Edge TPU TF imports fix

Fix for https://github.com/ultralytics/yolov5/issues/6535#issuecomment-1030631526

* Update common.py

Files changed (1) hide show
  1. models/common.py +3 -3
models/common.py CHANGED
@@ -374,11 +374,11 @@ class DetectMultiBackend(nn.Module):
374
  graph_def.ParseFromString(open(w, 'rb').read())
375
  frozen_func = wrap_frozen_graph(gd=graph_def, inputs="x:0", outputs="Identity:0")
376
  elif tflite: # https://www.tensorflow.org/lite/guide/python#install_tensorflow_lite_for_python
377
- try: # prefer tflite_runtime if installed
378
  from tflite_runtime.interpreter import Interpreter, load_delegate
379
  except ImportError:
380
- import tensorflow.lite.experimental.load_delegate as load_delegate
381
- import tensorflow.lite.Interpreter as Interpreter
382
  if 'edgetpu' in w.lower(): # Edge TPU https://coral.ai/software/#edgetpu-runtime
383
  LOGGER.info(f'Loading {w} for TensorFlow Lite Edge TPU inference...')
384
  delegate = {'Linux': 'libedgetpu.so.1',
 
374
  graph_def.ParseFromString(open(w, 'rb').read())
375
  frozen_func = wrap_frozen_graph(gd=graph_def, inputs="x:0", outputs="Identity:0")
376
  elif tflite: # https://www.tensorflow.org/lite/guide/python#install_tensorflow_lite_for_python
377
+ try: # https://coral.ai/docs/edgetpu/tflite-python/#update-existing-tf-lite-code-for-the-edge-tpu
378
  from tflite_runtime.interpreter import Interpreter, load_delegate
379
  except ImportError:
380
+ import tensorflow as tf
381
+ Interpreter, load_delegate = tf.lite.Interpreter, tf.lite.experimental.load_delegate,
382
  if 'edgetpu' in w.lower(): # Edge TPU https://coral.ai/software/#edgetpu-runtime
383
  LOGGER.info(f'Loading {w} for TensorFlow Lite Edge TPU inference...')
384
  delegate = {'Linux': 'libedgetpu.so.1',