Enable NNAPI tests
PiperOrigin-RevId: 305160089
Change-Id: I446eb5481ca6adc76e258b25d41dd8406421d74b
diff --git a/tensorflow/lite/delegates/nnapi/acceleration_test_list.cc b/tensorflow/lite/delegates/nnapi/acceleration_test_list.cc
index d00150b..a2df868 100644
--- a/tensorflow/lite/delegates/nnapi/acceleration_test_list.cc
+++ b/tensorflow/lite/delegates/nnapi/acceleration_test_list.cc
@@ -349,6 +349,7 @@
# tile_test
-TileTest/TileTest/Int64.+/.+
-TileTest/TileTest/Boolean.+/.+
+-TileTest/TileTest/String.+/.+
# Const tensor only
TileTest/TileTest/.+/0,29
diff --git a/tensorflow/lite/kernels/mul_test.cc b/tensorflow/lite/kernels/mul_test.cc
index 0fadd53..db8dca9 100644
--- a/tensorflow/lite/kernels/mul_test.cc
+++ b/tensorflow/lite/kernels/mul_test.cc
@@ -291,12 +291,6 @@
template <TensorType tensor_type, typename integer_dtype>
void NoActivationLargeMultiplier() {
- // TODO(b/138722124): Remove this after setting the appropriate op version (3)
- // for dependent tests.
- if (SingleOpModel::GetForceUseNnapi()) {
- // NNAPI doesn't currently support Mul with multiplier>1.
- return;
- }
// Intentionally pathological output range much narrower than needed
// to represent input values to exercise the multiplier>1 case.
QuantizedMulOpModel m({tensor_type, {1, 2, 2, 1}, -100, 100},
diff --git a/tensorflow/lite/kernels/tile_test.cc b/tensorflow/lite/kernels/tile_test.cc
index 5a7461a..0df1f33 100644
--- a/tensorflow/lite/kernels/tile_test.cc
+++ b/tensorflow/lite/kernels/tile_test.cc
@@ -203,10 +203,6 @@
}
TEST_P(TileTest, StringMatrix) {
- // TODO(b/138722124): Enable these tests on NNAPI.
- if (SingleOpModel::GetForceUseNnapi()) {
- return;
- }
Check<std::string>(
/*input_shape=*/{2, 3},
/*input_data=*/{"AA", "AB", "AC", "BA", "BB", "BC"},
@@ -218,10 +214,6 @@
}
TEST_P(TileTest, StringMatrix64Multipliers) {
- // TODO(b/138722124): Enable these tests on NNAPI.
- if (SingleOpModel::GetForceUseNnapi()) {
- return;
- }
Check<std::string, int64_t>(
/*input_shape=*/{2, 3},
/*input_data=*/{"AA", "AB", "AC", "BA", "BB", "BC"},
@@ -233,10 +225,6 @@
}
TEST_P(TileTest, StringMatrix2) {
- // TODO(b/138722124): Enable these tests on NNAPI.
- if (SingleOpModel::GetForceUseNnapi()) {
- return;
- }
Check<std::string>(
/*input_shape=*/{3, 2, 1},
/*input_data=*/{"AA", "AB", "AC", "BA", "BB", "BC"},
