Imported Upstream version 1.4.0upstream/1.4.0 submit/tizen/20200423.054851

author: Chunseok Lee <chunseok.lee@samsung.com> 2020-04-23 14:45:49 +0900
committer: Chunseok Lee <chunseok.lee@samsung.com> 2020-04-23 14:45:49 +0900
commit: e2ef8438a24f7c56a0744eb579a6e293ee2fbf8e (patch)
tree: 44a1a7951d168dd4370e13593ed03f4bc6d920c5 /tests/nnapi/specs/skip
parent: 302e6564a7a76109e1178207e44e45a58631c477 (diff)
download: nnfw-e2ef8438a24f7c56a0744eb579a6e293ee2fbf8e.tar.gz
nnfw-e2ef8438a24f7c56a0744eb579a6e293ee2fbf8e.tar.bz2
nnfw-e2ef8438a24f7c56a0744eb579a6e293ee2fbf8e.zip
287 files changed, 0 insertions, 1889 deletions
diff --git a/tests/nnapi/specs/skip/V1_0/mobilenet_224_gender_basic_fixed.mod.py b/tests/nnapi/specs/skip/V1_0/mobilenet_224_gender_basic_fixed.mod.py
index 6861b0a86..6861b0a86 100644..100755
--- a/tests/nnapi/specs/skip/V1_0/mobilenet_224_gender_basic_fixed.mod.py
+++ b/tests/nnapi/specs/skip/V1_0/mobilenet_224_gender_basic_fixed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_0/mobilenet_quantized.mod.py b/tests/nnapi/specs/skip/V1_0/mobilenet_quantized.mod.py
index 20223e292..20223e292 100644..100755
--- a/tests/nnapi/specs/skip/V1_0/mobilenet_quantized.mod.py
+++ b/tests/nnapi/specs/skip/V1_0/mobilenet_quantized.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/add_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/add_relaxed.mod.py
index cf2d69eb4..cf2d69eb4 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/add_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/add_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/avg_pool_float_1_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/avg_pool_float_1_relaxed.mod.py
index 5b421e730..5b421e730 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/avg_pool_float_1_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/avg_pool_float_1_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/avg_pool_float_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/avg_pool_float_2_relaxed.mod.py
index b94c37e2e..b94c37e2e 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/avg_pool_float_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/avg_pool_float_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/avg_pool_float_3_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/avg_pool_float_3_relaxed.mod.py
index 30dc18488..30dc18488 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/avg_pool_float_3_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/avg_pool_float_3_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/avg_pool_float_4_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/avg_pool_float_4_relaxed.mod.py
index 3ca5ca9a3..3ca5ca9a3 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/avg_pool_float_4_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/avg_pool_float_4_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/avg_pool_float_5_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/avg_pool_float_5_relaxed.mod.py
index 9386c7644..9386c7644 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/avg_pool_float_5_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/avg_pool_float_5_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/batch_to_space_float_1_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/batch_to_space_float_1_relaxed.mod.py
index 716420304..716420304 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/batch_to_space_float_1_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/batch_to_space_float_1_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/batch_to_space_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/batch_to_space_relaxed.mod.py
index 3836e7b91..3836e7b91 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/batch_to_space_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/batch_to_space_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/concat_float_1_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/concat_float_1_relaxed.mod.py
index cd4187cd3..cd4187cd3 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/concat_float_1_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/concat_float_1_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/concat_float_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/concat_float_2_relaxed.mod.py
index 634f4bbe2..634f4bbe2 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/concat_float_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/concat_float_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/concat_float_3_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/concat_float_3_relaxed.mod.py
index df3d894d6..df3d894d6 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/concat_float_3_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/concat_float_3_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/conv_1_h3_w2_SAME_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/conv_1_h3_w2_SAME_relaxed.mod.py
index 785572fae..785572fae 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/conv_1_h3_w2_SAME_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/conv_1_h3_w2_SAME_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/conv_1_h3_w2_VALID_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/conv_1_h3_w2_VALID_relaxed.mod.py
index 51fcf0a15..51fcf0a15 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/conv_1_h3_w2_VALID_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/conv_1_h3_w2_VALID_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/conv_3_h3_w2_SAME_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/conv_3_h3_w2_SAME_relaxed.mod.py
index d6326e4b6..d6326e4b6 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/conv_3_h3_w2_SAME_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/conv_3_h3_w2_SAME_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/conv_3_h3_w2_VALID_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/conv_3_h3_w2_VALID_relaxed.mod.py
index 2e0905612..2e0905612 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/conv_3_h3_w2_VALID_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/conv_3_h3_w2_VALID_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/conv_float_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/conv_float_2_relaxed.mod.py
index a49f001b0..a49f001b0 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/conv_float_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/conv_float_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/conv_float_channels_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/conv_float_channels_relaxed.mod.py
index 0788be529..0788be529 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/conv_float_channels_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/conv_float_channels_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/conv_float_channels_weights_as_inputs_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/conv_float_channels_weights_as_inputs_relaxed.mod.py
index 0659bfed1..0659bfed1 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/conv_float_channels_weights_as_inputs_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/conv_float_channels_weights_as_inputs_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/conv_float_large_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/conv_float_large_relaxed.mod.py
index 75e7297ee..75e7297ee 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/conv_float_large_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/conv_float_large_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/conv_float_large_weights_as_inputs_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/conv_float_large_weights_as_inputs_relaxed.mod.py
index 2cd233cdf..2cd233cdf 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/conv_float_large_weights_as_inputs_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/conv_float_large_weights_as_inputs_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/conv_float_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/conv_float_relaxed.mod.py
index 696cb8c00..696cb8c00 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/conv_float_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/conv_float_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/conv_float_weights_as_inputs_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/conv_float_weights_as_inputs_relaxed.mod.py
index 943f1b45b..943f1b45b 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/conv_float_weights_as_inputs_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/conv_float_weights_as_inputs_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/depth_to_space_float_1_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/depth_to_space_float_1_relaxed.mod.py
index 59acac575..59acac575 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/depth_to_space_float_1_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/depth_to_space_float_1_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/depth_to_space_float_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/depth_to_space_float_2_relaxed.mod.py
index 4751b0b98..4751b0b98 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/depth_to_space_float_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/depth_to_space_float_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/depth_to_space_float_3_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/depth_to_space_float_3_relaxed.mod.py
index d0c0f182a..d0c0f182a 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/depth_to_space_float_3_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/depth_to_space_float_3_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_2_relaxed.mod.py
index b38c0765d..b38c0765d 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_large_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_large_2_relaxed.mod.py
index a878b6029..a878b6029 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_large_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_large_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_large_2_weights_as_inputs_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_large_2_weights_as_inputs_relaxed.mod.py
index 26d1f09bc..26d1f09bc 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_large_2_weights_as_inputs_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_large_2_weights_as_inputs_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_large_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_large_relaxed.mod.py
index c2394bc0f..c2394bc0f 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_large_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_large_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_large_weights_as_inputs_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_large_weights_as_inputs_relaxed.mod.py
index 6c1e647d1..6c1e647d1 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_large_weights_as_inputs_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_large_weights_as_inputs_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_relaxed.mod.py
index cd71a108e..cd71a108e 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_weights_as_inputs_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_weights_as_inputs_relaxed.mod.py
index 404a28cfc..404a28cfc 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_weights_as_inputs_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/depthwise_conv2d_float_weights_as_inputs_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/depthwise_conv_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/depthwise_conv_relaxed.mod.py
index 2f0300eef..2f0300eef 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/depthwise_conv_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/depthwise_conv_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/dequantize_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/dequantize_relaxed.mod.py
index b960627d2..b960627d2 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/dequantize_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/dequantize_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/div_broadcast_float_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/div_broadcast_float_relaxed.mod.py
index e6f033eae..e6f033eae 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/div_broadcast_float_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/div_broadcast_float_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/div_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/div_relaxed.mod.py
index 38ba17f9f..38ba17f9f 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/div_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/div_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/embedding_lookup_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/embedding_lookup_relaxed.mod.py
index cfb4333dc..cfb4333dc 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/embedding_lookup_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/embedding_lookup_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/floor_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/floor_relaxed.mod.py
index 3c1ee48ef..3c1ee48ef 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/floor_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/floor_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/fully_connected_float_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/fully_connected_float_2_relaxed.mod.py
index b3ce6e5f9..b3ce6e5f9 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/fully_connected_float_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/fully_connected_float_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/fully_connected_float_4d_simple_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/fully_connected_float_4d_simple_relaxed.mod.py
index 2338c0bed..2338c0bed 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/fully_connected_float_4d_simple_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/fully_connected_float_4d_simple_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/fully_connected_float_large_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/fully_connected_float_large_relaxed.mod.py
index e170f68ed..e170f68ed 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/fully_connected_float_large_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/fully_connected_float_large_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/fully_connected_float_large_weights_as_inputs_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/fully_connected_float_large_weights_as_inputs_relaxed.mod.py
index 01f71ba29..01f71ba29 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/fully_connected_float_large_weights_as_inputs_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/fully_connected_float_large_weights_as_inputs_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/fully_connected_float_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/fully_connected_float_relaxed.mod.py
index acee27f5b..acee27f5b 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/fully_connected_float_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/fully_connected_float_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/fully_connected_float_weights_as_inputs_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/fully_connected_float_weights_as_inputs_relaxed.mod.py
index a6f61753d..a6f61753d 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/fully_connected_float_weights_as_inputs_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/fully_connected_float_weights_as_inputs_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/hashtable_lookup_float_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/hashtable_lookup_float_relaxed.mod.py
index e2c1a6d4b..e2c1a6d4b 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/hashtable_lookup_float_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/hashtable_lookup_float_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/l2_normalization_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/l2_normalization_2_relaxed.mod.py
index 54e57d18d..54e57d18d 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/l2_normalization_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/l2_normalization_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/l2_normalization_large_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/l2_normalization_large_relaxed.mod.py
index ad55690f1..ad55690f1 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/l2_normalization_large_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/l2_normalization_large_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/l2_normalization_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/l2_normalization_relaxed.mod.py
index c2f6ed061..c2f6ed061 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/l2_normalization_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/l2_normalization_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/l2_pool_float_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/l2_pool_float_2_relaxed.mod.py
index bd76e3aff..bd76e3aff 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/l2_pool_float_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/l2_pool_float_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/l2_pool_float_large_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/l2_pool_float_large_relaxed.mod.py
index 41afbe461..41afbe461 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/l2_pool_float_large_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/l2_pool_float_large_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/l2_pool_float_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/l2_pool_float_relaxed.mod.py
index 72ca4cc47..72ca4cc47 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/l2_pool_float_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/l2_pool_float_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/local_response_norm_float_1_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/local_response_norm_float_1_relaxed.mod.py
index 8be180150..8be180150 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/local_response_norm_float_1_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/local_response_norm_float_1_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/local_response_norm_float_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/local_response_norm_float_2_relaxed.mod.py
index 5ecc929f7..5ecc929f7 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/local_response_norm_float_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/local_response_norm_float_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/local_response_norm_float_3_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/local_response_norm_float_3_relaxed.mod.py
index 38e5f4b32..38e5f4b32 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/local_response_norm_float_3_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/local_response_norm_float_3_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/local_response_norm_float_4_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/local_response_norm_float_4_relaxed.mod.py
index e8de8affa..e8de8affa 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/local_response_norm_float_4_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/local_response_norm_float_4_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/logistic_float_1_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/logistic_float_1_relaxed.mod.py
index 926f652ed..926f652ed 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/logistic_float_1_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/logistic_float_1_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/logistic_float_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/logistic_float_2_relaxed.mod.py
index c01913173..c01913173 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/logistic_float_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/logistic_float_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/lsh_projection_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/lsh_projection_2_relaxed.mod.py
index 6608b0666..6608b0666 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/lsh_projection_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/lsh_projection_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/lsh_projection_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/lsh_projection_relaxed.mod.py
index 9a1bfaca2..9a1bfaca2 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/lsh_projection_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/lsh_projection_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/lsh_projection_weights_as_inputs_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/lsh_projection_weights_as_inputs_relaxed.mod.py
index de3dddc59..de3dddc59 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/lsh_projection_weights_as_inputs_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/lsh_projection_weights_as_inputs_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/lstm2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/lstm2_relaxed.mod.py
index 4a76a6cac..4a76a6cac 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/lstm2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/lstm2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/lstm2_state2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/lstm2_state2_relaxed.mod.py
index a69f9308c..a69f9308c 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/lstm2_state2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/lstm2_state2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/lstm2_state_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/lstm2_state_relaxed.mod.py
index d68717076..d68717076 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/lstm2_state_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/lstm2_state_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/lstm3_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/lstm3_relaxed.mod.py
index b8244518e..b8244518e 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/lstm3_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/lstm3_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/lstm3_state2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/lstm3_state2_relaxed.mod.py
index c99043f75..c99043f75 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/lstm3_state2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/lstm3_state2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/lstm3_state3_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/lstm3_state3_relaxed.mod.py
index f9a42cbde..f9a42cbde 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/lstm3_state3_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/lstm3_state3_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/lstm3_state_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/lstm3_state_relaxed.mod.py
index b9c3adb84..b9c3adb84 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/lstm3_state_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/lstm3_state_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/lstm_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/lstm_relaxed.mod.py
index 1bbfdd9ec..1bbfdd9ec 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/lstm_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/lstm_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/lstm_state2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/lstm_state2_relaxed.mod.py
index b912d18ce..b912d18ce 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/lstm_state2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/lstm_state2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/lstm_state_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/lstm_state_relaxed.mod.py
index e86881fd4..e86881fd4 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/lstm_state_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/lstm_state_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/max_pool_float_1_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/max_pool_float_1_relaxed.mod.py
index 198611f1c..198611f1c 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/max_pool_float_1_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/max_pool_float_1_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/max_pool_float_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/max_pool_float_2_relaxed.mod.py
index 45a2a13ab..45a2a13ab 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/max_pool_float_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/max_pool_float_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/max_pool_float_3_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/max_pool_float_3_relaxed.mod.py
index 2b0801b36..2b0801b36 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/max_pool_float_3_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/max_pool_float_3_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/max_pool_float_4_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/max_pool_float_4_relaxed.mod.py
index 7753b3118..7753b3118 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/max_pool_float_4_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/max_pool_float_4_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/mean_float_1_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/mean_float_1_relaxed.mod.py
index e78f51701..e78f51701 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/mean_float_1_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/mean_float_1_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/mean_float_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/mean_float_2_relaxed.mod.py
index be2212ff2..be2212ff2 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/mean_float_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/mean_float_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/mean_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/mean_relaxed.mod.py
index ae337acdd..ae337acdd 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/mean_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/mean_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/mobilenet_224_gender_basic_fixed_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/mobilenet_224_gender_basic_fixed_relaxed.mod.py
index 04fbabfee..04fbabfee 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/mobilenet_224_gender_basic_fixed_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/mobilenet_224_gender_basic_fixed_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/mul_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/mul_relaxed.mod.py
index 3e708b8fe..3e708b8fe 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/mul_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/mul_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/mul_relu_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/mul_relu_relaxed.mod.py
index 160589852..160589852 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/mul_relu_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/mul_relu_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/pad_float_1_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/pad_float_1_relaxed.mod.py
index 8664f64e7..8664f64e7 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/pad_float_1_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/pad_float_1_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/pad_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/pad_relaxed.mod.py
index 2587615d3..2587615d3 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/pad_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/pad_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/relu1_float_1_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/relu1_float_1_relaxed.mod.py
index 875f07fe5..875f07fe5 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/relu1_float_1_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/relu1_float_1_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/relu1_float_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/relu1_float_2_relaxed.mod.py
index 52f760397..52f760397 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/relu1_float_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/relu1_float_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/relu6_float_1_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/relu6_float_1_relaxed.mod.py
index e5f717986..e5f717986 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/relu6_float_1_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/relu6_float_1_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/relu6_float_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/relu6_float_2_relaxed.mod.py
index 25789393e..25789393e 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/relu6_float_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/relu6_float_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/relu_float_1_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/relu_float_1_relaxed.mod.py
index 8c5c103ee..8c5c103ee 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/relu_float_1_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/relu_float_1_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/relu_float_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/relu_float_2_relaxed.mod.py
index acc5aecd5..acc5aecd5 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/relu_float_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/relu_float_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/reshape_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/reshape_relaxed.mod.py
index 16bda4791..16bda4791 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/reshape_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/reshape_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/reshape_weights_as_inputs_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/reshape_weights_as_inputs_relaxed.mod.py
index c265b4c4a..c265b4c4a 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/reshape_weights_as_inputs_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/reshape_weights_as_inputs_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/resize_bilinear_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/resize_bilinear_2_relaxed.mod.py
index 06ccbeb66..06ccbeb66 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/resize_bilinear_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/resize_bilinear_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/resize_bilinear_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/resize_bilinear_relaxed.mod.py
index b059be248..b059be248 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/resize_bilinear_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/resize_bilinear_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/rnn_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/rnn_relaxed.mod.py
index bc58851d3..bc58851d3 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/rnn_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/rnn_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/rnn_state_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/rnn_state_relaxed.mod.py
index 489e5bfc5..489e5bfc5 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/rnn_state_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/rnn_state_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/softmax_float_1_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/softmax_float_1_relaxed.mod.py
index 897ea54d4..897ea54d4 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/softmax_float_1_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/softmax_float_1_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/softmax_float_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/softmax_float_2_relaxed.mod.py
index 60a6f4bdb..60a6f4bdb 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/softmax_float_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/softmax_float_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/space_to_batch_float_1_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/space_to_batch_float_1_relaxed.mod.py
index de856675d..de856675d 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/space_to_batch_float_1_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/space_to_batch_float_1_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/space_to_batch_float_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/space_to_batch_float_2_relaxed.mod.py
index 610e34e90..610e34e90 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/space_to_batch_float_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/space_to_batch_float_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/space_to_batch_float_3_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/space_to_batch_float_3_relaxed.mod.py
index 99c892cc6..99c892cc6 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/space_to_batch_float_3_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/space_to_batch_float_3_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/space_to_batch_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/space_to_batch_relaxed.mod.py
index 0924ae263..0924ae263 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/space_to_batch_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/space_to_batch_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/space_to_depth_float_1_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/space_to_depth_float_1_relaxed.mod.py
index f1b881baf..f1b881baf 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/space_to_depth_float_1_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/space_to_depth_float_1_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/space_to_depth_float_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/space_to_depth_float_2_relaxed.mod.py
index c772cb2fc..c772cb2fc 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/space_to_depth_float_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/space_to_depth_float_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/space_to_depth_float_3_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/space_to_depth_float_3_relaxed.mod.py
index 6315ff1ae..6315ff1ae 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/space_to_depth_float_3_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/space_to_depth_float_3_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/squeeze_float_1_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/squeeze_float_1_relaxed.mod.py
index e34e81bf2..e34e81bf2 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/squeeze_float_1_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/squeeze_float_1_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/squeeze_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/squeeze_relaxed.mod.py
index 4338c79b6..4338c79b6 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/squeeze_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/squeeze_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/strided_slice_float_10_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/strided_slice_float_10_relaxed.mod.py
index 2aee51373..2aee51373 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/strided_slice_float_10_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/strided_slice_float_10_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/strided_slice_float_11_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/strided_slice_float_11_relaxed.mod.py
index b88007ebe..b88007ebe 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/strided_slice_float_11_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/strided_slice_float_11_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/strided_slice_float_1_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/strided_slice_float_1_relaxed.mod.py
index e80187aff..e80187aff 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/strided_slice_float_1_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/strided_slice_float_1_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/strided_slice_float_2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/strided_slice_float_2_relaxed.mod.py
index a1e3ad47b..a1e3ad47b 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/strided_slice_float_2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/strided_slice_float_2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/strided_slice_float_3_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/strided_slice_float_3_relaxed.mod.py
index 8696a8b95..8696a8b95 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/strided_slice_float_3_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/strided_slice_float_3_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/strided_slice_float_4_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/strided_slice_float_4_relaxed.mod.py
index 68a574597..68a574597 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/strided_slice_float_4_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/strided_slice_float_4_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/strided_slice_float_5_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/strided_slice_float_5_relaxed.mod.py
index dda4e7df4..dda4e7df4 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/strided_slice_float_5_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/strided_slice_float_5_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/strided_slice_float_6_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/strided_slice_float_6_relaxed.mod.py
index f5bb39ddb..f5bb39ddb 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/strided_slice_float_6_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/strided_slice_float_6_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/strided_slice_float_7_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/strided_slice_float_7_relaxed.mod.py
index 7b5aae4e7..7b5aae4e7 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/strided_slice_float_7_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/strided_slice_float_7_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/strided_slice_float_8_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/strided_slice_float_8_relaxed.mod.py
index 22ce230a5..22ce230a5 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/strided_slice_float_8_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/strided_slice_float_8_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/strided_slice_float_9_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/strided_slice_float_9_relaxed.mod.py
index 1fe5368ee..1fe5368ee 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/strided_slice_float_9_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/strided_slice_float_9_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/strided_slice_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/strided_slice_relaxed.mod.py
index 271c399b0..271c399b0 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/strided_slice_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/strided_slice_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/sub_broadcast_float_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/sub_broadcast_float_relaxed.mod.py
index 7c009dc02..7c009dc02 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/sub_broadcast_float_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/sub_broadcast_float_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/sub_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/sub_relaxed.mod.py
index 14bdd564a..14bdd564a 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/sub_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/sub_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/svdf2_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/svdf2_relaxed.mod.py
index 45aca84fb..45aca84fb 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/svdf2_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/svdf2_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/svdf_bias_present_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/svdf_bias_present_relaxed.mod.py
index 7bff43502..7bff43502 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/svdf_bias_present_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/svdf_bias_present_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/svdf_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/svdf_relaxed.mod.py
index e68bcafbd..e68bcafbd 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/svdf_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/svdf_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/svdf_state_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/svdf_state_relaxed.mod.py
index ecbc00bf2..ecbc00bf2 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/svdf_state_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/svdf_state_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/tanh_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/tanh_relaxed.mod.py
index 6c8fa6b7e..6c8fa6b7e 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/tanh_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/tanh_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/transpose_float_1_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/transpose_float_1_relaxed.mod.py
index 721e6beee..721e6beee 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/transpose_float_1_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/transpose_float_1_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_1/transpose_relaxed.mod.py b/tests/nnapi/specs/skip/V1_1/transpose_relaxed.mod.py
index 668e0c22a..668e0c22a 100644..100755
--- a/tests/nnapi/specs/skip/V1_1/transpose_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_1/transpose_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/add_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/add_v1_2.mod.py
index 8af47a57f..8af47a57f 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/add_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/add_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/argmax_1.mod.py b/tests/nnapi/specs/skip/V1_2/argmax_1.mod.py
deleted file mode 100644
index 6dc7430af..000000000
--- a/tests/nnapi/specs/skip/V1_2/argmax_1.mod.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-input0 = Input("input0", "TENSOR_FLOAT32", "{2, 2}")
-axis = Int32Scalar("axis", 1)
-output0 = Output("output", "TENSOR_INT32", "{2}")
-
-model = Model().Operation("ARGMAX", input0, axis).To(output0)
-
-quant8 = DataTypeConverter().Identify({
-    input0: ["TENSOR_QUANT8_ASYMM", 1.0, 0],
-})
-
-Example({
-    input0: [1.0, 2.0,
-             4.0, 3.0],
-    output0: [1, 0],
-}).AddVariations("relaxed", "float16", "int32", quant8)
diff --git a/tests/nnapi/specs/skip/V1_2/argmax_2.mod.py b/tests/nnapi/specs/skip/V1_2/argmax_2.mod.py
deleted file mode 100644
index 69be60740..000000000
--- a/tests/nnapi/specs/skip/V1_2/argmax_2.mod.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-input0 = Input("input0", "TENSOR_FLOAT32", "{2, 2}")
-axis = Int32Scalar("axis", 0)
-output0 = Output("output", "TENSOR_INT32", "{2}")
-
-model = Model().Operation("ARGMAX", input0, axis).To(output0)
-
-quant8 = DataTypeConverter().Identify({
-    input0: ["TENSOR_QUANT8_ASYMM", 1.0, 0],
-})
-
-Example({
-    input0: [1.0, 2.0,
-             4.0, 3.0],
-    output0: [1, 1],
-}).AddVariations("relaxed", "float16", "int32", quant8)
diff --git a/tests/nnapi/specs/skip/V1_2/argmax_3.mod.py b/tests/nnapi/specs/skip/V1_2/argmax_3.mod.py
deleted file mode 100644
index ab7afc60a..000000000
--- a/tests/nnapi/specs/skip/V1_2/argmax_3.mod.py
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Negative axis support test.
-
-input0 = Input("input0", "TENSOR_FLOAT32", "{2, 2}")
-axis = Int32Scalar("axis", -1)
-output0 = Output("output", "TENSOR_INT32", "{2}")
-
-model = Model().Operation("ARGMAX", input0, axis).To(output0)
-
-quant8 = DataTypeConverter().Identify({
-    input0: ["TENSOR_QUANT8_ASYMM", 1.0, 0],
-})
-
-Example({
-    input0: [1.0, 2.0,
-             4.0, 3.0],
-    output0: [1, 0],
-}).AddVariations("relaxed", "float16", "int32", quant8)
diff --git a/tests/nnapi/specs/skip/V1_2/argmin_1.mod.py b/tests/nnapi/specs/skip/V1_2/argmin_1.mod.py
index e89ceead9..e89ceead9 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/argmin_1.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/argmin_1.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/argmin_2.mod.py b/tests/nnapi/specs/skip/V1_2/argmin_2.mod.py
index e54cff784..e54cff784 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/argmin_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/argmin_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/argmin_3.mod.py b/tests/nnapi/specs/skip/V1_2/argmin_3.mod.py
index d3cbd76ed..d3cbd76ed 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/argmin_3.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/argmin_3.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/avg_pool_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/avg_pool_v1_2.mod.py
index 43083f91d..43083f91d 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/avg_pool_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/avg_pool_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/axis_aligned_bbox_transform.mod.py b/tests/nnapi/specs/skip/V1_2/axis_aligned_bbox_transform.mod.py
index ad2eb0ad3..ad2eb0ad3 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/axis_aligned_bbox_transform.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/axis_aligned_bbox_transform.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/batch_to_space_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/batch_to_space_v1_2.mod.py
index e7247bf59..e7247bf59 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/batch_to_space_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/batch_to_space_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/bbox_graph.mod.py b/tests/nnapi/specs/skip/V1_2/bbox_graph.mod.py
index a7a94af28..a7a94af28 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/bbox_graph.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/bbox_graph.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm.mod.py b/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm.mod.py
index 40ebff903..40ebff903 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_aux_input.mod.py b/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_aux_input.mod.py
index 22c0e2459..22c0e2459 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_aux_input.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_aux_input.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_cifg_peephole.mod.py b/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_cifg_peephole.mod.py
index 5def31402..5def31402 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_cifg_peephole.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_cifg_peephole.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_float16_batch_major.mod.py b/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_float16_batch_major.mod.py
index 06160adfe..06160adfe 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_float16_batch_major.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_float16_batch_major.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_float16_batch_major_aux_input.mod.py b/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_float16_batch_major_aux_input.mod.py
index d73da9c6e..d73da9c6e 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_float16_batch_major_aux_input.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_float16_batch_major_aux_input.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_float16_batch_major_merge_outputs.mod.py b/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_float16_batch_major_merge_outputs.mod.py
index cbf2ebdb7..cbf2ebdb7 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_float16_batch_major_merge_outputs.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_float16_batch_major_merge_outputs.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_merge_outputs.mod.py b/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_merge_outputs.mod.py
index 6e661001e..6e661001e 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_merge_outputs.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_merge_outputs.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_norm_fw_output.mod.py b/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_norm_fw_output.mod.py
index 93de203f4..93de203f4 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_norm_fw_output.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_lstm_norm_fw_output.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_rnn.mod.py b/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_rnn.mod.py
index b0a250170..b0a250170 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_rnn.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/bidirectional_sequence_rnn.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/box_with_nms_limit_gaussian.mod.py b/tests/nnapi/specs/skip/V1_2/box_with_nms_limit_gaussian.mod.py
index ed79ccc76..ed79ccc76 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/box_with_nms_limit_gaussian.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/box_with_nms_limit_gaussian.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/box_with_nms_limit_hard.mod.py b/tests/nnapi/specs/skip/V1_2/box_with_nms_limit_hard.mod.py
index b572a6468..b572a6468 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/box_with_nms_limit_hard.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/box_with_nms_limit_hard.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/box_with_nms_limit_linear.mod.py b/tests/nnapi/specs/skip/V1_2/box_with_nms_limit_linear.mod.py
index 4d3bc2001..4d3bc2001 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/box_with_nms_limit_linear.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/box_with_nms_limit_linear.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/channel_shuffle.mod.py b/tests/nnapi/specs/skip/V1_2/channel_shuffle.mod.py
index bd8fcad83..bd8fcad83 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/channel_shuffle.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/channel_shuffle.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/concat_float16_1.mod.py b/tests/nnapi/specs/skip/V1_2/concat_float16_1.mod.py
index f7c024a93..f7c024a93 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/concat_float16_1.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/concat_float16_1.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/concat_float16_2.mod.py b/tests/nnapi/specs/skip/V1_2/concat_float16_2.mod.py
index 64f2096b4..64f2096b4 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/concat_float16_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/concat_float16_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/concat_float16_3.mod.py b/tests/nnapi/specs/skip/V1_2/concat_float16_3.mod.py
index 7c7bc6964..7c7bc6964 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/concat_float16_3.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/concat_float16_3.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/concat_mixed_quant.mod.py b/tests/nnapi/specs/skip/V1_2/concat_mixed_quant.mod.py
index 6610fea9b..6610fea9b 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/concat_mixed_quant.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/concat_mixed_quant.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/concat_zero_sized.mod.py b/tests/nnapi/specs/skip/V1_2/concat_zero_sized.mod.py
index 1e374b4e4..1e374b4e4 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/concat_zero_sized.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/concat_zero_sized.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/conv2d_dilation.mod.py b/tests/nnapi/specs/skip/V1_2/conv2d_dilation.mod.py
index e30e5ede8..e30e5ede8 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/conv2d_dilation.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/conv2d_dilation.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/conv2d_per_channel.mod.py b/tests/nnapi/specs/skip/V1_2/conv2d_per_channel.mod.py
index 8780b48d9..8780b48d9 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/conv2d_per_channel.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/conv2d_per_channel.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/conv2d_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/conv2d_v1_2.mod.py
index 3ea902b62..3ea902b62 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/conv2d_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/conv2d_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/depth_to_space_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/depth_to_space_v1_2.mod.py
index 8d9de4b91..8d9de4b91 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/depth_to_space_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/depth_to_space_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/depthwise_conv2d_dilation.mod.py b/tests/nnapi/specs/skip/V1_2/depthwise_conv2d_dilation.mod.py
index 4b90498e3..4b90498e3 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/depthwise_conv2d_dilation.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/depthwise_conv2d_dilation.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/depthwise_conv2d_per_channel.mod.py b/tests/nnapi/specs/skip/V1_2/depthwise_conv2d_per_channel.mod.py
index 2df79ee34..2df79ee34 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/depthwise_conv2d_per_channel.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/depthwise_conv2d_per_channel.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/depthwise_conv2d_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/depthwise_conv2d_v1_2.mod.py
index 1ceb9c4eb..1ceb9c4eb 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/depthwise_conv2d_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/depthwise_conv2d_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/dequantize_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/dequantize_v1_2.mod.py
index 81e3515cd..81e3515cd 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/dequantize_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/dequantize_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/detection_postprocess.mod.py b/tests/nnapi/specs/skip/V1_2/detection_postprocess.mod.py
index b37989134..b37989134 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/detection_postprocess.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/detection_postprocess.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/div_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/div_v1_2.mod.py
index b92b67a99..b92b67a99 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/div_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/div_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/equal.mod.py b/tests/nnapi/specs/skip/V1_2/equal.mod.py
deleted file mode 100644
index d7c40fe63..000000000
--- a/tests/nnapi/specs/skip/V1_2/equal.mod.py
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-def test(name, input0, input1, output0, input0_data, input1_data, output_data, do_variations=True):
-  model = Model().Operation("EQUAL", input0, input1).To(output0)
-  example = Example({
-      input0: input0_data,
-      input1: input1_data,
-      output0: output_data,
-  }, model=model, name=name)
-  if do_variations:
-      example.AddVariations("int32", "float16", "relaxed")
-
-test(
-    name="simple",
-    input0=Input("input0", "TENSOR_FLOAT32", "{3}"),
-    input1=Input("input1", "TENSOR_FLOAT32", "{3}"),
-    output0=Output("output0", "TENSOR_BOOL8", "{3}"),
-    input0_data=[5, 7, 10],
-    input1_data=[10, 7, 5],
-    output_data=[False, True, False],
-)
-
-test(
-    name="broadcast",
-    input0=Input("input0", "TENSOR_FLOAT32", "{2, 1}"),
-    input1=Input("input1", "TENSOR_FLOAT32", "{2}"),
-    output0=Output("output0", "TENSOR_BOOL8", "{2, 2}"),
-    input0_data=[5, 10],
-    input1_data=[10, 5],
-    output_data=[False, True, True, False],
-)
-
-test(
-    name="quantized_different_scale",
-    input0=Input("input0", ("TENSOR_QUANT8_ASYMM", [3], 1.0, 128)),
-    input1=Input("input1", ("TENSOR_QUANT8_ASYMM", [1], 2.0, 128)),
-    output0=Output("output0", "TENSOR_BOOL8", "{3}"),
-    input0_data=[129, 130, 131], # effectively 1, 2, 3
-    input1_data=[129],           # effectively 2
-    output_data=[False, True, False],
-    do_variations=False,
-)
-
-test(
-    name="quantized_different_zero_point",
-    input0=Input("input0", ("TENSOR_QUANT8_ASYMM", [3], 1.0, 128)),
-    input1=Input("input1", ("TENSOR_QUANT8_ASYMM", [1], 1.0, 129)),
-    output0=Output("output0", "TENSOR_BOOL8", "{3}"),
-    input0_data=[129, 130, 131], # effectively 1, 2, 3
-    input1_data=[131],           # effectively 2
-    output_data=[False, True, False],
-    do_variations=False,
-)
-
-test(
-    name="quantized_overflow_second_input_if_requantized",
-    input0=Input("input0", ("TENSOR_QUANT8_ASYMM", [1], 1.64771, 31)),
-    input1=Input("input1", ("TENSOR_QUANT8_ASYMM", [1], 1.49725, 240)),
-    output0=Output("output0", "TENSOR_BOOL8", "{1}"),
-    input0_data=[0],
-    input1_data=[200],
-    output_data=[False],
-    do_variations=False,
-)
-
-test(
-    name="quantized_overflow_first_input_if_requantized",
-    input0=Input("input0", ("TENSOR_QUANT8_ASYMM", [1], 1.49725, 240)),
-    input1=Input("input1", ("TENSOR_QUANT8_ASYMM", [1], 1.64771, 31)),
-    output0=Output("output0", "TENSOR_BOOL8", "{1}"),
-    input0_data=[200],
-    input1_data=[0],
-    output_data=[False],
-    do_variations=False,
-)
-
-test(
-    name="boolean",
-    input0=Input("input0", "TENSOR_BOOL8", "{4}"),
-    input1=Input("input1", "TENSOR_BOOL8", "{4}"),
-    output0=Output("output0", "TENSOR_BOOL8", "{4}"),
-    input0_data=[False, True, False, True],
-    input1_data=[False, False, True, True],
-    output_data=[True, False, False, True],
-    do_variations=False,
-)
diff --git a/tests/nnapi/specs/skip/V1_2/expand_dims.mod.py b/tests/nnapi/specs/skip/V1_2/expand_dims.mod.py
index 41c5d5426..41c5d5426 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/expand_dims.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/expand_dims.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/floor_float16.mod.py b/tests/nnapi/specs/skip/V1_2/floor_float16.mod.py
index 5944b9bb9..5944b9bb9 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/floor_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/floor_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/fully_connected_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/fully_connected_v1_2.mod.py
index 13b45fa92..13b45fa92 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/fully_connected_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/fully_connected_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/generate_proposals.mod.py b/tests/nnapi/specs/skip/V1_2/generate_proposals.mod.py
index 41d9ef94a..41d9ef94a 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/generate_proposals.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/generate_proposals.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/greater.mod.py b/tests/nnapi/specs/skip/V1_2/greater.mod.py
index d811a4733..d811a4733 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/greater.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/greater.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/greater_equal.mod.py b/tests/nnapi/specs/skip/V1_2/greater_equal.mod.py
deleted file mode 100644
index d6c76faff..000000000
--- a/tests/nnapi/specs/skip/V1_2/greater_equal.mod.py
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-def test(name, input0, input1, output0, input0_data, input1_data, output_data, do_variations=True):
-  model = Model().Operation("GREATER_EQUAL", input0, input1).To(output0)
-  example = Example({
-      input0: input0_data,
-      input1: input1_data,
-      output0: output_data,
-  }, model=model, name=name)
-  if do_variations:
-      example.AddVariations("int32", "float16", "relaxed")
-
-test(
-    name="simple",
-    input0=Input("input0", "TENSOR_FLOAT32", "{3}"),
-    input1=Input("input1", "TENSOR_FLOAT32", "{3}"),
-    output0=Output("output0", "TENSOR_BOOL8", "{3}"),
-    input0_data=[5, 7, 10],
-    input1_data=[10, 7, 5],
-    output_data=[False, True, True],
-)
-
-test(
-    name="broadcast",
-    input0=Input("input0", "TENSOR_FLOAT32", "{2, 1}"),
-    input1=Input("input1", "TENSOR_FLOAT32", "{2}"),
-    output0=Output("output0", "TENSOR_BOOL8", "{2, 2}"),
-    input0_data=[5, 10],
-    input1_data=[10, 5],
-    output_data=[False, True, True, True],
-)
-
-test(
-    name="quantized_different_scale",
-    input0=Input("input0", ("TENSOR_QUANT8_ASYMM", [3], 1.0, 128)),
-    input1=Input("input1", ("TENSOR_QUANT8_ASYMM", [1], 2.0, 128)),
-    output0=Output("output0", "TENSOR_BOOL8", "{3}"),
-    input0_data=[129, 130, 131], # effectively 1, 2, 3
-    input1_data=[129],           # effectively 2
-    output_data=[False, True, True],
-    do_variations=False,
-)
-
-test(
-    name="quantized_different_zero_point",
-    input0=Input("input0", ("TENSOR_QUANT8_ASYMM", [3], 1.0, 128)),
-    input1=Input("input1", ("TENSOR_QUANT8_ASYMM", [1], 1.0, 129)),
-    output0=Output("output0", "TENSOR_BOOL8", "{3}"),
-    input0_data=[129, 130, 131], # effectively 1, 2, 3
-    input1_data=[131],           # effectively 2
-    output_data=[False, True, True],
-    do_variations=False,
-)
-
-test(
-    name="quantized_overflow_second_input_if_requantized",
-    input0=Input("input0", ("TENSOR_QUANT8_ASYMM", [1], 1.64771, 31)),
-    input1=Input("input1", ("TENSOR_QUANT8_ASYMM", [1], 1.49725, 240)),
-    output0=Output("output0", "TENSOR_BOOL8", "{1}"),
-    input0_data=[0],
-    input1_data=[200],
-    output_data=[True],
-    do_variations=False,
-)
-
-test(
-    name="quantized_overflow_first_input_if_requantized",
-    input0=Input("input0", ("TENSOR_QUANT8_ASYMM", [1], 1.49725, 240)),
-    input1=Input("input1", ("TENSOR_QUANT8_ASYMM", [1], 1.64771, 31)),
-    output0=Output("output0", "TENSOR_BOOL8", "{1}"),
-    input0_data=[200],
-    input1_data=[0],
-    output_data=[False],
-    do_variations=False,
-)
-
-test(
-    name="boolean",
-    input0=Input("input0", "TENSOR_BOOL8", "{4}"),
-    input1=Input("input1", "TENSOR_BOOL8", "{4}"),
-    output0=Output("output0", "TENSOR_BOOL8", "{4}"),
-    input0_data=[False, True, False, True],
-    input1_data=[False, False, True, True],
-    output_data=[True, True, False, True],
-    do_variations=False,
-)
diff --git a/tests/nnapi/specs/skip/V1_2/grouped_conv2d.mod.py b/tests/nnapi/specs/skip/V1_2/grouped_conv2d.mod.py
index 32819317b..32819317b 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/grouped_conv2d.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/grouped_conv2d.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/heatmap_max_keypoint.mod.py b/tests/nnapi/specs/skip/V1_2/heatmap_max_keypoint.mod.py
index 9b738112a..9b738112a 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/heatmap_max_keypoint.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/heatmap_max_keypoint.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/instance_normalization.mod.py b/tests/nnapi/specs/skip/V1_2/instance_normalization.mod.py
index 9d540ff59..9d540ff59 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/instance_normalization.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/instance_normalization.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/l2_normalization_axis.mod.py b/tests/nnapi/specs/skip/V1_2/l2_normalization_axis.mod.py
index b420032d4..b420032d4 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/l2_normalization_axis.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/l2_normalization_axis.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/l2_normalization_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/l2_normalization_v1_2.mod.py
index f1cd7f517..f1cd7f517 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/l2_normalization_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/l2_normalization_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/l2_pool_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/l2_pool_v1_2.mod.py
index 1754478ea..1754478ea 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/l2_pool_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/l2_pool_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/layer_norm_lstm.mod.py b/tests/nnapi/specs/skip/V1_2/layer_norm_lstm.mod.py
index 0a5edeaf5..0a5edeaf5 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/layer_norm_lstm.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/layer_norm_lstm.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/less.mod.py b/tests/nnapi/specs/skip/V1_2/less.mod.py
deleted file mode 100644
index 182d69d67..000000000
--- a/tests/nnapi/specs/skip/V1_2/less.mod.py
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-def test(name, input0, input1, output0, input0_data, input1_data, output_data, do_variations=True):
-  model = Model().Operation("LESS", input0, input1).To(output0)
-  example = Example({
-      input0: input0_data,
-      input1: input1_data,
-      output0: output_data,
-  }, model=model, name=name)
-  if do_variations:
-      example.AddVariations("int32", "float16", "relaxed")
-
-test(
-    name="simple",
-    input0=Input("input0", "TENSOR_FLOAT32", "{3}"),
-    input1=Input("input1", "TENSOR_FLOAT32", "{3}"),
-    output0=Output("output0", "TENSOR_BOOL8", "{3}"),
-    input0_data=[5, 7, 10],
-    input1_data=[10, 7, 5],
-    output_data=[True, False, False],
-)
-
-test(
-    name="broadcast",
-    input0=Input("input0", "TENSOR_FLOAT32", "{2, 1}"),
-    input1=Input("input1", "TENSOR_FLOAT32", "{2}"),
-    output0=Output("output0", "TENSOR_BOOL8", "{2, 2}"),
-    input0_data=[5, 10],
-    input1_data=[10, 5],
-    output_data=[True, False, False, False],
-)
-
-test(
-    name="quantized_different_scale",
-    input0=Input("input0", ("TENSOR_QUANT8_ASYMM", [3], 1.0, 128)),
-    input1=Input("input1", ("TENSOR_QUANT8_ASYMM", [1], 2.0, 128)),
-    output0=Output("output0", "TENSOR_BOOL8", "{3}"),
-    input0_data=[129, 130, 131], # effectively 1, 2, 3
-    input1_data=[129],           # effectively 2
-    output_data=[True, False, False],
-    do_variations=False,
-)
-
-test(
-    name="quantized_different_zero_point",
-    input0=Input("input0", ("TENSOR_QUANT8_ASYMM", [3], 1.0, 128)),
-    input1=Input("input1", ("TENSOR_QUANT8_ASYMM", [1], 1.0, 129)),
-    output0=Output("output0", "TENSOR_BOOL8", "{3}"),
-    input0_data=[129, 130, 131], # effectively 1, 2, 3
-    input1_data=[131],           # effectively 2
-    output_data=[True, False, False],
-    do_variations=False,
-)
-
-test(
-    name="quantized_overflow_second_input_if_requantized",
-    input0=Input("input0", ("TENSOR_QUANT8_ASYMM", [1], 1.64771, 31)),
-    input1=Input("input1", ("TENSOR_QUANT8_ASYMM", [1], 1.49725, 240)),
-    output0=Output("output0", "TENSOR_BOOL8", "{1}"),
-    input0_data=[0],
-    input1_data=[200],
-    output_data=[False],
-    do_variations=False,
-)
-
-test(
-    name="quantized_overflow_first_input_if_requantized",
-    input0=Input("input0", ("TENSOR_QUANT8_ASYMM", [1], 1.49725, 240)),
-    input1=Input("input1", ("TENSOR_QUANT8_ASYMM", [1], 1.64771, 31)),
-    output0=Output("output0", "TENSOR_BOOL8", "{1}"),
-    input0_data=[200],
-    input1_data=[0],
-    output_data=[True],
-    do_variations=False,
-)
-
-test(
-    name="boolean",
-    input0=Input("input0", "TENSOR_BOOL8", "{4}"),
-    input1=Input("input1", "TENSOR_BOOL8", "{4}"),
-    output0=Output("output0", "TENSOR_BOOL8", "{4}"),
-    input0_data=[False, True, False, True],
-    input1_data=[False, False, True, True],
-    output_data=[False, False, True, False],
-    do_variations=False,
-)
diff --git a/tests/nnapi/specs/skip/V1_2/less_equal.mod.py b/tests/nnapi/specs/skip/V1_2/less_equal.mod.py
index e57ca55c5..e57ca55c5 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/less_equal.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/less_equal.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/local_response_normalization_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/local_response_normalization_v1_2.mod.py
index 784ec9c06..784ec9c06 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/local_response_normalization_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/local_response_normalization_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/log.mod.py b/tests/nnapi/specs/skip/V1_2/log.mod.py
index d93f6b144..d93f6b144 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/log.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/log.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/log_softmax.mod.py b/tests/nnapi/specs/skip/V1_2/log_softmax.mod.py
index 7e4a6774f..7e4a6774f 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/log_softmax.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/log_softmax.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/logical_and.mod.py b/tests/nnapi/specs/skip/V1_2/logical_and.mod.py
deleted file mode 100644
index c831bb2a6..000000000
--- a/tests/nnapi/specs/skip/V1_2/logical_and.mod.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-def test(name, input0, input1, output0, input0_data, input1_data, output_data):
-  model = Model().Operation("LOGICAL_AND", input0, input1).To(output0)
-  Example({
-      input0: input0_data,
-      input1: input1_data,
-      output0: output_data,
-  }, model=model, name=name)
-
-test(
-    name="simple",
-    input0=Input("input0", "TENSOR_BOOL8", "{1, 1, 1, 4}"),
-    input1=Input("input1", "TENSOR_BOOL8", "{1, 1, 1, 4}"),
-    output0=Output("output0", "TENSOR_BOOL8", "{1, 1, 1, 4}"),
-    input0_data=[True, False, False, True],
-    input1_data=[True, False, True, False],
-    output_data=[True, False, False, False],
-)
-
-test(
-    name="broadcast",
-    input0=Input("input0", "TENSOR_BOOL8", "{1, 1, 1, 4}"),
-    input1=Input("input1", "TENSOR_BOOL8", "{1, 1}"),
-    output0=Output("output0", "TENSOR_BOOL8", "{1, 1, 1, 4}"),
-    input0_data=[True, False, False, True],
-    input1_data=[True],
-    output_data=[True, False, False, True],
-)
diff --git a/tests/nnapi/specs/skip/V1_2/logical_not.mod.py b/tests/nnapi/specs/skip/V1_2/logical_not.mod.py
deleted file mode 100644
index 04ca64680..000000000
--- a/tests/nnapi/specs/skip/V1_2/logical_not.mod.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-input0 = Input("input0", "TENSOR_BOOL8", "{1, 1, 4, 1, 1}")
-output0 = Output("output0", "TENSOR_BOOL8", "{1, 1, 4, 1, 1}")
-
-model = Model().Operation("LOGICAL_NOT", input0).To(output0)
-
-Example({
-    input0: [True, False, False, True],
-    output0: [False, True, True, False],
-})
diff --git a/tests/nnapi/specs/skip/V1_2/logical_or.mod.py b/tests/nnapi/specs/skip/V1_2/logical_or.mod.py
deleted file mode 100644
index e4f720dd5..000000000
--- a/tests/nnapi/specs/skip/V1_2/logical_or.mod.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-def test(name, input0, input1, output0, input0_data, input1_data, output_data):
-  model = Model().Operation("LOGICAL_OR", input0, input1).To(output0)
-  Example({
-      input0: input0_data,
-      input1: input1_data,
-      output0: output_data,
-  }, model=model, name=name)
-
-test(
-    name="simple",
-    input0=Input("input0", "TENSOR_BOOL8", "{1, 1, 1, 4}"),
-    input1=Input("input1", "TENSOR_BOOL8", "{1, 1, 1, 4}"),
-    output0=Output("output0", "TENSOR_BOOL8", "{1, 1, 1, 4}"),
-    input0_data=[True, False, False, True],
-    input1_data=[True, False, True, False],
-    output_data=[True, False, True, True],
-)
-
-test(
-    name="broadcast",
-    input0=Input("input0", "TENSOR_BOOL8", "{1, 1, 1, 4}"),
-    input1=Input("input1", "TENSOR_BOOL8", "{1, 1}"),
-    output0=Output("output0", "TENSOR_BOOL8", "{1, 1, 1, 4}"),
-    input0_data=[True, False, False, True],
-    input1_data=[False],
-    output_data=[True, False, False, True],
-)
diff --git a/tests/nnapi/specs/skip/V1_2/logistic_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/logistic_v1_2.mod.py
index fe91a814d..fe91a814d 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/logistic_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/logistic_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/lsh_projection_3_relaxed.mod.py b/tests/nnapi/specs/skip/V1_2/lsh_projection_3_relaxed.mod.py
index de7cec111..de7cec111 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/lsh_projection_3_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/lsh_projection_3_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/lsh_projection_4_relaxed.mod.py b/tests/nnapi/specs/skip/V1_2/lsh_projection_4_relaxed.mod.py
index 2b3b33a1e..2b3b33a1e 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/lsh_projection_4_relaxed.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/lsh_projection_4_relaxed.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/lsh_projection_deprecated.mod.py b/tests/nnapi/specs/skip/V1_2/lsh_projection_deprecated.mod.py
index 2b3b33a1e..2b3b33a1e 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/lsh_projection_deprecated.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/lsh_projection_deprecated.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/lsh_projection_float16.mod.py b/tests/nnapi/specs/skip/V1_2/lsh_projection_float16.mod.py
index ed19b17f7..ed19b17f7 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/lsh_projection_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/lsh_projection_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/lstm2_float16.mod.py b/tests/nnapi/specs/skip/V1_2/lstm2_float16.mod.py
index 6ca648a6c..6ca648a6c 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/lstm2_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/lstm2_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/lstm2_state2_float16.mod.py b/tests/nnapi/specs/skip/V1_2/lstm2_state2_float16.mod.py
index e9a143417..e9a143417 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/lstm2_state2_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/lstm2_state2_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/lstm2_state_float16.mod.py b/tests/nnapi/specs/skip/V1_2/lstm2_state_float16.mod.py
index 4d1500161..4d1500161 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/lstm2_state_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/lstm2_state_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/lstm3_float16.mod.py b/tests/nnapi/specs/skip/V1_2/lstm3_float16.mod.py
index aee476303..aee476303 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/lstm3_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/lstm3_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/lstm3_state2_float16.mod.py b/tests/nnapi/specs/skip/V1_2/lstm3_state2_float16.mod.py
index 494c12aa5..494c12aa5 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/lstm3_state2_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/lstm3_state2_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/lstm3_state3_float16.mod.py b/tests/nnapi/specs/skip/V1_2/lstm3_state3_float16.mod.py
index d359f84e1..d359f84e1 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/lstm3_state3_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/lstm3_state3_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/lstm3_state_float16.mod.py b/tests/nnapi/specs/skip/V1_2/lstm3_state_float16.mod.py
index 695f0f53b..695f0f53b 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/lstm3_state_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/lstm3_state_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/lstm_float16.mod.py b/tests/nnapi/specs/skip/V1_2/lstm_float16.mod.py
index ff7be5ebb..ff7be5ebb 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/lstm_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/lstm_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/lstm_state2_float16.mod.py b/tests/nnapi/specs/skip/V1_2/lstm_state2_float16.mod.py
index 470dd7b50..470dd7b50 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/lstm_state2_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/lstm_state2_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/lstm_state_float16.mod.py b/tests/nnapi/specs/skip/V1_2/lstm_state_float16.mod.py
index 78f65366d..78f65366d 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/lstm_state_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/lstm_state_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/max_pool_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/max_pool_v1_2.mod.py
index 979cf2ea3..979cf2ea3 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/max_pool_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/max_pool_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/maximum.mod.py b/tests/nnapi/specs/skip/V1_2/maximum.mod.py
deleted file mode 100644
index 0d37a203c..000000000
--- a/tests/nnapi/specs/skip/V1_2/maximum.mod.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-def test(name, input0, input1, output0, input0_data, input1_data, output_data):
-  model = Model().Operation("MAXIMUM", input0, input1).To(output0)
-
-  quant8 = DataTypeConverter().Identify({
-      input0: ["TENSOR_QUANT8_ASYMM", 0.5, 127],
-      input1: ["TENSOR_QUANT8_ASYMM", 1.0, 100],
-      output0: ["TENSOR_QUANT8_ASYMM", 2.0, 80],
-  })
-
-  Example({
-      input0: input0_data,
-      input1: input1_data,
-      output0: output_data,
-  }, model=model, name=name).AddVariations("relaxed", "float16", "int32", quant8)
-
-
-test(
-    name="simple",
-    input0=Input("input0", "TENSOR_FLOAT32", "{3, 1, 2}"),
-    input1=Input("input1", "TENSOR_FLOAT32", "{3, 1, 2}"),
-    output0=Output("output0", "TENSOR_FLOAT32", "{3, 1, 2}"),
-    input0_data=[1.0, 0.0, -1.0, 11.0, -2.0, -1.44],
-    input1_data=[-1.0, 0.0, 1.0, 12.0, -3.0, -1.43],
-    output_data=[1.0, 0.0, 1.0, 12.0, -2.0, -1.43],
-)
-
-test(
-    name="broadcast",
-    input0=Input("input0", "TENSOR_FLOAT32", "{3, 1, 2}"),
-    input1=Input("input1", "TENSOR_FLOAT32", "{2}"),
-    output0=Output("output0", "TENSOR_FLOAT32", "{3, 1, 2}"),
-    input0_data=[1.0, 0.0, -1.0, -2.0, -1.44, 11.0],
-    input1_data=[0.5, 2.0],
-    output_data=[1.0, 2.0, 0.5, 2.0, 0.5, 11.0],
-)
-
-
-# Test overflow and underflow.
-input0 = Input("input0", "TENSOR_QUANT8_ASYMM", "{2}, 1.0f, 128")
-input1 = Input("input1", "TENSOR_QUANT8_ASYMM", "{2}, 1.0f, 128")
-output0 = Output("output0", "TENSOR_QUANT8_ASYMM", "{2}, 0.5f, 128")
-model = Model().Operation("MAXIMUM", input0, input1).To(output0)
-
-Example({
-    input0: [60, 128],
-    input1: [128, 200],
-    output0: [128, 255],
-}, model=model, name="overflow")
diff --git a/tests/nnapi/specs/skip/V1_2/mean_float16.mod.py b/tests/nnapi/specs/skip/V1_2/mean_float16.mod.py
index 5814f60fe..5814f60fe 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/mean_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/mean_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/minimum.mod.py b/tests/nnapi/specs/skip/V1_2/minimum.mod.py
deleted file mode 100644
index 76b058612..000000000
--- a/tests/nnapi/specs/skip/V1_2/minimum.mod.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-def test(name, input0, input1, output0, input0_data, input1_data, output_data):
-  model = Model().Operation("MINIMUM", input0, input1).To(output0)
-
-  quant8 = DataTypeConverter().Identify({
-      input0: ["TENSOR_QUANT8_ASYMM", 0.5, 127],
-      input1: ["TENSOR_QUANT8_ASYMM", 1.0, 100],
-      output0: ["TENSOR_QUANT8_ASYMM", 2.0, 80],
-  })
-
-  Example({
-      input0: input0_data,
-      input1: input1_data,
-      output0: output_data,
-  }, model=model, name=name).AddVariations("relaxed", "float16", "int32", quant8)
-
-
-test(
-    name="simple",
-    input0=Input("input0", "TENSOR_FLOAT32", "{3, 1, 2}"),
-    input1=Input("input1", "TENSOR_FLOAT32", "{3, 1, 2}"),
-    output0=Output("output0", "TENSOR_FLOAT32", "{3, 1, 2}"),
-    input0_data=[1.0, 0.0, -1.0, 11.0, -2.0, -1.44],
-    input1_data=[-1.0, 0.0, 1.0, 12.0, -3.0, -1.43],
-    output_data=[-1.0, 0.0, -1.0, 11.0, -3.0, -1.44],
-)
-
-test(
-    name="broadcast",
-    input0=Input("input0", "TENSOR_FLOAT32", "{3, 1, 2}"),
-    input1=Input("input1", "TENSOR_FLOAT32", "{2}"),
-    output0=Output("output0", "TENSOR_FLOAT32", "{3, 1, 2}"),
-    input0_data=[1.0, 0.0, -1.0, -2.0, -1.44, 11.0],
-    input1_data=[0.5, 2.0],
-    output_data=[0.5, 0.0, -1.0, -2.0, -1.44, 2.0],
-)
-
-
-# Test overflow and underflow.
-input0 = Input("input0", "TENSOR_QUANT8_ASYMM", "{2}, 1.0f, 128")
-input1 = Input("input1", "TENSOR_QUANT8_ASYMM", "{2}, 1.0f, 128")
-output0 = Output("output0", "TENSOR_QUANT8_ASYMM", "{2}, 0.5f, 128")
-model = Model().Operation("MINIMUM", input0, input1).To(output0)
-
-Example({
-    input0: [60, 128],
-    input1: [128, 200],
-    output0: [0, 128],
-}, model=model, name="overflow")
diff --git a/tests/nnapi/specs/skip/V1_2/mul_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/mul_v1_2.mod.py
index 8d1002b92..8d1002b92 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/mul_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/mul_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/not_equal.mod.py b/tests/nnapi/specs/skip/V1_2/not_equal.mod.py
deleted file mode 100644
index 2c36b5abb..000000000
--- a/tests/nnapi/specs/skip/V1_2/not_equal.mod.py
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-def test(name, input0, input1, output0, input0_data, input1_data, output_data, do_variations=True):
-  model = Model().Operation("NOT_EQUAL", input0, input1).To(output0)
-  example = Example({
-      input0: input0_data,
-      input1: input1_data,
-      output0: output_data,
-  }, model=model, name=name)
-  if do_variations:
-      example.AddVariations("int32", "float16", "relaxed")
-
-test(
-    name="simple",
-    input0=Input("input0", "TENSOR_FLOAT32", "{3}"),
-    input1=Input("input1", "TENSOR_FLOAT32", "{3}"),
-    output0=Output("output0", "TENSOR_BOOL8", "{3}"),
-    input0_data=[5, 7, 10],
-    input1_data=[10, 7, 5],
-    output_data=[True, False, True],
-)
-
-test(
-    name="broadcast",
-    input0=Input("input0", "TENSOR_FLOAT32", "{2, 1}"),
-    input1=Input("input1", "TENSOR_FLOAT32", "{2}"),
-    output0=Output("output0", "TENSOR_BOOL8", "{2, 2}"),
-    input0_data=[5, 10],
-    input1_data=[10, 5],
-    output_data=[True, False, False, True],
-)
-
-test(
-    name="quantized_different_scale",
-    input0=Input("input0", ("TENSOR_QUANT8_ASYMM", [3], 1.0, 128)),
-    input1=Input("input1", ("TENSOR_QUANT8_ASYMM", [1], 2.0, 128)),
-    output0=Output("output0", "TENSOR_BOOL8", "{3}"),
-    input0_data=[129, 130, 131], # effectively 1, 2, 3
-    input1_data=[129],           # effectively 2
-    output_data=[True, False, True],
-    do_variations=False,
-)
-
-test(
-    name="quantized_different_zero_point",
-    input0=Input("input0", ("TENSOR_QUANT8_ASYMM", [3], 1.0, 128)),
-    input1=Input("input1", ("TENSOR_QUANT8_ASYMM", [1], 1.0, 129)),
-    output0=Output("output0", "TENSOR_BOOL8", "{3}"),
-    input0_data=[129, 130, 131], # effectively 1, 2, 3
-    input1_data=[131],           # effectively 2
-    output_data=[True, False, True],
-    do_variations=False,
-)
-
-test(
-    name="quantized_overflow_second_input_if_requantized",
-    input0=Input("input0", ("TENSOR_QUANT8_ASYMM", [1], 1.64771, 31)),
-    input1=Input("input1", ("TENSOR_QUANT8_ASYMM", [1], 1.49725, 240)),
-    output0=Output("output0", "TENSOR_BOOL8", "{1}"),
-    input0_data=[0],
-    input1_data=[200],
-    output_data=[True],
-    do_variations=False,
-)
-
-test(
-    name="quantized_overflow_first_input_if_requantized",
-    input0=Input("input0", ("TENSOR_QUANT8_ASYMM", [1], 1.49725, 240)),
-    input1=Input("input1", ("TENSOR_QUANT8_ASYMM", [1], 1.64771, 31)),
-    output0=Output("output0", "TENSOR_BOOL8", "{1}"),
-    input0_data=[200],
-    input1_data=[0],
-    output_data=[True],
-    do_variations=False,
-)
-
-test(
-    name="boolean",
-    input0=Input("input0", "TENSOR_BOOL8", "{4}"),
-    input1=Input("input1", "TENSOR_BOOL8", "{4}"),
-    output0=Output("output0", "TENSOR_BOOL8", "{4}"),
-    input0_data=[False, True, False, True],
-    input1_data=[False, False, True, True],
-    output_data=[False, True, True, False],
-    do_variations=False,
-)
diff --git a/tests/nnapi/specs/skip/V1_2/pad_all_dims.mod.py b/tests/nnapi/specs/skip/V1_2/pad_all_dims.mod.py
index 3ae88b87e..3ae88b87e 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/pad_all_dims.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/pad_all_dims.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/pad_float16.mod.py b/tests/nnapi/specs/skip/V1_2/pad_float16.mod.py
index 7a6b29ccf..7a6b29ccf 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/pad_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/pad_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/pad_low_rank.mod.py b/tests/nnapi/specs/skip/V1_2/pad_low_rank.mod.py
index 7394f796d..7394f796d 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/pad_low_rank.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/pad_low_rank.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/pad_low_rank_quant8.mod.py b/tests/nnapi/specs/skip/V1_2/pad_low_rank_quant8.mod.py
index be939341e..be939341e 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/pad_low_rank_quant8.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/pad_low_rank_quant8.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/pad_quant8.mod.py b/tests/nnapi/specs/skip/V1_2/pad_quant8.mod.py
index 9257f6972..9257f6972 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/pad_quant8.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/pad_quant8.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/pad_quant8_nonzero.mod.py b/tests/nnapi/specs/skip/V1_2/pad_quant8_nonzero.mod.py
index 75e7f7b60..75e7f7b60 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/pad_quant8_nonzero.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/pad_quant8_nonzero.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/pad_v2_1_float.mod.py b/tests/nnapi/specs/skip/V1_2/pad_v2_1_float.mod.py
index c500741c2..c500741c2 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/pad_v2_1_float.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/pad_v2_1_float.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/pad_v2_1_quant8.mod.py b/tests/nnapi/specs/skip/V1_2/pad_v2_1_quant8.mod.py
index 3dfaff64b..3dfaff64b 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/pad_v2_1_quant8.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/pad_v2_1_quant8.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/pad_v2_all_dims.mod.py b/tests/nnapi/specs/skip/V1_2/pad_v2_all_dims.mod.py
index 5b27f4963..5b27f4963 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/pad_v2_all_dims.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/pad_v2_all_dims.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/pad_v2_all_dims_quant8.mod.py b/tests/nnapi/specs/skip/V1_2/pad_v2_all_dims_quant8.mod.py
index 5ee4b06d7..5ee4b06d7 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/pad_v2_all_dims_quant8.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/pad_v2_all_dims_quant8.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/pad_v2_low_rank.mod.py b/tests/nnapi/specs/skip/V1_2/pad_v2_low_rank.mod.py
index 391d5cfb6..391d5cfb6 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/pad_v2_low_rank.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/pad_v2_low_rank.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/pad_v2_low_rank_quant8.mod.py b/tests/nnapi/specs/skip/V1_2/pad_v2_low_rank_quant8.mod.py
index b67c2b834..b67c2b834 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/pad_v2_low_rank_quant8.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/pad_v2_low_rank_quant8.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/pow.mod.py b/tests/nnapi/specs/skip/V1_2/pow.mod.py
index 2d174ed3d..2d174ed3d 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/pow.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/pow.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/prelu.mod.py b/tests/nnapi/specs/skip/V1_2/prelu.mod.py
deleted file mode 100644
index bbbeeb5dc..000000000
--- a/tests/nnapi/specs/skip/V1_2/prelu.mod.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# TEST 1: PRELU
-i1 = Input("input", "TENSOR_FLOAT32", "{1, 2, 2, 3}")
-a1 = Parameter("alpha", "TENSOR_FLOAT32", "{1, 1, 3}", [0, 1, 2])
-o1 = Output("output", "TENSOR_FLOAT32", "{1, 2, 2, 3}")
-Model().Operation("PRELU", i1, a1).To(o1)
-
-# output.scale > input.scale && output.scale > input.scale * alpha.scale
-quant8_gt = DataTypeConverter().Identify({
-    i1: ("TENSOR_QUANT8_ASYMM", 0.25, 128),
-    a1: ("TENSOR_QUANT8_ASYMM", 0.25, 50),
-    o1: ("TENSOR_QUANT8_ASYMM", 0.5, 120)
-})
-
-# output.scale == input.scale
-quant8_eq1 = DataTypeConverter().Identify({
-    i1: ("TENSOR_QUANT8_ASYMM", 0.25, 128),
-    a1: ("TENSOR_QUANT8_ASYMM", 0.25, 50),
-    o1: ("TENSOR_QUANT8_ASYMM", 0.25, 120)
-})
-
-# output.scale == input.scale * alpha.scale
-quant8_eq2 = DataTypeConverter().Identify({
-    i1: ("TENSOR_QUANT8_ASYMM", 0.25, 128),
-    a1: ("TENSOR_QUANT8_ASYMM", 0.5, 50),
-    o1: ("TENSOR_QUANT8_ASYMM", 0.125, 120)
-})
-
-# output.scale < input.scale && output.scale < input.scale * alpha.scale
-quant8_lt = DataTypeConverter().Identify({
-    i1: ("TENSOR_QUANT8_ASYMM", 0.25, 128),
-    a1: ("TENSOR_QUANT8_ASYMM", 0.5, 50),
-    o1: ("TENSOR_QUANT8_ASYMM", 0.1, 120)
-})
-
-# Instantiate an example
-Example({
-    i1: [ 0,  0,  0,
-          1,  1,  1,
-         -1, -1, -1,
-         -2, -2, -2],
-    o1: [ 0,  0,  0,
-          1,  1,  1,
-          0, -1, -2,
-          0, -2, -4]
-}).AddInput(a1).AddVariations("relaxed", quant8_gt, quant8_eq1, quant8_eq2, quant8_lt, "float16")
diff --git a/tests/nnapi/specs/skip/V1_2/quantize.mod.py b/tests/nnapi/specs/skip/V1_2/quantize.mod.py
index a42624dce..a42624dce 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/quantize.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/quantize.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/quantized_lstm.mod.py b/tests/nnapi/specs/skip/V1_2/quantized_lstm.mod.py
index 5fd4c7a84..5fd4c7a84 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/quantized_lstm.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/quantized_lstm.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/random_multinomial.mod.py b/tests/nnapi/specs/skip/V1_2/random_multinomial.mod.py
index bea061723..bea061723 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/random_multinomial.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/random_multinomial.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/random_multinomial_float16.mod.py b/tests/nnapi/specs/skip/V1_2/random_multinomial_float16.mod.py
index 33d774ec7..33d774ec7 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/random_multinomial_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/random_multinomial_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/reduce_all.mod.py b/tests/nnapi/specs/skip/V1_2/reduce_all.mod.py
index 831a702a2..831a702a2 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/reduce_all.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/reduce_all.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/reduce_any.mod.py b/tests/nnapi/specs/skip/V1_2/reduce_any.mod.py
index da0caca2d..da0caca2d 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/reduce_any.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/reduce_any.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/reduce_min.mod.py b/tests/nnapi/specs/skip/V1_2/reduce_min.mod.py
deleted file mode 100644
index 57b827911..000000000
--- a/tests/nnapi/specs/skip/V1_2/reduce_min.mod.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-def test(input0, output0, axes, keep_dims, input_data, output_data):
-  model = Model().Operation("REDUCE_MIN", input0, axes, keep_dims).To(output0)
-  quant8 = DataTypeConverter().Identify({
-      input0: ["TENSOR_QUANT8_ASYMM", 0.5, 127],
-      output0: ["TENSOR_QUANT8_ASYMM", 0.5, 127],
-  })
-  Example({
-      input0: input_data,
-      output0: output_data,
-  }, model=model).AddVariations("relaxed", "float16", quant8)
-
-test(
-    input0=Input("input0", "TENSOR_FLOAT32", "{3, 2}"),
-    input_data=[-1, -2,
-                3, 4,
-                5, -6],
-    axes=[-1],
-    keep_dims=False,
-    output0=Output("output0", "TENSOR_FLOAT32", "{3}"),
-    output_data=[-2, 3, -6],
-)
-
-# Tests below were adapted from tensorflow/lite/kernels/reduce_test.cc
-
-test(
-    input0=Input("input0", "TENSOR_FLOAT32", "{1}"),
-    input_data=[9.527],
-    axes=[0],
-    keep_dims=True,
-    output0=Output("output0", "TENSOR_FLOAT32", "{1}"),
-    output_data=[9.527],
-)
-
-test(
-    input0=Input("input0", "TENSOR_FLOAT32", "{4, 3, 2}"),
-    input_data=[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8,
-                0.9, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6,
-                1.7, 1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4],
-    axes=[1, 0, -3, -3],
-    keep_dims=False,
-    output0=Output("output0", "TENSOR_FLOAT32", "{2}"),
-    output_data=[0.1, 0.2],
-)
-
-test(
-    input0=Input("input0", "TENSOR_FLOAT32", "{4, 3, 2}"),
-    input_data=[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8,
-                0.9, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6,
-                1.7, 1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4],
-    axes=[0, 2],
-    keep_dims=True,
-    output0=Output("output0", "TENSOR_FLOAT32", "{1, 3, 1}"),
-    output_data=[0.1, 0.3, 0.5],
-)
diff --git a/tests/nnapi/specs/skip/V1_2/reduce_prod.mod.py b/tests/nnapi/specs/skip/V1_2/reduce_prod.mod.py
index 978f273bc..978f273bc 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/reduce_prod.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/reduce_prod.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/reduce_sum.mod.py b/tests/nnapi/specs/skip/V1_2/reduce_sum.mod.py
deleted file mode 100644
index c59579e0f..000000000
--- a/tests/nnapi/specs/skip/V1_2/reduce_sum.mod.py
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-def test(input0, output0, axes, keep_dims, input_data, output_data):
-  model = Model().Operation("REDUCE_SUM", input0, axes, keep_dims).To(output0)
-  Example({
-      input0: input_data,
-      output0: output_data,
-  }, model=model).AddVariations("relaxed", "float16")
-
-test(
-    input0=Input("input0", "TENSOR_FLOAT32", "{3, 2}"),
-    input_data=[-1, -2,
-                3, 4,
-                5, -6],
-    axes=[-1],
-    keep_dims=False,
-    output0=Output("output0", "TENSOR_FLOAT32", "{3}"),
-    output_data=[-1 - 2, 3 + 4, 5 - 6],
-)
-
-# Tests below were adapted from tensorflow/lite/kernels/reduce_test.cc
-
-test(
-    input0=Input("input0", "TENSOR_FLOAT32", "{1}"),
-    input_data=[9.527],
-    axes=[0],
-    keep_dims=True,
-    output0=Output("output0", "TENSOR_FLOAT32", "{1}"),
-    output_data=[9.527],
-)
-
-test(
-    input0=Input("input0", "TENSOR_FLOAT32", "{4, 3, 2}"),
-    input_data=[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8,
-                0.9, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6,
-                1.7, 1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4],
-    axes=[1, 0, -3, -3],
-    keep_dims=False,
-    output0=Output("output0", "TENSOR_FLOAT32", "{2}"),
-    output_data=[14.4, 15.6],
-)
-
-test(
-    input0=Input("input0", "TENSOR_FLOAT32", "{4, 3, 2}"),
-    input_data=[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8,
-                0.9, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6,
-                1.7, 1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4],
-    axes=[0, 2],
-    keep_dims=True,
-    output0=Output("output0", "TENSOR_FLOAT32", "{1, 3, 1}"),
-    output_data=[8.4, 10.0, 11.6],
-)
diff --git a/tests/nnapi/specs/skip/V1_2/relu1_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/relu1_v1_2.mod.py
index 9b69ea6cc..9b69ea6cc 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/relu1_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/relu1_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/relu6_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/relu6_v1_2.mod.py
index 068f53ffb..068f53ffb 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/relu6_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/relu6_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/relu_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/relu_v1_2.mod.py
index 9065fc950..9065fc950 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/relu_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/relu_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/reshape_float16.mod.py b/tests/nnapi/specs/skip/V1_2/reshape_float16.mod.py
index f54cba6d8..f54cba6d8 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/reshape_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/reshape_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/resize_bilinear_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/resize_bilinear_v1_2.mod.py
index 572d06b75..572d06b75 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/resize_bilinear_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/resize_bilinear_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/resize_nearest_neighbor.mod.py b/tests/nnapi/specs/skip/V1_2/resize_nearest_neighbor.mod.py
index 04102c5ed..04102c5ed 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/resize_nearest_neighbor.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/resize_nearest_neighbor.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/rnn_float16.mod.py b/tests/nnapi/specs/skip/V1_2/rnn_float16.mod.py
index 7968c556c..7968c556c 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/rnn_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/rnn_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/roi_align.mod.py b/tests/nnapi/specs/skip/V1_2/roi_align.mod.py
index d1b1303c2..d1b1303c2 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/roi_align.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/roi_align.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/roi_pooling.mod.py b/tests/nnapi/specs/skip/V1_2/roi_pooling.mod.py
index f4135c5b4..f4135c5b4 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/roi_pooling.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/roi_pooling.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/select_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/select_v1_2.mod.py
index 4acaff2ec..4acaff2ec 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/select_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/select_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/sin.mod.py b/tests/nnapi/specs/skip/V1_2/sin.mod.py
index 7f2fcbb8b..7f2fcbb8b 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/sin.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/sin.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/slice.mod.py b/tests/nnapi/specs/skip/V1_2/slice.mod.py
deleted file mode 100644
index f3683ba10..000000000
--- a/tests/nnapi/specs/skip/V1_2/slice.mod.py
+++ /dev/null
@@ -1,147 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-import collections
-
-TestCase = collections.namedtuple("TestCase", [
-    "inp", "inp_data", "begin", "begin_data", "size", "size_data", "output",
-    "output_data"
-])
-
-test_cases = [
-    TestCase(
-        inp=Input("input", "TENSOR_FLOAT32", "{4}"),
-        inp_data=[1, 2, 3, 4],
-        begin=Input("begin", "TENSOR_INT32", "{1}"),
-        begin_data=[1],
-        size=Input("size", "TENSOR_INT32", "{1}"),
-        size_data=[2],
-        output=Output("output", "TENSOR_FLOAT32", "{2}"),
-        output_data=[2, 3]),
-    TestCase(
-        inp=Input("input", "TENSOR_FLOAT32", "{2,3}"),
-        inp_data=[1, 2, 3, 4, 5, 6],
-        begin=Input("begin", "TENSOR_INT32", "{2}"),
-        begin_data=[1, 0],
-        size=Input("size", "TENSOR_INT32", "{2}"),
-        size_data=[1, 2],
-        output=Output("output", "TENSOR_FLOAT32", "{1, 2}"),
-        output_data=[4, 5]),
-    TestCase(
-        inp=Input("input", "TENSOR_FLOAT32", "{2,3,2}"),
-        inp_data=[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
-        begin=Input("begin", "TENSOR_INT32", "{3}"),
-        begin_data=[0, 0, 0],
-        size=Input("size", "TENSOR_INT32", "{3}"),
-        size_data=[2, 3, 2],
-        output=Output("output", "TENSOR_FLOAT32", "{2, 3, 2}"),
-        output_data=[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]),
-    TestCase(
-        inp=Input("input", "TENSOR_FLOAT32", "{4, 1, 1, 1}"),
-        inp_data=[1, 2, 3, 4],
-        begin=Input("begin", "TENSOR_INT32", "{4}"),
-        begin_data=[1, 0, 0, 0],
-        size=Input("size", "TENSOR_INT32", "{4}"),
-        size_data=[3, 1, 1, 1],
-        output=Output("output", "TENSOR_FLOAT32", "{3, 1, 1, 1}"),
-        output_data=[2, 3, 4]),
-    TestCase(
-        inp=Input("input", "TENSOR_INT32", "{3, 2, 3, 1}"),
-        inp_data=[1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6],
-        begin=Input("begin", "TENSOR_INT32", "{4}"),
-        begin_data=[1, 0, 0, 0],
-        size=Input("size", "TENSOR_INT32", "{4}"),
-        size_data=[1, 1, 3, 1],
-        output=Output("output", "TENSOR_INT32", "{1, 1, 3, 1}"),
-        output_data=[3, 3, 3]),
-    TestCase(
-        inp=Input("input", "TENSOR_INT32", "{3, 2, 3, 1}"),
-        inp_data=[1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6],
-        begin=Input("begin", "TENSOR_INT32", "{4}"),
-        begin_data=[1, 0, 0, 0],
-        size=Input("size", "TENSOR_INT32", "{4}"),
-        size_data=[2, 1, 3, 1],
-        output=Output("output", "TENSOR_INT32", "{2, 1, 3, 1}"),
-        output_data=[3, 3, 3, 5, 5, 5]),
-    TestCase(
-        inp=Input("input", "TENSOR_QUANT8_ASYMM", "{3, 2, 3, 1}, 2.0, 128"),
-        inp_data=[1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6],
-        begin=Input("begin", "TENSOR_INT32", "{4}"),
-        begin_data=[1, 0, 0, 0],
-        size=Input("size", "TENSOR_INT32", "{4}"),
-        size_data=[2, 1, 3, 1],
-        output=Output("output", "TENSOR_QUANT8_ASYMM", "{2, 1, 3, 1}, 2.0, 128"),
-        output_data=[3, 3, 3, 5, 5, 5]),
-    TestCase(
-        inp=Input("input", "TENSOR_INT32", "{3, 2, 3, 1}"),
-        inp_data=[1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6],
-        begin=Input("begin", "TENSOR_INT32", "{4}"),
-        begin_data=[1, 0, 0, 0],
-        size=Input("size", "TENSOR_INT32", "{4}"),
-        size_data=[2, 1, -1, 1],
-        output=Output("output", "TENSOR_INT32", "{2, 1, 3, 1}"),
-        output_data=[3, 3, 3, 5, 5, 5]),
-]
-
-for test_case in test_cases:
-  model = Model().Operation("SLICE", test_case.inp, test_case.begin,
-                            test_case.size).To(test_case.output)
-  Example({
-      test_case.inp: test_case.inp_data,
-      test_case.begin: test_case.begin_data,
-      test_case.size: test_case.size_data,
-      test_case.output: test_case.output_data,
-  },
-          model=model).AddVariations("relaxed", "float16")
-
-
-# zero-sized input
-
-# Use BOX_WITH_NMS_LIMIT op to generate a zero-sized internal tensor for box cooridnates.
-p1 = Parameter("scores", "TENSOR_FLOAT32", "{1, 2}", [0.90, 0.10]) # scores
-p2 = Parameter("roi", "TENSOR_FLOAT32", "{1, 8}", [1, 1, 10, 10, 0, 0, 10, 10]) # roi
-o1 = Output("scoresOut", "TENSOR_FLOAT32", "{0}") # scores out
-o2 = Output("classesOut", "TENSOR_INT32", "{0}") # classes out
-tmp1 = Internal("roiOut", "TENSOR_FLOAT32", "{0, 4}") # roi out
-tmp2 = Internal("batchSplitOut", "TENSOR_INT32", "{0}") # batch split out
-model = Model("zero_sized").Operation("BOX_WITH_NMS_LIMIT", p1, p2, [0], 0.3,  -1, 0, 0.4, 1.0, 0.3).To(o1, tmp1, o2, tmp2)
-
-# Use ROI_ALIGN op to convert into zero-sized feature map.
-layout = BoolScalar("layout", False) # NHWC
-i1 = Input("in", "TENSOR_FLOAT32", "{1, 1, 1, 1}")
-zero_sized = Internal("featureMap", "TENSOR_FLOAT32", "{0, 2, 2, 1}")
-model = model.Operation("ROI_ALIGN", i1, tmp1, tmp2, 2, 2, 2.0, 2.0, 4, 4, layout).To(zero_sized)
-
-# SLICE op with numBatches = 0.
-o3 = Output("out", "TENSOR_FLOAT32", "{0, 1, 1, 1}") # out
-model = model.Operation("SLICE", zero_sized, [0, 1, 1, 0], [-1, 1, -1, 1]).To(o3)
-
-quant8 = DataTypeConverter().Identify({
-    p1: ("TENSOR_QUANT8_ASYMM", 0.1, 128),
-    p2: ("TENSOR_QUANT16_ASYMM", 0.125, 0),
-    o1: ("TENSOR_QUANT8_ASYMM", 0.1, 128),
-    tmp1: ("TENSOR_QUANT16_ASYMM", 0.125, 0),
-    i1: ("TENSOR_QUANT8_ASYMM", 0.1, 128),
-    zero_sized: ("TENSOR_QUANT8_ASYMM", 0.1, 128),
-    o3: ("TENSOR_QUANT8_ASYMM", 0.1, 128)
-})
-
-# Create test case with dummy values.
-Example({
-    i1: [1],
-    o1: [0],
-    o2: [0],
-    o3: [0],
-}).AddVariations("relaxed", quant8, "float16")
diff --git a/tests/nnapi/specs/skip/V1_2/softmax_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/softmax_v1_2.mod.py
index 5983b05a0..5983b05a0 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/softmax_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/softmax_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/space_to_batch_quant8_nonzero.mod.py b/tests/nnapi/specs/skip/V1_2/space_to_batch_quant8_nonzero.mod.py
index 2d0d710e8..2d0d710e8 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/space_to_batch_quant8_nonzero.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/space_to_batch_quant8_nonzero.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/space_to_batch_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/space_to_batch_v1_2.mod.py
index 356fae5d8..356fae5d8 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/space_to_batch_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/space_to_batch_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/space_to_depth_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/space_to_depth_v1_2.mod.py
index 9f1a799fe..9f1a799fe 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/space_to_depth_v1_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/space_to_depth_v1_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/split_float_1.mod.py b/tests/nnapi/specs/skip/V1_2/split_float_1.mod.py
deleted file mode 100644
index d1bdc4561..000000000
--- a/tests/nnapi/specs/skip/V1_2/split_float_1.mod.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# model
-input0 = Input("input0", "TENSOR_FLOAT32", "{6}")
-axis = Int32Scalar("axis", 0)
-num_splits = Int32Scalar("num_splits", 3)
-output0 = Output("output0", "TENSOR_FLOAT32", "{2}")
-output1 = Output("output1", "TENSOR_FLOAT32", "{2}")
-output2 = Output("output2", "TENSOR_FLOAT32", "{2}")
-
-model = Model().Operation("SPLIT", input0, axis, num_splits).To((output0, output1, output2))
-
-# Example 1.
-input_dict = {
-    input0: [1.0, 2.0, 3.0, 4.0, 5.0, 6.0]
-}
-output_dict = {
-    output0: [1.0, 2.0],
-    output1: [3.0, 4.0],
-    output2: [5.0, 6.0],
-}
-
-# Instantiate an example
-Example((input_dict, output_dict)).AddVariations("relaxed", "float16")
diff --git a/tests/nnapi/specs/skip/V1_2/split_float_2.mod.py b/tests/nnapi/specs/skip/V1_2/split_float_2.mod.py
deleted file mode 100644
index a1610327e..000000000
--- a/tests/nnapi/specs/skip/V1_2/split_float_2.mod.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# model
-input0 = Input("input0", "TENSOR_FLOAT32", "{2, 3}")
-axis = Int32Scalar("axis", 0)
-num_splits = Int32Scalar("num_splits", 2)
-output0 = Output("output0", "TENSOR_FLOAT32", "{1, 3}")
-output1 = Output("output1", "TENSOR_FLOAT32", "{1, 3}")
-
-model = Model().Operation("SPLIT", input0, axis, num_splits).To((output0, output1))
-
-# Example 1.
-input_dict = {
-    input0: [1.0, 2.0, 3.0,
-             4.0, 5.0, 6.0]
-}
-output_dict = {
-    output0: [1.0, 2.0, 3.0],
-    output1: [4.0, 5.0, 6.0],
-}
-
-# Instantiate an example
-Example((input_dict, output_dict)).AddVariations("relaxed", "float16")
diff --git a/tests/nnapi/specs/skip/V1_2/split_float_3.mod.py b/tests/nnapi/specs/skip/V1_2/split_float_3.mod.py
deleted file mode 100644
index 56b87e53c..000000000
--- a/tests/nnapi/specs/skip/V1_2/split_float_3.mod.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# model
-input0 = Input("input0", "TENSOR_FLOAT32", "{2, 3}")
-axis = Int32Scalar("axis", 1)
-num_splits = Int32Scalar("num_splits", 3)
-output0 = Output("output0", "TENSOR_FLOAT32", "{2, 1}")
-output1 = Output("output1", "TENSOR_FLOAT32", "{2, 1}")
-output2 = Output("output2", "TENSOR_FLOAT32", "{2, 1}")
-
-model = Model().Operation("SPLIT", input0, axis, num_splits).To((output0, output1, output2))
-
-# Example 1.
-input_dict = {
-    input0: [1.0, 2.0, 3.0,
-             4.0, 5.0, 6.0]
-}
-output_dict = {
-    output0: [1.0, 4.0],
-    output1: [2.0, 5.0],
-    output2: [3.0, 6.0],
-}
-
-# Instantiate an example
-Example((input_dict, output_dict)).AddVariations("relaxed", "float16")
diff --git a/tests/nnapi/specs/skip/V1_2/split_float_4.mod.py b/tests/nnapi/specs/skip/V1_2/split_float_4.mod.py
deleted file mode 100644
index a9bf5a70a..000000000
--- a/tests/nnapi/specs/skip/V1_2/split_float_4.mod.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# model
-input0 = Input("input0", "TENSOR_FLOAT32", "{2, 2, 2}")
-axis = Int32Scalar("axis", 1)
-num_splits = Int32Scalar("num_splits", 2)
-output0 = Output("output0", "TENSOR_FLOAT32", "{2, 1, 2}")
-output1 = Output("output1", "TENSOR_FLOAT32", "{2, 1, 2}")
-
-model = Model().Operation("SPLIT", input0, axis, num_splits).To((output0, output1))
-
-# Example 1.
-input_dict = {
-    input0: [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0]
-}
-output_dict = {
-    output0: [1.0, 2.0, 5.0, 6.0],
-    output1: [3.0, 4.0, 7.0, 8.0],
-}
-
-# Instantiate an example
-Example((input_dict, output_dict)).AddVariations("relaxed", "float16")
diff --git a/tests/nnapi/specs/skip/V1_2/split_float_5.mod.py b/tests/nnapi/specs/skip/V1_2/split_float_5.mod.py
deleted file mode 100644
index ad6621aeb..000000000
--- a/tests/nnapi/specs/skip/V1_2/split_float_5.mod.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# model
-input0 = Input("input0", "TENSOR_FLOAT32", "{2, 2, 2}")
-axis = Int32Scalar("axis", -2)
-num_splits = Int32Scalar("num_splits", 2)
-output0 = Output("output0", "TENSOR_FLOAT32", "{2, 1, 2}")
-output1 = Output("output1", "TENSOR_FLOAT32", "{2, 1, 2}")
-
-model = Model().Operation("SPLIT", input0, axis, num_splits).To((output0, output1))
-
-# Example 1.
-input_dict = {
-    input0: [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0]
-}
-output_dict = {
-    output0: [1.0, 2.0, 5.0, 6.0],
-    output1: [3.0, 4.0, 7.0, 8.0],
-}
-
-# Instantiate an example
-Example((input_dict, output_dict)).AddVariations("relaxed", "float16")
diff --git a/tests/nnapi/specs/skip/V1_2/split_int32_1.mod.py b/tests/nnapi/specs/skip/V1_2/split_int32_1.mod.py
deleted file mode 100644
index 313505a9a..000000000
--- a/tests/nnapi/specs/skip/V1_2/split_int32_1.mod.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# model
-input0 = Input("input0", "TENSOR_INT32", "{6}")
-axis = Int32Scalar("axis", 0)
-num_splits = Int32Scalar("num_splits", 3)
-output0 = Output("output0", "TENSOR_INT32", "{2}")
-output1 = Output("output1", "TENSOR_INT32", "{2}")
-output2 = Output("output2", "TENSOR_INT32", "{2}")
-
-model = Model().Operation("SPLIT", input0, axis, num_splits).To((output0, output1, output2))
-
-# Example 1.
-input_dict = {
-    input0: [1, 2, 3, 4, 5, 6]
-}
-output_dict = {
-    output0: [1, 2],
-    output1: [3, 4],
-    output2: [5, 6],
-}
-
-# Instantiate an example
-Example((input_dict, output_dict)).AddRelaxed()
diff --git a/tests/nnapi/specs/skip/V1_2/split_int32_2.mod.py b/tests/nnapi/specs/skip/V1_2/split_int32_2.mod.py
deleted file mode 100644
index 4ad52d361..000000000
--- a/tests/nnapi/specs/skip/V1_2/split_int32_2.mod.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# model
-input0 = Input("input0", "TENSOR_INT32", "{2, 3}")
-axis = Int32Scalar("axis", 0)
-num_splits = Int32Scalar("num_splits", 2)
-output0 = Output("output0", "TENSOR_INT32", "{1, 3}")
-output1 = Output("output1", "TENSOR_INT32", "{1, 3}")
-
-model = Model().Operation("SPLIT", input0, axis, num_splits).To((output0, output1))
-
-# Example 1.
-input_dict = {
-    input0: [1, 2, 3,
-             4, 5, 6]
-}
-output_dict = {
-    output0: [1, 2, 3],
-    output1: [4, 5, 6],
-}
-
-# Instantiate an example
-Example((input_dict, output_dict)).AddRelaxed()
diff --git a/tests/nnapi/specs/skip/V1_2/split_int32_3.mod.py b/tests/nnapi/specs/skip/V1_2/split_int32_3.mod.py
deleted file mode 100644
index 0e8acb63a..000000000
--- a/tests/nnapi/specs/skip/V1_2/split_int32_3.mod.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# model
-input0 = Input("input0", "TENSOR_INT32", "{2, 3}")
-axis = Int32Scalar("axis", 1)
-num_splits = Int32Scalar("num_splits", 3)
-output0 = Output("output0", "TENSOR_INT32", "{2, 1}")
-output1 = Output("output1", "TENSOR_INT32", "{2, 1}")
-output2 = Output("output2", "TENSOR_INT32", "{2, 1}")
-
-model = Model().Operation("SPLIT", input0, axis, num_splits).To((output0, output1, output2))
-
-# Example 1.
-input_dict = {
-    input0: [1, 2, 3,
-             4, 5, 6]
-}
-output_dict = {
-    output0: [1, 4],
-    output1: [2, 5],
-    output2: [3, 6],
-}
-
-# Instantiate an example
-Example((input_dict, output_dict)).AddRelaxed()
diff --git a/tests/nnapi/specs/skip/V1_2/split_int32_4.mod.py b/tests/nnapi/specs/skip/V1_2/split_int32_4.mod.py
deleted file mode 100644
index e84abcd84..000000000
--- a/tests/nnapi/specs/skip/V1_2/split_int32_4.mod.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# model
-input0 = Input("input0", "TENSOR_INT32", "{2, 2, 2}")
-axis = Int32Scalar("axis", 1)
-num_splits = Int32Scalar("num_splits", 2)
-output0 = Output("output0", "TENSOR_INT32", "{2, 1, 2}")
-output1 = Output("output1", "TENSOR_INT32", "{2, 1, 2}")
-
-model = Model().Operation("SPLIT", input0, axis, num_splits).To((output0, output1))
-
-# Example 1.
-input_dict = {
-    input0: [1, 2, 3, 4, 5, 6, 7, 8]
-}
-output_dict = {
-    output0: [1, 2, 5, 6],
-    output1: [3, 4, 7, 8],
-}
-
-# Instantiate an example
-Example((input_dict, output_dict)).AddRelaxed()
diff --git a/tests/nnapi/specs/skip/V1_2/split_quant8_1.mod.py b/tests/nnapi/specs/skip/V1_2/split_quant8_1.mod.py
deleted file mode 100644
index 0c4723775..000000000
--- a/tests/nnapi/specs/skip/V1_2/split_quant8_1.mod.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# model
-input0 = Input("input0", "TENSOR_QUANT8_ASYMM", "{6}, 1.0, 0")
-axis = Int32Scalar("axis", 0)
-num_splits = Int32Scalar("num_splits", 3)
-output0 = Output("output0", "TENSOR_QUANT8_ASYMM", "{2}, 1.0, 0")
-output1 = Output("output1", "TENSOR_QUANT8_ASYMM", "{2}, 1.0, 0")
-output2 = Output("output2", "TENSOR_QUANT8_ASYMM", "{2}, 1.0, 0")
-
-model = Model().Operation("SPLIT", input0, axis, num_splits).To((output0, output1, output2))
-
-# Example 1.
-input_dict = {
-    input0: [1, 2, 3, 4, 5, 6]
-}
-output_dict = {
-    output0: [1, 2],
-    output1: [3, 4],
-    output2: [5, 6],
-}
-
-# Instantiate an example
-Example((input_dict, output_dict)).AddRelaxed()
diff --git a/tests/nnapi/specs/skip/V1_2/split_quant8_2.mod.py b/tests/nnapi/specs/skip/V1_2/split_quant8_2.mod.py
deleted file mode 100644
index 4c24dace9..000000000
--- a/tests/nnapi/specs/skip/V1_2/split_quant8_2.mod.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# model
-input0 = Input("input0", "TENSOR_QUANT8_ASYMM", "{2, 3}, 2.0, 3")
-axis = Int32Scalar("axis", 0)
-num_splits = Int32Scalar("num_splits", 2)
-output0 = Output("output0", "TENSOR_QUANT8_ASYMM", "{1, 3}, 2.0, 3")
-output1 = Output("output1", "TENSOR_QUANT8_ASYMM", "{1, 3}, 2.0, 3")
-
-model = Model().Operation("SPLIT", input0, axis, num_splits).To((output0, output1))
-
-# Example 1.
-input_dict = {
-    input0: [1, 2, 3,
-             4, 5, 6]
-}
-output_dict = {
-    output0: [1, 2, 3],
-    output1: [4, 5, 6],
-}
-
-# Instantiate an example
-Example((input_dict, output_dict)).AddRelaxed()
diff --git a/tests/nnapi/specs/skip/V1_2/split_quant8_3.mod.py b/tests/nnapi/specs/skip/V1_2/split_quant8_3.mod.py
deleted file mode 100644
index 813f1a332..000000000
--- a/tests/nnapi/specs/skip/V1_2/split_quant8_3.mod.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# model
-input0 = Input("input0", "TENSOR_QUANT8_ASYMM", "{2, 3}, 2.0, 3")
-axis = Int32Scalar("axis", 1)
-num_splits = Int32Scalar("num_splits", 3)
-output0 = Output("output0", "TENSOR_QUANT8_ASYMM", "{2, 1}, 2.0, 3")
-output1 = Output("output1", "TENSOR_QUANT8_ASYMM", "{2, 1}, 2.0, 3")
-output2 = Output("output2", "TENSOR_QUANT8_ASYMM", "{2, 1}, 2.0, 3")
-
-model = Model().Operation("SPLIT", input0, axis, num_splits).To((output0, output1, output2))
-
-# Example 1.
-input_dict = {
-    input0: [1, 2, 3,
-             4, 5, 6]
-}
-output_dict = {
-    output0: [1, 4],
-    output1: [2, 5],
-    output2: [3, 6],
-}
-
-# Instantiate an example
-Example((input_dict, output_dict))
diff --git a/tests/nnapi/specs/skip/V1_2/split_quant8_4.mod.py b/tests/nnapi/specs/skip/V1_2/split_quant8_4.mod.py
deleted file mode 100644
index 51e5d5de2..000000000
--- a/tests/nnapi/specs/skip/V1_2/split_quant8_4.mod.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# model
-input0 = Input("input0", "TENSOR_QUANT8_ASYMM", "{2, 2, 2}, 1.0, 0")
-axis = Int32Scalar("axis", 1)
-num_splits = Int32Scalar("num_splits", 2)
-output0 = Output("output0", "TENSOR_QUANT8_ASYMM", "{2, 1, 2}, 1.0, 0")
-output1 = Output("output1", "TENSOR_QUANT8_ASYMM", "{2, 1, 2}, 1.0, 0")
-
-model = Model().Operation("SPLIT", input0, axis, num_splits).To((output0, output1))
-
-# Example 1.
-input_dict = {
-    input0: [1, 2, 3, 4, 5, 6, 7, 8]
-}
-output_dict = {
-    output0: [1, 2, 5, 6],
-    output1: [3, 4, 7, 8],
-}
-
-# Instantiate an example
-Example((input_dict, output_dict))
diff --git a/tests/nnapi/specs/skip/V1_2/squeeze_float16.mod.py b/tests/nnapi/specs/skip/V1_2/squeeze_float16.mod.py
index e5f18a524..e5f18a524 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/squeeze_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/squeeze_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/strided_slice_float16.mod.py b/tests/nnapi/specs/skip/V1_2/strided_slice_float16.mod.py
index 88735f54e..88735f54e 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/strided_slice_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/strided_slice_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/sub_quantized_different_scales.mod.py b/tests/nnapi/specs/skip/V1_2/sub_quantized_different_scales.mod.py
index 61bda3747..61bda3747 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/sub_quantized_different_scales.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/sub_quantized_different_scales.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/sub_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/sub_v1_2.mod.py
deleted file mode 100644
index 86299762d..000000000
--- a/tests/nnapi/specs/skip/V1_2/sub_v1_2.mod.py
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-import random
-
-random.seed(0)
-
-# FLOAT32 and FLOAT16
-input0 = Input("input0", "TENSOR_FLOAT32", "{1, 2, 2, 1}")
-input1 = Input("input1", "TENSOR_FLOAT32", "{1, 2, 2, 1}")
-activation = Int32Scalar("act", 0)
-output0 = Output("output0", "TENSOR_FLOAT32",  "{1, 2, 2, 1}")
-
-model = Model().Operation("SUB", input0, input1, activation).To(output0)
-
-Example({
-    input0: [2.0, -4.0, 8.0, -16.0],
-    input1: [2.0, -2.0, -4.0, 4.0],
-    output0: [0.0, -2.0, 12.0, -20.0],
-}).AddVariations("float16").AddAllActivations(output0, activation)
-
-
-# QUANT8_ASYMM
-shape = "{2, 4, 16, 2}, 0.5, 0"
-input0 = Input("input0", "TENSOR_QUANT8_ASYMM", shape)
-input1 = Input("input1", "TENSOR_QUANT8_ASYMM", shape)
-activation = 0
-output0 = Output("output0", "TENSOR_QUANT8_ASYMM", shape)
-
-model = Model("quant8").Operation("SUB", input0, input1, activation).To(output0)
-
-input0_values = list(range(256))
-input1_values = list(input0_values)
-random.shuffle(input1_values)
-output_values = [max(0, a - b) for a, b in zip(input0_values, input1_values)]
-
-Example({
-    input0: input0_values,
-    input1: input1_values,
-    output0: output_values,
-})
-
-# SUB of data type TENSOR_FLOAT32 is introduced in V1_1.
-Example.SetVersion("V1_1", "sub_v1_2_none", "sub_v1_2_relu", "sub_v1_2_relu1", "sub_v1_2_relu6")
-
-
-# SUB, zero-sized input
-
-# Use BOX_WITH_NMS_LIMIT op to generate a zero-sized internal tensor for box cooridnates.
-p1 = Parameter("scores", "TENSOR_FLOAT32", "{1, 2}", [0.90, 0.10]) # scores
-p2 = Parameter("roi", "TENSOR_FLOAT32", "{1, 8}", [1, 1, 10, 10, 0, 0, 10, 10]) # roi
-o1 = Output("scoresOut", "TENSOR_FLOAT32", "{0}") # scores out
-o2 = Output("classesOut", "TENSOR_INT32", "{0}") # classes out
-tmp1 = Internal("roiOut", "TENSOR_FLOAT32", "{0, 4}") # roi out
-tmp2 = Internal("batchSplitOut", "TENSOR_INT32", "{0}") # batch split out
-model = Model("zero_sized").Operation("BOX_WITH_NMS_LIMIT", p1, p2, [0], 0.3,  -1, 0, 0.4, 1.0, 0.3).To(o1, tmp1, o2, tmp2)
-
-# Use ROI_ALIGN op to convert into zero-sized feature map.
-layout = BoolScalar("layout", False) # NHWC
-i1 = Input("in", "TENSOR_FLOAT32", "{1, 1, 1, 2}")
-zero_sized = Internal("featureMap", "TENSOR_FLOAT32", "{0, 2, 2, 2}")
-model = model.Operation("ROI_ALIGN", i1, tmp1, tmp2, 2, 2, 2.0, 2.0, 4, 4, layout).To(zero_sized)
-
-# SUB op with numBatches = 0.
-i2 = Parameter("op", "TENSOR_FLOAT32", "{1, 2, 2, 1}", [1, 2, 3, 4]) # weights
-o3 = Output("out", "TENSOR_FLOAT32", "{0, 2, 2, 2}") # out
-model = model.Operation("SUB", zero_sized, i2, 0).To(o3)
-
-quant8 = DataTypeConverter().Identify({
-    p1: ("TENSOR_QUANT8_ASYMM", 0.1, 128),
-    p2: ("TENSOR_QUANT16_ASYMM", 0.125, 0),
-    o1: ("TENSOR_QUANT8_ASYMM", 0.1, 128),
-    tmp1: ("TENSOR_QUANT16_ASYMM", 0.125, 0),
-    i1: ("TENSOR_QUANT8_ASYMM", 0.1, 128),
-    zero_sized: ("TENSOR_QUANT8_ASYMM", 0.1, 128),
-    i2: ("TENSOR_QUANT8_ASYMM", 0.1, 128),
-    o3: ("TENSOR_QUANT8_ASYMM", 0.1, 128)
-})
-
-# Create test case with dummy values.
-Example({
-    i1: [1, 2],
-    o1: [0],
-    o2: [0],
-    o3: [0],
-}).AddVariations("relaxed", quant8, "float16")
diff --git a/tests/nnapi/specs/skip/V1_2/sub_v1_2_broadcast.mod.py b/tests/nnapi/specs/skip/V1_2/sub_v1_2_broadcast.mod.py
deleted file mode 100644
index 5a755117b..000000000
--- a/tests/nnapi/specs/skip/V1_2/sub_v1_2_broadcast.mod.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# FLOAT32 and FLOAT16
-input0 = Input("input0", "TENSOR_FLOAT32", "{1, 2}")
-input1 = Input("input1", "TENSOR_FLOAT32", "{2, 2}")
-activation = Int32Scalar("act", 0)
-output0 = Output("output0", "TENSOR_FLOAT32", "{2, 2}")
-
-model = Model().Operation("SUB", input0, input1, activation).To(output0)
-
-input0_values = [10, 20]
-input1_values = [0.1, 0.2,
-                 0.3, 0.4]
-output_values = [9.9, 19.8,
-                 9.7, 19.6]
-
-Example({
-    input0: input0_values,
-    input1: input1_values,
-    output0: output_values,
-}).AddVariations("float16").AddAllActivations(output0, activation)
-
-
-# QUANT8_ASYMM
-input0 = Input("input0", "TENSOR_QUANT8_ASYMM", "{1, 2}, 1.0, 0")
-input1 = Input("input1", "TENSOR_QUANT8_ASYMM", "{2, 2}, 1.0, 0")
-activation = 0
-output0 = Output("output0", "TENSOR_QUANT8_ASYMM", "{2, 2}, 1.0, 0")
-
-model = Model("quant8").Operation("SUB", input0, input1, activation).To(output0)
-
-input0_values = [100, 200]
-input1_values = [1, 2,
-                 3, 4]
-output_values = [99, 198,
-                 97, 196]
-
-Example({
-    input0: input0_values,
-    input1: input1_values,
-    output0: output_values,
-})
-
-# SUB of data type TENSOR_FLOAT32 is introduced in V1_1.
-Example.SetVersion("V1_1", "sub_v1_2_broadcast_none", "sub_v1_2_broadcast_relu", \
-                           "sub_v1_2_broadcast_relu1", "sub_v1_2_broadcast_relu6")
diff --git a/tests/nnapi/specs/skip/V1_2/svdf_bias_present_float16.mod.py b/tests/nnapi/specs/skip/V1_2/svdf_bias_present_float16.mod.py
index 4dc691400..4dc691400 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/svdf_bias_present_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/svdf_bias_present_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/svdf_float16.mod.py b/tests/nnapi/specs/skip/V1_2/svdf_float16.mod.py
index 2b0f368d3..2b0f368d3 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/svdf_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/svdf_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/svdf_state_float16.mod.py b/tests/nnapi/specs/skip/V1_2/svdf_state_float16.mod.py
index f8fcae7b0..f8fcae7b0 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/svdf_state_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/svdf_state_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/tanh_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/tanh_v1_2.mod.py
deleted file mode 100644
index c65d09fdb..000000000
--- a/tests/nnapi/specs/skip/V1_2/tanh_v1_2.mod.py
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# Copyright (C) 2019 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# TEST 1
-input0 = Input("input0", "TENSOR_FLOAT16", "{1, 2, 2, 1}")
-output0 = Output("output0", "TENSOR_FLOAT16", "{1, 2, 2, 1}")
-
-model = Model().Operation("TANH", input0).To(output0)
-
-Example({
-    input0: [-1, 0, 1, 10],
-    output0: [-.761594156, 0, .761594156, 0.999999996],
-})
-
-
-# TEST 2
-input_scale, input_offset = 0.05, 100
-output_scale, output_offset = 1.0 / 128, 128  # Required.
-
-def dequantize(x):
-  return (x - input_offset) * input_scale
-
-def quantize(x):
-  return max(0, min(255, int(round(x / output_scale)) + output_offset))
-
-input0 = Input("input0", "TENSOR_QUANT8_ASYMM", "{256}, %g, %d" % (input_scale, input_offset))
-output0 = Output("output0", "TENSOR_QUANT8_ASYMM", "{256}, %g, %d" % (output_scale, output_offset))
-model = Model().Operation("TANH", input0).To(output0)
-
-input_values = list(range(256))
-output_values = [quantize(math.tanh(dequantize(x))) for x in input_values]
-
-Example({
-    input0: input_values,
-    output0: output_values,
-})
-
-
-# TEST 3: zero-sized input
-
-# Use BOX_WITH_NMS_LIMIT op to generate a zero-sized internal tensor for box cooridnates.
-p1 = Parameter("scores", "TENSOR_FLOAT32", "{1, 2}", [0.90, 0.10]) # scores
-p2 = Parameter("roi", "TENSOR_FLOAT32", "{1, 8}", [1, 1, 10, 10, 0, 0, 10, 10]) # roi
-o1 = Output("scoresOut", "TENSOR_FLOAT32", "{0}") # scores out
-o2 = Output("classesOut", "TENSOR_INT32", "{0}") # classes out
-tmp1 = Internal("roiOut", "TENSOR_FLOAT32", "{0, 4}") # roi out
-tmp2 = Internal("batchSplitOut", "TENSOR_INT32", "{0}") # batch split out
-model = Model("zero_sized").Operation("BOX_WITH_NMS_LIMIT", p1, p2, [0], 0.3,  -1, 0, 0.4, 1.0, 0.3).To(o1, tmp1, o2, tmp2)
-
-# Use ROI_ALIGN op to convert into zero-sized feature map.
-layout = BoolScalar("layout", False) # NHWC
-i1 = Input("in", "TENSOR_FLOAT32", "{1, 1, 1, 1}")
-zero_sized = Internal("featureMap", "TENSOR_FLOAT32", "{0, 2, 2, 1}")
-model = model.Operation("ROI_ALIGN", i1, tmp1, tmp2, 2, 2, 2.0, 2.0, 4, 4, layout).To(zero_sized)
-
-# TANH op with numBatches = 0.
-o3 = Output("out", "TENSOR_FLOAT32", "{0, 2, 2, 1}") # out
-model = model.Operation("TANH", zero_sized).To(o3)
-
-quant8 = DataTypeConverter().Identify({
-    p1: ("TENSOR_QUANT8_ASYMM", 0.1, 128),
-    p2: ("TENSOR_QUANT16_ASYMM", 0.125, 0),
-    o1: ("TENSOR_QUANT8_ASYMM", 0.1, 128),
-    tmp1: ("TENSOR_QUANT16_ASYMM", 0.125, 0),
-    i1: ("TENSOR_QUANT8_ASYMM", 0.1, 128),
-    zero_sized: ("TENSOR_QUANT8_ASYMM", 0.1, 128),
-    o3: ("TENSOR_QUANT8_ASYMM", 1.0 / 128, 128)
-})
-
-# Create test case with dummy values.
-Example({
-    i1: [1],
-    o1: [0],
-    o2: [0],
-    o3: [0],
-}).AddVariations("relaxed", quant8, "float16")
diff --git a/tests/nnapi/specs/skip/V1_2/tile_1.mod.py b/tests/nnapi/specs/skip/V1_2/tile_1.mod.py
index 8cc71be4b..8cc71be4b 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/tile_1.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/tile_1.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/tile_2.mod.py b/tests/nnapi/specs/skip/V1_2/tile_2.mod.py
index 2ef0366cb..2ef0366cb 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/tile_2.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/tile_2.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/tile_3.mod.py b/tests/nnapi/specs/skip/V1_2/tile_3.mod.py
index 2b949a6f1..2b949a6f1 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/tile_3.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/tile_3.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/transpose_conv2d.mod.py b/tests/nnapi/specs/skip/V1_2/transpose_conv2d.mod.py
index 5a91c12fe..5a91c12fe 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/transpose_conv2d.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/transpose_conv2d.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/transpose_conv2d_large.mod.py b/tests/nnapi/specs/skip/V1_2/transpose_conv2d_large.mod.py
index f9a87c1bf..f9a87c1bf 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/transpose_conv2d_large.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/transpose_conv2d_large.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/transpose_float16.mod.py b/tests/nnapi/specs/skip/V1_2/transpose_float16.mod.py
index 79b3796fa..79b3796fa 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/transpose_float16.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/transpose_float16.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/transpose_v1_2.mod.py b/tests/nnapi/specs/skip/V1_2/transpose_v1_2.mod.py
deleted file mode 100644
index 9d0108e8f..000000000
--- a/tests/nnapi/specs/skip/V1_2/transpose_v1_2.mod.py
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# model
-model = Model()
-i1 = Input("input", "TENSOR_FLOAT32", "{2, 2}")
-perms = Input("perms", "TENSOR_INT32", "{0}")
-output = Output("output", "TENSOR_FLOAT32", "{2, 2}")
-
-model = model.Operation("TRANSPOSE", i1, perms).To(output)
-
-# Additional data type
-quant8 = DataTypeConverter().Identify({
-    i1: ("TENSOR_QUANT8_ASYMM", 0.5, 0),
-    output: ("TENSOR_QUANT8_ASYMM", 0.5, 0)
-})
-
-# Instantiate an example
-Example({
-    i1: [1.0, 2.0,
-         3.0, 4.0],
-    perms: [],
-    output: [1.0, 3.0,
-             2.0, 4.0]
-}).AddVariations("relaxed", quant8)
-
-# TRANSPOSE of data type TENSOR_FLOAT32 and TENSOR_QUANT8_ASYMM is introduced in V1_1.
-Example.SetVersion("V1_1", "transpose_v1_2", "transpose_v1_2_quant8")
-
-
-# zero-sized input
-
-# Use BOX_WITH_NMS_LIMIT op to generate a zero-sized internal tensor for box cooridnates.
-p1 = Parameter("scores", "TENSOR_FLOAT32", "{1, 2}", [0.90, 0.10]) # scores
-p2 = Parameter("roi", "TENSOR_FLOAT32", "{1, 8}", [1, 1, 10, 10, 0, 0, 10, 10]) # roi
-o1 = Output("scoresOut", "TENSOR_FLOAT32", "{0}") # scores out
-o2 = Output("classesOut", "TENSOR_INT32", "{0}") # classes out
-tmp1 = Internal("roiOut", "TENSOR_FLOAT32", "{0, 4}") # roi out
-tmp2 = Internal("batchSplitOut", "TENSOR_INT32", "{0}") # batch split out
-model = Model("zero_sized").Operation("BOX_WITH_NMS_LIMIT", p1, p2, [0], 0.3,  -1, 0, 0.4, 1.0, 0.3).To(o1, tmp1, o2, tmp2)
-
-# Use ROI_ALIGN op to convert into zero-sized feature map.
-layout = BoolScalar("layout", False) # NHWC
-i1 = Input("in", "TENSOR_FLOAT32", "{1, 1, 1, 1}")
-zero_sized = Internal("featureMap", "TENSOR_FLOAT32", "{0, 2, 2, 1}")
-model = model.Operation("ROI_ALIGN", i1, tmp1, tmp2, 2, 2, 2.0, 2.0, 4, 4, layout).To(zero_sized)
-
-# TRANSPOSE op with numBatches = 0.
-o3 = Output("out", "TENSOR_FLOAT32", "{0, 1, 2, 2}") # out
-model = model.Operation("TRANSPOSE", zero_sized, [0, 3, 1, 2]).To(o3)
-
-quant8 = DataTypeConverter().Identify({
-    p1: ("TENSOR_QUANT8_ASYMM", 0.1, 128),
-    p2: ("TENSOR_QUANT16_ASYMM", 0.125, 0),
-    o1: ("TENSOR_QUANT8_ASYMM", 0.1, 128),
-    tmp1: ("TENSOR_QUANT16_ASYMM", 0.125, 0),
-    i1: ("TENSOR_QUANT8_ASYMM", 0.1, 128),
-    zero_sized: ("TENSOR_QUANT8_ASYMM", 0.1, 128),
-    o3: ("TENSOR_QUANT8_ASYMM", 0.1, 128)
-})
-
-# Create test case with dummy values.
-Example({
-    i1: [1],
-    o1: [0],
-    o2: [0],
-    o3: [0],
-}).AddVariations("relaxed", quant8, "float16")
diff --git a/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_1step.mod.py b/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_1step.mod.py
index 1e9a633a9..1e9a633a9 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_1step.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_1step.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_batch_major_norm_peephole_projection.mod.py b/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_batch_major_norm_peephole_projection.mod.py
index 08bc3ab5c..08bc3ab5c 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_batch_major_norm_peephole_projection.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_batch_major_norm_peephole_projection.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_batch_major_peephole_projection_bias.mod.py b/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_batch_major_peephole_projection_bias.mod.py
index d4f020e31..d4f020e31 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_batch_major_peephole_projection_bias.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_batch_major_peephole_projection_bias.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_cifg_peephole.mod.py b/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_cifg_peephole.mod.py
index 91bde56ee..91bde56ee 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_cifg_peephole.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_cifg_peephole.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_f16_batch_major.mod.py b/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_f16_batch_major.mod.py
index 4c4e7a8fa..4c4e7a8fa 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_f16_batch_major.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_f16_batch_major.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_f16_norm_peephole_projection.mod.py b/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_f16_norm_peephole_projection.mod.py
index b29308954..b29308954 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_f16_norm_peephole_projection.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_f16_norm_peephole_projection.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_layer_norm_cifg_peephole.mod.py b/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_layer_norm_cifg_peephole.mod.py
index 1fa0ff01a..1fa0ff01a 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_layer_norm_cifg_peephole.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_layer_norm_cifg_peephole.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_norm_peephole_projection.mod.py b/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_norm_peephole_projection.mod.py
index 421fbf72a..421fbf72a 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_norm_peephole_projection.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_lstm_norm_peephole_projection.mod.py
diff --git a/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_rnn.mod.py b/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_rnn.mod.py
index 84ae779eb..84ae779eb 100644..100755
--- a/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_rnn.mod.py
+++ b/tests/nnapi/specs/skip/V1_2/unidirectional_sequence_rnn.mod.py
author	Chunseok Lee <chunseok.lee@samsung.com>	2020-04-23 14:45:49 +0900
committer	Chunseok Lee <chunseok.lee@samsung.com>	2020-04-23 14:45:49 +0900
commit	e2ef8438a24f7c56a0744eb579a6e293ee2fbf8e (patch)
tree	44a1a7951d168dd4370e13593ed03f4bc6d920c5 /tests/nnapi/specs/skip
parent	302e6564a7a76109e1178207e44e45a58631c477 (diff)
download	nnfw-e2ef8438a24f7c56a0744eb579a6e293ee2fbf8e.tar.gz nnfw-e2ef8438a24f7c56a0744eb579a6e293ee2fbf8e.tar.bz2 nnfw-e2ef8438a24f7c56a0744eb579a6e293ee2fbf8e.zip