experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update hexagon delegate to check for library version

Browse Source 
PiperOrigin-RevId: 322438763
Change-Id: Ice9390e2216ec958f16f3c92713606dba66f59ac
This commit is contained in:
Karim Nosir 2020-07-21 14:10:13 -07:00 committed by TensorFlower Gardener
parent 305003dc7b
commit 89a8f8b292
1 changed files with 41 additions and 1 deletions

42
tensorflow/lite/delegates/hexagon/hexagon_delegate.cc
View File

@ -74,6 +74,39 @@ class HexagonDelegate : public SimpleDelegateInterface {
return options;
}
bool VerifyDelegate() {
auto* hexagon_nn = HexagonNNImplementation();
if (hexagon_nn == nullptr) {
return false;
}
if (hexagon_nn->hexagon_nn_version != nullptr &&
hexagon_nn->hexagon_nn_hexagon_interface_version) {
int hexagon_nn_version = -1;
int hexagon_interface_version =
hexagon_nn->hexagon_nn_hexagon_interface_version();
if (hexagon_nn->hexagon_nn_version(&hexagon_nn_version) != 0) {
TFLITE_LOG_PROD(tflite::TFLITE_LOG_WARNING,
"Failed to fetch Hexagon NN version. This might be "
"because you're using incompatible versions of "
"libhexagon_interface and libhexagon_nn_skel. "
"You must use compatible versions. "
"Refer to Tensorflow Lite Hexagon Delegate Guide.");
return false;
}
if (hexagon_nn_version != hexagon_interface_version) {
TFLITE_LOG_PROD(
tflite::TFLITE_LOG_WARNING,
"Incompatible versions between interface library and "
"libhexagon_skel %d vs %d. You must use compatible versions. "
"Refer to Tensorflow Lite Hexagon Delegate Guide.",
hexagon_interface_version, hexagon_nn_version);
return false;
}
}
return hexagon_nn->hexagon_nn_is_device_supported &&
hexagon_nn->hexagon_nn_is_device_supported();
}
private:
TfLiteHexagonDelegateOptions params_;
};
@ -83,9 +116,16 @@ class HexagonDelegate : public SimpleDelegateInterface {
TfLiteDelegate* TfLiteHexagonDelegateCreate(
const TfLiteHexagonDelegateOptions* options) {
auto hexagon_delegate_interface =
std::make_unique<tflite::HexagonDelegate>(options);
if (!hexagon_delegate_interface->VerifyDelegate()) {
TFLITE_LOG_PROD_ONCE(tflite::TFLITE_LOG_INFO,
"Hexagon Delegate is not supported.\n");
return nullptr;
}
auto* initialized_delegate =
tflite::TfLiteDelegateFactory::CreateSimpleDelegate(
std::make_unique<tflite::HexagonDelegate>(options));
std::move(hexagon_delegate_interface));
if (options->enable_dynamic_batch_size) {
initialized_delegate->flags |= kTfLiteDelegateFlagsAllowDynamicTensors;
}