mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-04-25 08:07:41 +03:00
Only import tensorflow-lite when used as a detector
This commit is contained in:
parent
a7bbca5014
commit
27115aa3b6
@ -3,11 +3,6 @@ import os
|
|||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
|
|
||||||
try:
|
|
||||||
from tflite_runtime.interpreter import Interpreter, load_delegate
|
|
||||||
except ModuleNotFoundError:
|
|
||||||
from tensorflow.lite.python.interpreter import Interpreter, load_delegate
|
|
||||||
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -50,6 +45,11 @@ def tflite_detect_raw(self, tensor_input):
|
|||||||
def tflite_load_delegate_interpreter(
|
def tflite_load_delegate_interpreter(
|
||||||
delegate_library: str, detector_config, device_config
|
delegate_library: str, detector_config, device_config
|
||||||
):
|
):
|
||||||
|
try:
|
||||||
|
from tflite_runtime.interpreter import Interpreter, load_delegate
|
||||||
|
except ModuleNotFoundError:
|
||||||
|
from tensorflow.lite.python.interpreter import Interpreter, load_delegate
|
||||||
|
|
||||||
try:
|
try:
|
||||||
logger.info("Attempting to load NPU")
|
logger.info("Attempting to load NPU")
|
||||||
tf_delegate = load_delegate(delegate_library, device_config)
|
tf_delegate = load_delegate(delegate_library, device_config)
|
||||||
|
|||||||
@ -9,11 +9,6 @@ from frigate.log import redirect_output_to_logger
|
|||||||
|
|
||||||
from ..detector_utils import tflite_detect_raw, tflite_init
|
from ..detector_utils import tflite_detect_raw, tflite_init
|
||||||
|
|
||||||
try:
|
|
||||||
from tflite_runtime.interpreter import Interpreter
|
|
||||||
except ModuleNotFoundError:
|
|
||||||
from tensorflow.lite.python.interpreter import Interpreter
|
|
||||||
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -30,6 +25,12 @@ class CpuTfl(DetectionApi):
|
|||||||
|
|
||||||
@redirect_output_to_logger(logger, logging.DEBUG)
|
@redirect_output_to_logger(logger, logging.DEBUG)
|
||||||
def __init__(self, detector_config: CpuDetectorConfig):
|
def __init__(self, detector_config: CpuDetectorConfig):
|
||||||
|
# Import TensorFlow Lite only when this detector is actually used
|
||||||
|
try:
|
||||||
|
from tflite_runtime.interpreter import Interpreter
|
||||||
|
except ModuleNotFoundError:
|
||||||
|
from tensorflow.lite.python.interpreter import Interpreter
|
||||||
|
|
||||||
interpreter = Interpreter(
|
interpreter = Interpreter(
|
||||||
model_path=detector_config.model.path,
|
model_path=detector_config.model.path,
|
||||||
num_threads=detector_config.num_threads or 3,
|
num_threads=detector_config.num_threads or 3,
|
||||||
|
|||||||
@ -8,12 +8,6 @@ from typing_extensions import Literal
|
|||||||
from frigate.detectors.detection_api import DetectionApi
|
from frigate.detectors.detection_api import DetectionApi
|
||||||
from frigate.detectors.detector_config import BaseDetectorConfig
|
from frigate.detectors.detector_config import BaseDetectorConfig
|
||||||
|
|
||||||
try:
|
|
||||||
from tflite_runtime.interpreter import Interpreter, load_delegate
|
|
||||||
except ModuleNotFoundError:
|
|
||||||
from tensorflow.lite.python.interpreter import Interpreter, load_delegate
|
|
||||||
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
DETECTOR_KEY = "edgetpu"
|
DETECTOR_KEY = "edgetpu"
|
||||||
@ -28,6 +22,12 @@ class EdgeTpuTfl(DetectionApi):
|
|||||||
type_key = DETECTOR_KEY
|
type_key = DETECTOR_KEY
|
||||||
|
|
||||||
def __init__(self, detector_config: EdgeTpuDetectorConfig):
|
def __init__(self, detector_config: EdgeTpuDetectorConfig):
|
||||||
|
# Import TensorFlow Lite only when this detector is actually used
|
||||||
|
try:
|
||||||
|
from tflite_runtime.interpreter import Interpreter, load_delegate
|
||||||
|
except ModuleNotFoundError:
|
||||||
|
from tensorflow.lite.python.interpreter import Interpreter, load_delegate
|
||||||
|
|
||||||
device_config = {}
|
device_config = {}
|
||||||
if detector_config.device is not None:
|
if detector_config.device is not None:
|
||||||
device_config = {"device": detector_config.device}
|
device_config = {"device": detector_config.device}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user