a96abb0efa890714839590d93810473169d85cf5 - platform/packages/modules/NeuralNetworks

commit	a96abb0efa890714839590d93810473169d85cf5	[log] [tgz]
author	Miao Wang <miaowang@google.com>	Mon Feb 05 18:37:35 2018 -0800
committer	Miao Wang <miaowang@google.com>	Mon Mar 05 12:52:58 2018 -0800
tree	ff736b74bab761fa67ae676ea8e7ebe3a1273129
parent	8c75579a58cf3288eade80147d9035056650c806 [diff]

Create NNAPI v1.1 VTS tests.

  - Split specs files into corresponding subfolders with versioning.
  - Update scripts to be able to handle versioned specs.
  - Generate all_generated_$VER_vts_tests.cpp for VTS.
  - Generate V1_1 op tests for VTS.

Bug: 63911257
Test: mm
Test: NNAPI VTS tests pass on v1.0 and v1.1 sample devices.

Merged-In: I1980561b69a463f4284f539cc252d298aa99a34c
Change-Id: I1980561b69a463f4284f539cc252d298aa99a34c
(cherry picked from commit ecb2eb831e3c3d0ea89637654d3b379d9fce87fe)

common/Android.bp[diff]
runtime/test/generated/all_generated_V1_0_vts_tests.cpp[Renamed from runtime/test/generated/all_generated_vts_tests.cpp - diff]
runtime/test/generated/all_generated_V1_1_vts_tests.cpp[Added - diff]
runtime/test/generated/all_generated_tests.cpp[diff]
runtime/test/generated/vts_models/batch_to_space.model.cpp[Added - diff]
runtime/test/generated/vts_models/div.model.cpp[Added - diff]
runtime/test/generated/vts_models/mean.model.cpp[Added - diff]
runtime/test/generated/vts_models/pad.model.cpp[Added - diff]
runtime/test/generated/vts_models/space_to_batch.model.cpp[Added - diff]
runtime/test/generated/vts_models/squeeze.model.cpp[Added - diff]
runtime/test/generated/vts_models/strided_slice.model.cpp[Added - diff]
runtime/test/generated/vts_models/sub.model.cpp[Added - diff]
runtime/test/generated/vts_models/svdf2.model.cpp[Added - diff]
runtime/test/generated/vts_models/transpose.model.cpp[Added - diff]
runtime/test/specs/V1_0/add.mod.py[Renamed from runtime/test/specs/add.mod.py - diff]
runtime/test/specs/V1_0/add_broadcast_quant8.mod.py[Renamed from runtime/test/specs/add_broadcast_quant8.mod.py - diff]
runtime/test/specs/V1_0/add_quant8.mod.py[Renamed from runtime/test/specs/add_quant8.mod.py - diff]
runtime/test/specs/V1_0/avg_pool_float_1.mod.py[Renamed from runtime/test/specs/avg_pool_float_1.mod.py - diff]
runtime/test/specs/V1_0/avg_pool_float_2.mod.py[Renamed from runtime/test/specs/avg_pool_float_2.mod.py - diff]
runtime/test/specs/V1_0/avg_pool_float_3.mod.py[Renamed from runtime/test/specs/avg_pool_float_3.mod.py - diff]
runtime/test/specs/V1_0/avg_pool_float_4.mod.py[Renamed from runtime/test/specs/avg_pool_float_4.mod.py - diff]
runtime/test/specs/V1_0/avg_pool_quant8_1.mod.py[Renamed from runtime/test/specs/avg_pool_quant8_1.mod.py - diff]
runtime/test/specs/V1_0/avg_pool_quant8_2.mod.py[Renamed from runtime/test/specs/avg_pool_quant8_2.mod.py - diff]
runtime/test/specs/V1_0/avg_pool_quant8_3.mod.py[Renamed from runtime/test/specs/avg_pool_quant8_3.mod.py - diff]
runtime/test/specs/V1_0/avg_pool_quant8_4.mod.py[Renamed from runtime/test/specs/avg_pool_quant8_4.mod.py - diff]
runtime/test/specs/V1_0/concat_float_1.mod.py[Renamed from runtime/test/specs/concat_float_1.mod.py - diff]
runtime/test/specs/V1_0/concat_float_2.mod.py[Renamed from runtime/test/specs/concat_float_2.mod.py - diff]
runtime/test/specs/V1_0/concat_float_3.mod.py[Renamed from runtime/test/specs/concat_float_3.mod.py - diff]
runtime/test/specs/V1_0/concat_quant8_1.mod.py[Renamed from runtime/test/specs/concat_quant8_1.mod.py - diff]
runtime/test/specs/V1_0/concat_quant8_2.mod.py[Renamed from runtime/test/specs/concat_quant8_2.mod.py - diff]
runtime/test/specs/V1_0/concat_quant8_3.mod.py[Renamed from runtime/test/specs/concat_quant8_3.mod.py - diff]
runtime/test/specs/V1_0/conv_1_h3_w2_SAME.mod.py[Renamed from runtime/test/specs/conv_1_h3_w2_SAME.mod.py - diff]
runtime/test/specs/V1_0/conv_1_h3_w2_VALID.mod.py[Renamed from runtime/test/specs/conv_1_h3_w2_VALID.mod.py - diff]
runtime/test/specs/V1_0/conv_3_h3_w2_SAME.mod.py[Renamed from runtime/test/specs/conv_3_h3_w2_SAME.mod.py - diff]
runtime/test/specs/V1_0/conv_3_h3_w2_VALID.mod.py[Renamed from runtime/test/specs/conv_3_h3_w2_VALID.mod.py - diff]
runtime/test/specs/V1_0/conv_float.mod.py[Renamed from runtime/test/specs/conv_float.mod.py - diff]
runtime/test/specs/V1_0/conv_float_channels.mod.py[Renamed from runtime/test/specs/conv_float_channels.mod.py - diff]
runtime/test/specs/V1_0/conv_float_channels_weights_as_inputs.mod.py[Renamed from runtime/test/specs/conv_float_channels_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/conv_float_large.mod.py[Renamed from runtime/test/specs/conv_float_large.mod.py - diff]
runtime/test/specs/V1_0/conv_float_large_weights_as_inputs.mod.py[Renamed from runtime/test/specs/conv_float_large_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/conv_float_weights_as_inputs.mod.py[Renamed from runtime/test/specs/conv_float_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/conv_quant8.mod.py[Renamed from runtime/test/specs/conv_quant8.mod.py - diff]
runtime/test/specs/V1_0/conv_quant8_channels.mod.py[Renamed from runtime/test/specs/conv_quant8_channels.mod.py - diff]
runtime/test/specs/V1_0/conv_quant8_channels_weights_as_inputs.mod.py[Renamed from runtime/test/specs/conv_quant8_channels_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/conv_quant8_large.mod.py[Renamed from runtime/test/specs/conv_quant8_large.mod.py - diff]
runtime/test/specs/V1_0/conv_quant8_large_weights_as_inputs.mod.py[Renamed from runtime/test/specs/conv_quant8_large_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/conv_quant8_overflow.mod.py[Renamed from runtime/test/specs/conv_quant8_overflow.mod.py - diff]
runtime/test/specs/V1_0/conv_quant8_overflow_weights_as_inputs.mod.py[Renamed from runtime/test/specs/conv_quant8_overflow_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/conv_quant8_weights_as_inputs.mod.py[Renamed from runtime/test/specs/conv_quant8_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/depth_to_space_float_1.mod.py[Renamed from runtime/test/specs/depth_to_space_float_1.mod.py - diff]
runtime/test/specs/V1_0/depth_to_space_float_2.mod.py[Renamed from runtime/test/specs/depth_to_space_float_2.mod.py - diff]
runtime/test/specs/V1_0/depth_to_space_float_3.mod.py[Renamed from runtime/test/specs/depth_to_space_float_3.mod.py - diff]
runtime/test/specs/V1_0/depth_to_space_quant8_1.mod.py[Renamed from runtime/test/specs/depth_to_space_quant8_1.mod.py - diff]
runtime/test/specs/V1_0/depth_to_space_quant8_2.mod.py[Renamed from runtime/test/specs/depth_to_space_quant8_2.mod.py - diff]
runtime/test/specs/V1_0/depthwise_conv.mod.py[Renamed from runtime/test/specs/depthwise_conv.mod.py - diff]
runtime/test/specs/V1_0/depthwise_conv2d_float.mod.py[Renamed from runtime/test/specs/depthwise_conv2d_float.mod.py - diff]
runtime/test/specs/V1_0/depthwise_conv2d_float_large.mod.py[Renamed from runtime/test/specs/depthwise_conv2d_float_large.mod.py - diff]
runtime/test/specs/V1_0/depthwise_conv2d_float_large_2.mod.py[Renamed from runtime/test/specs/depthwise_conv2d_float_large_2.mod.py - diff]
runtime/test/specs/V1_0/depthwise_conv2d_float_large_2_weights_as_inputs.mod.py[Renamed from runtime/test/specs/depthwise_conv2d_float_large_2_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/depthwise_conv2d_float_large_weights_as_inputs.mod.py[Renamed from runtime/test/specs/depthwise_conv2d_float_large_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/depthwise_conv2d_float_weights_as_inputs.mod.py[Renamed from runtime/test/specs/depthwise_conv2d_float_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/depthwise_conv2d_quant8.mod.py[Renamed from runtime/test/specs/depthwise_conv2d_quant8.mod.py - diff]
runtime/test/specs/V1_0/depthwise_conv2d_quant8_large.mod.py[Renamed from runtime/test/specs/depthwise_conv2d_quant8_large.mod.py - diff]
runtime/test/specs/V1_0/depthwise_conv2d_quant8_large_weights_as_inputs.mod.py[Renamed from runtime/test/specs/depthwise_conv2d_quant8_large_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/depthwise_conv2d_quant8_weights_as_inputs.mod.py[Renamed from runtime/test/specs/depthwise_conv2d_quant8_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/dequantize.mod.py[Renamed from runtime/test/specs/dequantize.mod.py - diff]
runtime/test/specs/V1_0/embedding_lookup.mod.py[Renamed from runtime/test/specs/embedding_lookup.mod.py - diff]
runtime/test/specs/V1_0/floor.mod.py[Renamed from runtime/test/specs/floor.mod.py - diff]
runtime/test/specs/V1_0/fully_connected_float.mod.py[Renamed from runtime/test/specs/fully_connected_float.mod.py - diff]
runtime/test/specs/V1_0/fully_connected_float_large.mod.py[Renamed from runtime/test/specs/fully_connected_float_large.mod.py - diff]
runtime/test/specs/V1_0/fully_connected_float_large_weights_as_inputs.mod.py[Renamed from runtime/test/specs/fully_connected_float_large_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/fully_connected_float_weights_as_inputs.mod.py[Renamed from runtime/test/specs/fully_connected_float_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/fully_connected_quant8.mod.py[Renamed from runtime/test/specs/fully_connected_quant8.mod.py - diff]
runtime/test/specs/V1_0/fully_connected_quant8_large.mod.py[Renamed from runtime/test/specs/fully_connected_quant8_large.mod.py - diff]
runtime/test/specs/V1_0/fully_connected_quant8_large_weights_as_inputs.mod.py[Renamed from runtime/test/specs/fully_connected_quant8_large_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/fully_connected_quant8_weights_as_inputs.mod.py[Renamed from runtime/test/specs/fully_connected_quant8_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/hashtable_lookup_float.mod.py[Renamed from runtime/test/specs/hashtable_lookup_float.mod.py - diff]
runtime/test/specs/V1_0/hashtable_lookup_quant8.mod.py[Renamed from runtime/test/specs/hashtable_lookup_quant8.mod.py - diff]
runtime/test/specs/V1_0/l2_normalization.mod.py[Renamed from runtime/test/specs/l2_normalization.mod.py - diff]
runtime/test/specs/V1_0/l2_normalization_large.mod.py[Renamed from runtime/test/specs/l2_normalization_large.mod.py - diff]
runtime/test/specs/V1_0/l2_pool_float.mod.py[Renamed from runtime/test/specs/l2_pool_float.mod.py - diff]
runtime/test/specs/V1_0/l2_pool_float_large.mod.py[Renamed from runtime/test/specs/l2_pool_float_large.mod.py - diff]
runtime/test/specs/V1_0/local_response_norm_float_1.mod.py[Renamed from runtime/test/specs/local_response_norm_float_1.mod.py - diff]
runtime/test/specs/V1_0/local_response_norm_float_2.mod.py[Renamed from runtime/test/specs/local_response_norm_float_2.mod.py - diff]
runtime/test/specs/V1_0/local_response_norm_float_3.mod.py[Renamed from runtime/test/specs/local_response_norm_float_3.mod.py - diff]
runtime/test/specs/V1_0/local_response_norm_float_4.mod.py[Renamed from runtime/test/specs/local_response_norm_float_4.mod.py - diff]
runtime/test/specs/V1_0/logistic_float_1.mod.py[Renamed from runtime/test/specs/logistic_float_1.mod.py - diff]
runtime/test/specs/V1_0/logistic_float_2.mod.py[Renamed from runtime/test/specs/logistic_float_2.mod.py - diff]
runtime/test/specs/V1_0/logistic_quant8_1.mod.py[Renamed from runtime/test/specs/logistic_quant8_1.mod.py - diff]
runtime/test/specs/V1_0/logistic_quant8_2.mod.py[Renamed from runtime/test/specs/logistic_quant8_2.mod.py - diff]
runtime/test/specs/V1_0/lsh_projection.mod.py[Renamed from runtime/test/specs/lsh_projection.mod.py - diff]
runtime/test/specs/V1_0/lsh_projection_2.mod.py[Renamed from runtime/test/specs/lsh_projection_2.mod.py - diff]
runtime/test/specs/V1_0/lsh_projection_weights_as_inputs.mod.py[Renamed from runtime/test/specs/lsh_projection_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/lstm.mod.py[Renamed from runtime/test/specs/lstm.mod.py - diff]
runtime/test/specs/V1_0/lstm2.mod.py[Renamed from runtime/test/specs/lstm2.mod.py - diff]
runtime/test/specs/V1_0/lstm2_state.mod.py[Renamed from runtime/test/specs/lstm2_state.mod.py - diff]
runtime/test/specs/V1_0/lstm2_state2.mod.py[Renamed from runtime/test/specs/lstm2_state2.mod.py - diff]
runtime/test/specs/V1_0/lstm3.mod.py[Renamed from runtime/test/specs/lstm3.mod.py - diff]
runtime/test/specs/V1_0/lstm3_state.mod.py[Renamed from runtime/test/specs/lstm3_state.mod.py - diff]
runtime/test/specs/V1_0/lstm3_state2.mod.py[Renamed from runtime/test/specs/lstm3_state2.mod.py - diff]
runtime/test/specs/V1_0/lstm3_state3.mod.py[Renamed from runtime/test/specs/lstm3_state3.mod.py - diff]
runtime/test/specs/V1_0/lstm_state.mod.py[Renamed from runtime/test/specs/lstm_state.mod.py - diff]
runtime/test/specs/V1_0/lstm_state2.mod.py[Renamed from runtime/test/specs/lstm_state2.mod.py - diff]
runtime/test/specs/V1_0/max_pool_float_1.mod.py[Renamed from runtime/test/specs/max_pool_float_1.mod.py - diff]
runtime/test/specs/V1_0/max_pool_float_2.mod.py[Renamed from runtime/test/specs/max_pool_float_2.mod.py - diff]
runtime/test/specs/V1_0/max_pool_float_3.mod.py[Renamed from runtime/test/specs/max_pool_float_3.mod.py - diff]
runtime/test/specs/V1_0/max_pool_quant8_1.mod.py[Renamed from runtime/test/specs/max_pool_quant8_1.mod.py - diff]
runtime/test/specs/V1_0/max_pool_quant8_2.mod.py[Renamed from runtime/test/specs/max_pool_quant8_2.mod.py - diff]
runtime/test/specs/V1_0/max_pool_quant8_3.mod.py[Renamed from runtime/test/specs/max_pool_quant8_3.mod.py - diff]
runtime/test/specs/V1_0/mobilenet_224_gender_basic_fixed.mod.py[Renamed from runtime/test/specs/mobilenet_224_gender_basic_fixed.mod.py - diff]
runtime/test/specs/V1_0/mobilenet_quantized.mod.py[Renamed from runtime/test/specs/mobilenet_quantized.mod.py - diff]
runtime/test/specs/V1_0/mul.mod.py[Renamed from runtime/test/specs/mul.mod.py - diff]
runtime/test/specs/V1_0/mul_broadcast_quant8.mod.py[Renamed from runtime/test/specs/mul_broadcast_quant8.mod.py - diff]
runtime/test/specs/V1_0/mul_quant8.mod.py[Renamed from runtime/test/specs/mul_quant8.mod.py - diff]
runtime/test/specs/V1_0/mul_relu.mod.py[Renamed from runtime/test/specs/mul_relu.mod.py - diff]
runtime/test/specs/V1_0/relu1_float_1.mod.py[Renamed from runtime/test/specs/relu1_float_1.mod.py - diff]
runtime/test/specs/V1_0/relu1_float_2.mod.py[Renamed from runtime/test/specs/relu1_float_2.mod.py - diff]
runtime/test/specs/V1_0/relu1_quant8_1.mod.py[Renamed from runtime/test/specs/relu1_quant8_1.mod.py - diff]
runtime/test/specs/V1_0/relu1_quant8_2.mod.py[Renamed from runtime/test/specs/relu1_quant8_2.mod.py - diff]
runtime/test/specs/V1_0/relu6_float_1.mod.py[Renamed from runtime/test/specs/relu6_float_1.mod.py - diff]
runtime/test/specs/V1_0/relu6_float_2.mod.py[Renamed from runtime/test/specs/relu6_float_2.mod.py - diff]
runtime/test/specs/V1_0/relu6_quant8_1.mod.py[Renamed from runtime/test/specs/relu6_quant8_1.mod.py - diff]
runtime/test/specs/V1_0/relu6_quant8_2.mod.py[Renamed from runtime/test/specs/relu6_quant8_2.mod.py - diff]
runtime/test/specs/V1_0/relu_float_1.mod.py[Renamed from runtime/test/specs/relu_float_1.mod.py - diff]
runtime/test/specs/V1_0/relu_float_2.mod.py[Renamed from runtime/test/specs/relu_float_2.mod.py - diff]
runtime/test/specs/V1_0/relu_quant8_1.mod.py[Renamed from runtime/test/specs/relu_quant8_1.mod.py - diff]
runtime/test/specs/V1_0/relu_quant8_2.mod.py[Renamed from runtime/test/specs/relu_quant8_2.mod.py - diff]
runtime/test/specs/V1_0/reshape.mod.py[Renamed from runtime/test/specs/reshape.mod.py - diff]
runtime/test/specs/V1_0/reshape_quant8.mod.py[Renamed from runtime/test/specs/reshape_quant8.mod.py - diff]
runtime/test/specs/V1_0/reshape_quant8_weights_as_inputs.mod.py[Renamed from runtime/test/specs/reshape_quant8_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/reshape_weights_as_inputs.mod.py[Renamed from runtime/test/specs/reshape_weights_as_inputs.mod.py - diff]
runtime/test/specs/V1_0/resize_bilinear.mod.py[Renamed from runtime/test/specs/resize_bilinear.mod.py - diff]
runtime/test/specs/V1_0/rnn.mod.py[Renamed from runtime/test/specs/rnn.mod.py - diff]
runtime/test/specs/V1_0/rnn_state.mod.py[Renamed from runtime/test/specs/rnn_state.mod.py - diff]
runtime/test/specs/V1_0/softmax_float_1.mod.py[Renamed from runtime/test/specs/softmax_float_1.mod.py - diff]
runtime/test/specs/V1_0/softmax_float_2.mod.py[Renamed from runtime/test/specs/softmax_float_2.mod.py - diff]
runtime/test/specs/V1_0/softmax_quant8_1.mod.py[Renamed from runtime/test/specs/softmax_quant8_1.mod.py - diff]
runtime/test/specs/V1_0/softmax_quant8_2.mod.py[Renamed from runtime/test/specs/softmax_quant8_2.mod.py - diff]
runtime/test/specs/V1_0/space_to_depth_float_1.mod.py[Renamed from runtime/test/specs/space_to_depth_float_1.mod.py - diff]
runtime/test/specs/V1_0/space_to_depth_float_2.mod.py[Renamed from runtime/test/specs/space_to_depth_float_2.mod.py - diff]
runtime/test/specs/V1_0/space_to_depth_float_3.mod.py[Renamed from runtime/test/specs/space_to_depth_float_3.mod.py - diff]
runtime/test/specs/V1_0/space_to_depth_quant8_1.mod.py[Renamed from runtime/test/specs/space_to_depth_quant8_1.mod.py - diff]
runtime/test/specs/V1_0/space_to_depth_quant8_2.mod.py[Renamed from runtime/test/specs/space_to_depth_quant8_2.mod.py - diff]
runtime/test/specs/V1_0/svdf.mod.py[Renamed from runtime/test/specs/svdf.mod.py - diff]
runtime/test/specs/V1_0/svdf2.mod.py[Renamed from runtime/test/specs/svdf2.mod.py - diff]
runtime/test/specs/V1_0/svdf_state.mod.py[Renamed from runtime/test/specs/svdf_state.mod.py - diff]
runtime/test/specs/V1_0/tanh.mod.py[Renamed from runtime/test/specs/tanh.mod.py - diff]
runtime/test/specs/V1_1/batch_to_space.mod.py[Renamed from runtime/test/specs/batch_to_space.mod.py - diff]
runtime/test/specs/V1_1/div.mod.py[Renamed from runtime/test/specs/div.mod.py - diff]
runtime/test/specs/V1_1/mean.mod.py[Renamed from runtime/test/specs/mean.mod.py - diff]
runtime/test/specs/V1_1/pad.mod.py[Renamed from runtime/test/specs/pad.mod.py - diff]
runtime/test/specs/V1_1/space_to_batch.mod.py[Renamed from runtime/test/specs/space_to_batch.mod.py - diff]
runtime/test/specs/V1_1/squeeze.mod.py[Renamed from runtime/test/specs/squeeze.mod.py - diff]
runtime/test/specs/V1_1/strided_slice.mod.py[Renamed from runtime/test/specs/strided_slice.mod.py - diff]
runtime/test/specs/V1_1/sub.mod.py[Renamed from runtime/test/specs/sub.mod.py - diff]
runtime/test/specs/V1_1/transpose.mod.py[Renamed from runtime/test/specs/transpose.mod.py - diff]
runtime/test/specs/generate_test.sh[diff]
runtime/test/specs/generate_vts_test.sh[diff]

158 files changed

tree: ff736b74bab761fa67ae676ea8e7ebe3a1273129