From cdb35502d835135f71b3cd5a30e1e6dd05fbbfdd Mon Sep 17 00:00:00 2001 From: "T.J. Alumbaugh" Date: Thu, 5 Sep 2019 09:04:26 -0700 Subject: [PATCH] NNAPI TransposeConv op takes tensor inputs from TFLite node PiperOrigin-RevId: 267384015 --- tensorflow/lite/delegates/nnapi/nnapi_delegate.cc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tensorflow/lite/delegates/nnapi/nnapi_delegate.cc b/tensorflow/lite/delegates/nnapi/nnapi_delegate.cc index 34c7bffe0d0..be72df3c4c5 100644 --- a/tensorflow/lite/delegates/nnapi/nnapi_delegate.cc +++ b/tensorflow/lite/delegates/nnapi/nnapi_delegate.cc @@ -1719,9 +1719,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 @@ -1780,8 +1784,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( mapping_args.node->builtin_data);