diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2018-08-13 08:39:50 -0700 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-08-13 08:43:40 -0700 |
| commit | 0a60da0a19aed7df4da25876e93c645f26f640c4 (patch) | |
| tree | 370bb64dc624ddedc060af84ae1e6a047417d0c8 /tensorflow/contrib/lite/nnapi_delegate.cc | |
| parent | 3a99980fcaa8e6df827df121b9b2e15d75f3ace1 (diff) | |
- Adds support for tar files in generated tests for stock Android
- Fixes breakage in tests using nnapi
PiperOrigin-RevId: 208485430
Diffstat (limited to 'tensorflow/contrib/lite/nnapi_delegate.cc')
| -rw-r--r-- | tensorflow/contrib/lite/nnapi_delegate.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tensorflow/contrib/lite/nnapi_delegate.cc b/tensorflow/contrib/lite/nnapi_delegate.cc index 3f3d3ef5d1..45c92a8671 100644 --- a/tensorflow/contrib/lite/nnapi_delegate.cc +++ b/tensorflow/contrib/lite/nnapi_delegate.cc @@ -571,8 +571,14 @@ TfLiteStatus AddOpsAndParams( nn_op_type = ANEURALNETWORKS_L2_NORMALIZATION; if (reinterpret_cast<TfLiteL2NormParams*>(node.builtin_data) ->activation != kTfLiteActNone) { - FATAL( + logError( "NNAPI does not support L2Normalization with fused activations"); + return kTfLiteError; + } + if ((node.inputs->size > 0) && + (interpreter->tensor(node.inputs->data[0])->dims->size != 4)) { + logError("NNAPI only supports input rank 4 for L2Normalization"); + return kTfLiteError; } break; case tflite::BuiltinOperator_HASHTABLE_LOOKUP: |