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

Merge pull request #32253 from jdduke/cherrypicks_S6ABX

Browse Source 
[r1.15:CherryPick]NNAPI TransposeConv op takes tensor inputs from TFLite node
This commit is contained in:
Mihai Maruseac 2019-09-10 13:54:08 -07:00 committed by GitHub
commit ee99f977e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tensorflow/lite/delegates/nnapi/nnapi_delegate.cc
View File

@ -1726,9 +1726,13 @@ NNAPIDelegateKernel::MappingFn NNAPIDelegateKernel::Map(
const bool hybrid_op =
IsHybridOperator(mapping_args.context,
kTfLiteBuiltinTransposeConv, mapping_args.node);
mapping_args.builder->AddTensorInput(/*kDataInputTensor*/ 2,
hybrid_op);
mapping_args.builder->AddTensorInput(/*kWeightsTensor*/ 1, hybrid_op);
mapping_args.builder->AddTensorInput(
mapping_args.node->inputs->data[/* kDataInputTensor */ 2],
hybrid_op);
mapping_args.builder->AddTensorInput(
mapping_args.node->inputs->data[/* kWeightsTensor */ 1],
hybrid_op);
// NNAPI requires a bias tensor, so we allocate a new tensor to fill
// it with zeroes. It is deleted with other tensors in the context
@ -1787,8 +1791,9 @@ NNAPIDelegateKernel::MappingFn NNAPIDelegateKernel::Map(
/*zero_point=*/0);
}
mapping_args.builder->AddTensorInput(/*kOutputShapeTensor*/ 0,
hybrid_op);
mapping_args.builder->AddTensorInput(
mapping_args.node->inputs->data[/* kOutputShapeTensor */ 0],
hybrid_op);
auto builtin = reinterpret_cast<TfLiteTransposeConvParams*>(
mapping_args.node->builtin_data);