Skip to content

feat: allow full tensorflow usage if available #178

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: allow full tensorflow usage if available #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99cd87e
feat: allow full tensorflow usage if available
mikejgray Jun 9, 2024
172e25b
more explicit tensorflow checks
mikejgray Nov 17, 2024
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
28 changes: 19 additions & 9 deletions openwakeword/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,16 +119,26 @@ def tflite_predict(tflite_interpreter, input_index, output_index, x):
return tflite_interpreter.get_tensor(output_index)[None, ]

except ImportError:
logging.warning("Tried to import the tflite runtime, but it was not found. "
"Trying to switching to onnxruntime instead, if appropriate models are available.")
if wakeword_models != [] and all(['.onnx' in i for i in wakeword_models]):
inference_framework = "onnx"
elif wakeword_models != [] and all([os.path.exists(i.replace('.tflite', '.onnx')) for i in wakeword_models]):
inference_framework = "onnx"
wakeword_models = [i.replace('.tflite', '.onnx') for i in wakeword_models]
from importlib.util import find_spec
if find_spec("tensorflow") is not None and find_spec("tflite_runtime") is None:
logging.warning("Tried to import the tflite runtime, but it was not found. Using tensorflow instead.")
from tensorflow.lite.python import interpreter as tflite

def tflite_predict(tflite_interpreter, input_index, output_index, x):
tflite_interpreter.set_tensor(input_index, x)
tflite_interpreter.invoke()
return tflite_interpreter.get_tensor(output_index)[None, ]
else:
raise ValueError("Tried to import the tflite runtime for provided tflite models, but it was not found. "
"Please install it using `pip install tflite-runtime`")
logging.warning("Tried to import the tflite runtime, but it was not found. "
"Trying to switching to onnxruntime instead, if appropriate models are available.")
if wakeword_models != [] and all(['.onnx' in i for i in wakeword_models]):
inference_framework = "onnx"
elif wakeword_models != [] and all([os.path.exists(i.replace('.tflite', '.onnx')) for i in wakeword_models]):
inference_framework = "onnx"
wakeword_models = [i.replace('.tflite', '.onnx') for i in wakeword_models]
else:
raise ValueError("Tried to import the tflite runtime for provided tflite models, but it was not found. "
"Please install it using `pip install tflite-runtime`")

if inference_framework == "onnx":
try:
Expand Down
10 changes: 8 additions & 2 deletions openwakeword/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,14 @@ def __init__(self,
try:
import tflite_runtime.interpreter as tflite
except ImportError:
raise ValueError("Tried to import the TFLite runtime, but it was not found."
"Please install it using `pip install tflite-runtime`")
from importlib.util import find_spec
if find_spec("tensorflow") is not None and find_spec("tflite_runtime") is None:
logging.warning("Tried to import the tflite runtime, but it was not found. Using tensorflow instead.")
from tensorflow.lite.python import interpreter as tflite
else:
raise ValueError("Tried to import the TFLite runtime, but it was not found."
"Neither was the TensorFlow interpreter."
"Please install TFLite runtime using `pip install tflite-runtime`")

if melspec_model_path == "":
melspec_model_path = os.path.join(pathlib.Path(__file__).parent.resolve(),
Expand Down
Loading