Fix compilation error and wrong version for relu in hexagon delegate

PiperOrigin-RevId: 303139159
Change-Id: I4abd3b23f7b01451bb292eaafc0aa00ba8866e51
This commit is contained in:
Karim Nosir 2020-03-26 10:12:54 -07:00 committed by TensorFlower Gardener
parent 09e52acd9e
commit 323d6f6073
2 changed files with 5 additions and 2 deletions

View File

@ -26,8 +26,9 @@ class MulOpModel : public SingleOpModelWithHexagon {
input1_ = AddInput(input1);
input2_ = AddInput(input2);
output_ = AddOutput(output);
SetBuiltinOp(BuiltinOperator_MUL, BuiltinOptions_MulOptions,
CreateMulOptions(builder_, activation_type).Union());
SetBuiltinOp(
BuiltinOperator_MUL, BuiltinOptions_MulOptions,
CreateMulOptions(builder_, ActivationFunctionType_NONE).Union());
BuildInterpreter({GetShape(input1_), GetShape(input2_)});
}

View File

@ -67,6 +67,8 @@ bool CheckOpVersion(const TfLiteRegistration* registration) {
case kTfLiteBuiltinDepthwiseConv2d:
case kTfLiteBuiltinSoftmax:
return registration->version <= 2;
case kTfLiteBuiltinRelu:
return registration->version >= 2;
default:
return registration->version == 1;
}