From cea2c9f6cbd317da4c97306eee5446240af1d57c Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Wed, 19 Dec 2018 09:58:29 +0900 Subject: [PATCH] Rename generated test (#4096) * Rename generated test Rename generated test binary: nnapi_gtest Rename directory including generated test: tests/nnapi Revise directory structure Signed-off-by: Hyeongseok Oh * Fix typo --- .gitignore | 2 + Makefile | 2 +- cmake/CfgOptionFlags.cmake | 2 +- tests/CMakeLists.txt | 2 +- tests/{runtime => nnapi}/.FORMATDENY | 0 tests/nnapi/CMakeLists.txt | 56 ++++++++++++++++++++++ .../include/NeuralNetworksWrapper.h | 0 .../include/TestHarness.h | 0 .../nnapi_gtest.skip.armv7l-linux} | 0 .../nnapi_gtest.skip.armv7l-linux.neurun} | 0 .../nnapi_gtest.skip.armv7l-tizen} | 0 .../nnapi_gtest.skip.x86_64-linux} | 0 .../specs/Ex/argmax_ex_float_1.mod.py | 0 .../specs/Ex/argmax_ex_float_2.mod.py | 0 .../specs/Ex/argmax_ex_int32.mod.py | 0 .../specs/Ex/argmax_ex_neg_axis_float.mod.py | 0 .../specs/Ex/argmax_ex_neg_axis_int32.mod.py | 0 .../specs/Ex/argmax_ex_quant8.mod.py | 0 .../specs/Ex/argmax_ex_quant8_neg_axis.mod.py | 0 .../specs/Ex/cast_ex_float32_to_int32.mod.py | 0 .../specs/Ex/cast_ex_int32_to_float32.mod.py | 0 .../specs/Ex/equal_ex_1D_float.mod.py | 0 .../specs/Ex/equal_ex_4D_float.mod.py | 0 .../specs/Ex/equal_ex_broadcast_4D_2D_float.mod.py | 0 .../specs/Ex/equal_ex_broadcast_float.mod.py | 0 .../specs/Ex/equal_ex_quant8.mod.py | 0 .../specs/Ex/exp_ex_1D_float.mod.py | 0 .../specs/Ex/exp_ex_2D_float.mod.py | 0 .../specs/Ex/exp_ex_3D_float.mod.py | 0 .../specs/Ex/exp_ex_4D_float.mod.py | 0 .../specs/Ex/gather_ex_1D_float.mod.py | 0 .../specs/Ex/gather_ex_1D_int32.mod.py | 0 .../specs/Ex/gather_ex_1D_quant8.mod.py | 0 .../specs/Ex/gather_ex_2D_float.mod.py | 0 .../specs/Ex/gather_ex_2D_int32.mod.py | 0 .../specs/Ex/gather_ex_2D_quant8.mod.py | 0 .../specs/Ex/logical_and_ex_1D.mod.py | 0 .../specs/Ex/logical_and_ex_2D.mod.py | 0 .../specs/Ex/logical_and_ex_3D.mod.py | 0 .../specs/Ex/logical_and_ex_4D.mod.py | 0 .../specs/Ex/logical_and_ex_broadcast.mod.py | 0 .../specs/Ex/logical_and_ex_broadcast_4D_2D.mod.py | 0 .../specs/Ex/logical_not_ex_1D.mod.py | 0 .../specs/Ex/logical_not_ex_4D.mod.py | 0 .../specs/Ex/logical_or_ex_1D.mod.py | 0 .../specs/Ex/logical_or_ex_2D.mod.py | 0 .../specs/Ex/logical_or_ex_3D.mod.py | 0 .../specs/Ex/logical_or_ex_4D.mod.py | 0 .../specs/Ex/logical_or_ex_broadcast.mod.py | 0 .../specs/Ex/logical_or_ex_broadcast_4D_2D.mod.py | 0 .../specs/Ex/neg_ex_1D_float.mod.py | 0 .../specs/Ex/neg_ex_2D_float.mod.py | 0 .../specs/Ex/neg_ex_3D_float.mod.py | 0 .../specs/Ex/neg_ex_3D_int.mod.py | 0 .../specs/Ex/neg_ex_4D_float.mod.py | 0 .../specs/Ex/neg_ex_4D_int.mod.py | 0 .../Ex/notequal_ex_broadcast_4D_2D_float.mod.py | 0 .../specs/Ex/notequal_ex_broadcast_float.mod.py | 0 .../specs/Ex/notequal_ex_float.mod.py | 0 .../specs/Ex/notequal_ex_quant8.mod.py | 0 .../specs/Ex/pack_ex_3D_float_1.mod.py | 0 .../specs/Ex/pack_ex_3D_float_2.mod.py | 0 .../specs/Ex/pack_ex_3D_int_1.mod.py | 0 .../specs/Ex/pack_ex_3D_int_2.mod.py | 0 .../specs/Ex/prelu_ex_float_1.mod.py | 0 .../specs/Ex/prelu_ex_float_2.mod.py | 0 .../specs/Ex/reduce_min_ex_float.mod.py | 0 .../specs/Ex/reduce_min_ex_float_1.mod.py | 0 .../specs/Ex/reduce_min_ex_float_2.mod.py | 0 .../specs/Ex/reduce_sum_ex_2D_float.mod.py | 0 .../specs/Ex/reduce_sum_ex_4D_float.mod.py | 0 .../Ex/reduce_sum_ex_4D_float_reducing_C.mod.py | 0 .../Ex/reduce_sum_ex_4D_float_reducing_HW.mod.py | 0 .../specs/Ex/rsqrt_ex_1D_float.mod.py | 0 .../specs/Ex/rsqrt_ex_2D_float.mod.py | 0 .../specs/Ex/rsqrt_ex_3D_float.mod.py | 0 .../specs/Ex/rsqrt_ex_4D_float.mod.py | 0 .../specs/Ex/split_ex_1D_float.mod.py | 0 .../specs/Ex/split_ex_1D_int32.mod.py | 0 .../specs/Ex/split_ex_4D_float_1.mod.py | 0 .../specs/Ex/split_ex_4D_float_2.mod.py | 0 .../specs/Ex/split_ex_4D_float_3.mod.py | 0 .../specs/Ex/split_ex_4D_int32_1.mod.py | 0 .../specs/Ex/split_ex_4D_int32_2.mod.py | 0 .../specs/Ex/split_ex_4D_int32_3.mod.py | 0 .../specs/Ex/split_ex_4D_int32_4.mod.py | 0 .../specs/Ex/split_ex_4D_int32_5.mod.py | 0 .../specs/Ex/sqrt_ex_1D_float.mod.py | 0 .../specs/Ex/sqrt_ex_2D_float.mod.py | 0 .../specs/Ex/sqrt_ex_3D_float.mod.py | 0 .../specs/Ex/sqrt_ex_4D_float.mod.py | 0 .../specs/Ex/squared_difference_ex_1D_float.mod.py | 0 .../specs/Ex/squared_difference_ex_2D_float.mod.py | 0 .../specs/Ex/squared_difference_ex_3D_float.mod.py | 0 .../specs/Ex/squared_difference_ex_4D_float.mod.py | 0 ...ared_difference_ex_broadcast_4D_2D_float.mod.py | 0 .../squared_difference_ex_broadcast_float.mod.py | 0 .../specs/Ex/tensorflowmax_ex_2D_float.mod.py | 0 .../specs/Ex/tensorflowmax_ex_2D_int32.mod.py | 0 .../Ex/tensorflowmax_ex_4D_float_reducing_C.mod.py | 0 .../tensorflowmax_ex_4D_float_reducing_HW.mod.py | 0 .../specs/Ex/tensorflowmax_ex_float.mod.py | 0 .../specs/Ex/tensorflowmax_ex_float_1.mod.py | 0 .../specs/Ex/tensorflowmax_ex_float_2.mod.py | 0 .../specs/Ex/tensorflowmax_ex_quant8_1.mod.py | 0 .../specs/Ex/tensorflowmax_ex_quant8_2.mod.py | 0 .../specs/Ex/topk_v2_ex_1D_float.mod.py | 0 .../specs/Ex/topk_v2_ex_1D_int32.mod.py | 0 .../specs/Ex/topk_v2_ex_1D_quant8.mod.py | 0 .../specs/Ex/topk_v2_ex_2D_float.mod.py | 0 .../specs/Ex/topk_v2_ex_2D_int32.mod.py | 0 .../specs/Ex/topk_v2_ex_2D_quant8.mod.py | 0 .../specs/Ex/transpose_conv_ex_float_1.mod.py | 0 .../specs/Ex/transpose_conv_ex_float_2.mod.py | 0 .../specs/Ex/transpose_conv_ex_float_3.mod.py | 0 .../specs/Ex/transpose_conv_ex_int_1.mod.py | 0 .../specs/Ex/transpose_conv_ex_int_2.mod.py | 0 .../specs/Ex/transpose_conv_ex_int_3.mod.py | 0 .../specs/Ex/unpack_ex_3D_float_1.mod.py | 0 .../specs/Ex/unpack_ex_3D_float_2.mod.py | 0 .../specs/Ex/unpack_ex_3D_int_1.mod.py | 0 .../specs/Ex/unpack_ex_3D_int_2.mod.py | 0 .../specs/V1_0/add.mod.py | 0 ...dd_broadcast_4D_2D_after_nops_float_nnfw.mod.py | 0 .../specs/V1_0/add_broadcast_quant8.mod.py | 0 .../specs/V1_0/add_quant8.mod.py | 0 .../specs/V1_0/avg_pool_float_1.mod.py | 0 .../specs/V1_0/avg_pool_float_2.mod.py | 0 .../specs/V1_0/avg_pool_float_3.mod.py | 0 .../specs/V1_0/avg_pool_float_4.mod.py | 0 .../specs/V1_0/avg_pool_float_5.mod.py | 0 .../specs/V1_0/avg_pool_quant8_1.mod.py | 0 .../specs/V1_0/avg_pool_quant8_2.mod.py | 0 .../specs/V1_0/avg_pool_quant8_3.mod.py | 0 .../specs/V1_0/avg_pool_quant8_4.mod.py | 0 .../specs/V1_0/avg_pool_quant8_5.mod.py | 0 .../specs/V1_0/concat_float_1.mod.py | 0 .../specs/V1_0/concat_float_2.mod.py | 0 .../specs/V1_0/concat_float_3.mod.py | 0 .../specs/V1_0/concat_float_4D_axis3_1_nnfw.mod.py | 0 .../specs/V1_0/concat_quant8_1.mod.py | 0 .../specs/V1_0/concat_quant8_2.mod.py | 0 .../specs/V1_0/concat_quant8_3.mod.py | 0 .../specs/V1_0/conv_1_h3_w2_SAME.mod.py | 0 .../specs/V1_0/conv_1_h3_w2_VALID.mod.py | 0 .../specs/V1_0/conv_3_h3_w2_SAME.mod.py | 0 .../specs/V1_0/conv_3_h3_w2_VALID.mod.py | 0 .../specs/V1_0/conv_float.mod.py | 0 .../specs/V1_0/conv_float_2.mod.py | 0 .../specs/V1_0/conv_float_channels.mod.py | 0 .../conv_float_channels_weights_as_inputs.mod.py | 0 .../specs/V1_0/conv_float_large.mod.py | 0 .../V1_0/conv_float_large_weights_as_inputs.mod.py | 0 .../specs/V1_0/conv_float_weights_as_inputs.mod.py | 0 .../specs/V1_0/conv_quant8.mod.py | 0 .../specs/V1_0/conv_quant8_2.mod.py | 0 .../specs/V1_0/conv_quant8_channels.mod.py | 0 .../conv_quant8_channels_weights_as_inputs.mod.py | 0 .../specs/V1_0/conv_quant8_large.mod.py | 0 .../conv_quant8_large_weights_as_inputs.mod.py | 0 .../specs/V1_0/conv_quant8_overflow.mod.py | 0 .../conv_quant8_overflow_weights_as_inputs.mod.py | 0 .../V1_0/conv_quant8_weights_as_inputs.mod.py | 0 .../specs/V1_0/depth_to_space_float_1.mod.py | 0 .../specs/V1_0/depth_to_space_float_2.mod.py | 0 .../specs/V1_0/depth_to_space_float_3.mod.py | 0 .../specs/V1_0/depth_to_space_quant8_1.mod.py | 0 .../specs/V1_0/depth_to_space_quant8_2.mod.py | 0 .../specs/V1_0/depthwise_conv.mod.py | 0 .../specs/V1_0/depthwise_conv2d_float.mod.py | 0 .../specs/V1_0/depthwise_conv2d_float_2.mod.py | 0 .../specs/V1_0/depthwise_conv2d_float_large.mod.py | 0 .../V1_0/depthwise_conv2d_float_large_2.mod.py | 0 ...e_conv2d_float_large_2_weights_as_inputs.mod.py | 0 ...ise_conv2d_float_large_weights_as_inputs.mod.py | 0 ...depthwise_conv2d_float_weights_as_inputs.mod.py | 0 .../specs/V1_0/depthwise_conv2d_quant8.mod.py | 0 .../specs/V1_0/depthwise_conv2d_quant8_2.mod.py | 0 .../V1_0/depthwise_conv2d_quant8_large.mod.py | 0 ...se_conv2d_quant8_large_weights_as_inputs.mod.py | 0 ...epthwise_conv2d_quant8_weights_as_inputs.mod.py | 0 .../specs/V1_0/dequantize.mod.py | 0 .../specs/V1_0/embedding_lookup.mod.py | 0 .../specs/V1_0/embedding_lookup_2d_nnfw.mod.py | 0 .../specs/V1_0/embedding_lookup_4d_nnfw.mod.py | 0 .../specs/V1_0/floor_.mod.py | 0 .../specs/V1_0/fully_connected_float.mod.py | 0 .../specs/V1_0/fully_connected_float_1_nnfw.mod.py | 0 .../specs/V1_0/fully_connected_float_2.mod.py | 0 .../specs/V1_0/fully_connected_float_3.mod.py | 0 .../specs/V1_0/fully_connected_float_large.mod.py | 0 ..._connected_float_large_weights_as_inputs.mod.py | 0 .../fully_connected_float_weights_as_inputs.mod.py | 0 .../specs/V1_0/fully_connected_quant8.mod.py | 0 .../specs/V1_0/fully_connected_quant8_2.mod.py | 0 .../specs/V1_0/fully_connected_quant8_large.mod.py | 0 ...connected_quant8_large_weights_as_inputs.mod.py | 0 ...fully_connected_quant8_weights_as_inputs.mod.py | 0 .../specs/V1_0/hashtable_lookup_float.mod.py | 0 .../V1_0/hashtable_lookup_float_4D_nnfw.mod.py | 0 .../specs/V1_0/hashtable_lookup_quant8.mod.py | 0 .../specs/V1_0/l2_normalization.mod.py | 0 .../specs/V1_0/l2_normalization_2.mod.py | 0 .../specs/V1_0/l2_normalization_large.mod.py | 0 .../specs/V1_0/l2_pool_float.mod.py | 0 .../specs/V1_0/l2_pool_float_2.mod.py | 0 .../specs/V1_0/l2_pool_float_large.mod.py | 0 .../specs/V1_0/local_response_norm_float_1.mod.py | 0 .../specs/V1_0/local_response_norm_float_2.mod.py | 0 .../specs/V1_0/local_response_norm_float_3.mod.py | 0 .../specs/V1_0/local_response_norm_float_4.mod.py | 0 .../specs/V1_0/logistic_float_1.mod.py | 0 .../specs/V1_0/logistic_float_2.mod.py | 0 .../specs/V1_0/logistic_quant8_1.mod.py | 0 .../specs/V1_0/logistic_quant8_2.mod.py | 0 .../specs/V1_0/lsh_projection.mod.py | 0 .../specs/V1_0/lsh_projection_2.mod.py | 0 .../V1_0/lsh_projection_weights_as_inputs.mod.py | 0 .../specs/V1_0/lstm.mod.py | 0 .../specs/V1_0/lstm2.mod.py | 0 .../specs/V1_0/lstm2_state.mod.py | 0 .../specs/V1_0/lstm2_state2.mod.py | 0 .../specs/V1_0/lstm3.mod.py | 0 .../specs/V1_0/lstm3_state.mod.py | 0 .../specs/V1_0/lstm3_state2.mod.py | 0 .../specs/V1_0/lstm3_state3.mod.py | 0 .../specs/V1_0/lstm_state.mod.py | 0 .../specs/V1_0/lstm_state2.mod.py | 0 .../specs/V1_0/max_pool_float_1.mod.py | 0 .../specs/V1_0/max_pool_float_2.mod.py | 0 .../specs/V1_0/max_pool_float_3.mod.py | 0 .../specs/V1_0/max_pool_float_4.mod.py | 0 .../specs/V1_0/max_pool_quant8_1.mod.py | 0 .../specs/V1_0/max_pool_quant8_2.mod.py | 0 .../specs/V1_0/max_pool_quant8_3.mod.py | 0 .../specs/V1_0/max_pool_quant8_4.mod.py | 0 .../V1_0/mobilenet_224_gender_basic_fixed.mod.py | 0 .../specs/V1_0/mobilenet_quantized.mod.py | 0 .../specs/V1_0/mul.mod.py | 0 .../specs/V1_0/mul_4D_nnfw.mod.py | 0 .../specs/V1_0/mul_broadcast_3D_1D_1_nnfw.mod.py | 0 .../specs/V1_0/mul_broadcast_3D_1D_2_nnfw.mod.py | 0 .../specs/V1_0/mul_broadcast_quant8.mod.py | 0 .../specs/V1_0/mul_quant8.mod.py | 0 .../specs/V1_0/mul_relu.mod.py | 0 .../specs/V1_0/relu1_float_1.mod.py | 0 .../specs/V1_0/relu1_float_2.mod.py | 0 .../specs/V1_0/relu1_quant8_1.mod.py | 0 .../specs/V1_0/relu1_quant8_2.mod.py | 0 .../specs/V1_0/relu6_float_1.mod.py | 0 .../specs/V1_0/relu6_float_2.mod.py | 0 .../specs/V1_0/relu6_quant8_1.mod.py | 0 .../specs/V1_0/relu6_quant8_2.mod.py | 0 .../specs/V1_0/relu_float_1.mod.py | 0 .../specs/V1_0/relu_float_2.mod.py | 0 .../specs/V1_0/relu_quant8_1.mod.py | 0 .../specs/V1_0/relu_quant8_2.mod.py | 0 .../specs/V1_0/reshape.mod.py | 0 .../specs/V1_0/reshape_quant8.mod.py | 0 .../V1_0/reshape_quant8_weights_as_inputs.mod.py | 0 .../specs/V1_0/reshape_weights_as_inputs.mod.py | 0 .../specs/V1_0/resize_bilinear.mod.py | 0 .../specs/V1_0/resize_bilinear_2.mod.py | 0 .../specs/V1_0/rnn.mod.py | 0 .../specs/V1_0/rnn_state.mod.py | 0 .../specs/V1_0/softmax_float_1.mod.py | 0 .../specs/V1_0/softmax_float_2.mod.py | 0 .../specs/V1_0/softmax_quant8_1.mod.py | 0 .../specs/V1_0/softmax_quant8_2.mod.py | 0 .../specs/V1_0/space_to_depth_float_1.mod.py | 0 .../specs/V1_0/space_to_depth_float_2.mod.py | 0 .../specs/V1_0/space_to_depth_float_3.mod.py | 0 .../specs/V1_0/space_to_depth_quant8_1.mod.py | 0 .../specs/V1_0/space_to_depth_quant8_2.mod.py | 0 .../specs/V1_0/svdf.mod.py | 0 .../specs/V1_0/svdf2.mod.py | 0 .../specs/V1_0/svdf_state.mod.py | 0 .../specs/V1_0/tanh_.mod.py | 0 .../specs/V1_1/batch_to_space.mod.py | 0 .../specs/V1_1/batch_to_space_float_1.mod.py | 0 .../specs/V1_1/batch_to_space_quant8_1.mod.py | 0 .../specs/V1_1/div_.mod.py | 0 .../specs/V1_1/div_broadcast_float.mod.py | 0 .../V1_1/div_broadcast_float_4D_2D_nnfw.mod.py | 0 .../V1_1/fully_connected_float_4d_simple.mod.py | 0 .../specs/V1_1/mean.mod.py | 0 .../V1_1/mean_4D_float_reducing_C_nnfw.mod.py | 0 .../V1_1/mean_4D_float_reducing_HW_nnfw.mod.py | 0 .../specs/V1_1/mean_axis01_1_nnfw.mod.py | 0 .../specs/V1_1/mean_axis01_2_nnfw.mod.py | 0 .../specs/V1_1/mean_float_1.mod.py | 0 .../specs/V1_1/mean_float_2.mod.py | 0 .../specs/V1_1/mean_quant8_1.mod.py | 0 .../specs/V1_1/mean_quant8_2.mod.py | 0 .../specs/V1_1/pad.mod.py | 0 .../specs/V1_1/pad_2D_HW_nnfw.mod.py | 0 .../specs/V1_1/pad_3D_HWC_nnfw.mod.py | 0 .../specs/V1_1/pad_BHWC_nnfw.mod.py | 0 .../specs/V1_1/pad_BHW_nnfw.mod.py | 0 .../specs/V1_1/pad_HWD_nnfw.mod.py | 0 .../specs/V1_1/pad_float_1.mod.py | 0 .../specs/V1_1/pad_quant8_nnfw.mod.py | 0 .../specs/V1_1/space_to_batch.mod.py | 0 .../specs/V1_1/space_to_batch_float_1.mod.py | 0 .../specs/V1_1/space_to_batch_float_1_nnfw.mod.py | 0 .../specs/V1_1/space_to_batch_float_2.mod.py | 0 .../specs/V1_1/space_to_batch_float_3.mod.py | 0 .../specs/V1_1/space_to_batch_quant8_1.mod.py | 0 .../specs/V1_1/space_to_batch_quant8_1_nnfw.mod.py | 0 .../specs/V1_1/space_to_batch_quant8_2.mod.py | 0 .../specs/V1_1/space_to_batch_quant8_2_nnfw.mod.py | 0 .../specs/V1_1/space_to_batch_quant8_3.mod.py | 0 .../specs/V1_1/squeeze.mod.py | 0 .../specs/V1_1/squeeze_2D_float_1_nnfw.mod.py | 0 .../specs/V1_1/squeeze_float_1.mod.py | 0 .../specs/V1_1/squeeze_quant8_1.mod.py | 0 .../specs/V1_1/strided_slice.mod.py | 0 .../specs/V1_1/strided_slice_float_1.mod.py | 0 .../specs/V1_1/strided_slice_float_10.mod.py | 0 .../specs/V1_1/strided_slice_float_11.mod.py | 0 .../specs/V1_1/strided_slice_float_2.mod.py | 0 .../specs/V1_1/strided_slice_float_3.mod.py | 0 .../specs/V1_1/strided_slice_float_4.mod.py | 0 .../specs/V1_1/strided_slice_float_5.mod.py | 0 .../specs/V1_1/strided_slice_float_6.mod.py | 0 .../specs/V1_1/strided_slice_float_7.mod.py | 0 .../specs/V1_1/strided_slice_float_8.mod.py | 0 .../specs/V1_1/strided_slice_float_9.mod.py | 0 .../specs/V1_1/strided_slice_qaunt8_10.mod.py | 0 .../specs/V1_1/strided_slice_qaunt8_11.mod.py | 0 .../specs/V1_1/strided_slice_quant8_1.mod.py | 0 .../specs/V1_1/strided_slice_quant8_2.mod.py | 0 .../specs/V1_1/strided_slice_quant8_3.mod.py | 0 .../specs/V1_1/strided_slice_quant8_4.mod.py | 0 .../specs/V1_1/strided_slice_quant8_5.mod.py | 0 .../specs/V1_1/strided_slice_quant8_6.mod.py | 0 .../specs/V1_1/strided_slice_quant8_7.mod.py | 0 .../specs/V1_1/strided_slice_quant8_8.mod.py | 0 .../specs/V1_1/strided_slice_quant8_9.mod.py | 0 .../specs/V1_1/sub.mod.py | 0 .../V1_1/sub_broadcast_4D_2D_float_nnfw.mod.py | 0 .../specs/V1_1/sub_broadcast_float.mod.py | 0 .../specs/V1_1/transpose.mod.py | 0 .../specs/V1_1/transpose_2D_nnfw.mod.py | 0 .../specs/V1_1/transpose_3D_nnfw.mod.py | 0 .../specs/V1_1/transpose_float_1.mod.py | 0 .../specs/V1_1/transpose_quant8_1.mod.py | 0 .../specs/generate_test.sh | 16 +++---- .../specs/generate_vts_test.sh | 0 .../specs/slicing.sh | 0 .../src}/TestGenerated.cpp | 0 .../src}/TestGenerated_Ex.cpp | 0 .../src}/TestGenerated_V1_0.cpp | 0 .../src}/TestGenerated_V1_1.cpp | 0 .../src}/TestGenerated_common.cpp | 0 .../src}/TestMain.cpp | 0 .../src}/TestTrivialModel.cpp | 0 .../src}/TestValidation.cpp | 0 tests/runtime/CMakeLists.txt | 7 --- tests/runtime/neural_networks_test/CMakeLists.txt | 49 ------------------- 360 files changed, 69 insertions(+), 67 deletions(-) rename tests/{runtime => nnapi}/.FORMATDENY (100%) create mode 100644 tests/nnapi/CMakeLists.txt rename tests/{runtime => nnapi}/include/NeuralNetworksWrapper.h (100%) rename tests/{runtime/neural_networks_test => nnapi}/include/TestHarness.h (100%) rename tests/{runtime/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux => nnapi/nnapi_gtest.skip.armv7l-linux} (100%) rename tests/{runtime/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux.neurun => nnapi/nnapi_gtest.skip.armv7l-linux.neurun} (100%) rename tests/{runtime/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-tizen => nnapi/nnapi_gtest.skip.armv7l-tizen} (100%) rename tests/{runtime/neural_networks_test/runtime_run_android_nn_test.skip.x86_64-linux => nnapi/nnapi_gtest.skip.x86_64-linux} (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/argmax_ex_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/argmax_ex_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/argmax_ex_int32.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/argmax_ex_neg_axis_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/argmax_ex_neg_axis_int32.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/argmax_ex_quant8.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/argmax_ex_quant8_neg_axis.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/cast_ex_float32_to_int32.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/cast_ex_int32_to_float32.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/equal_ex_1D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/equal_ex_4D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/equal_ex_broadcast_4D_2D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/equal_ex_broadcast_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/equal_ex_quant8.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/exp_ex_1D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/exp_ex_2D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/exp_ex_3D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/exp_ex_4D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/gather_ex_1D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/gather_ex_1D_int32.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/gather_ex_1D_quant8.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/gather_ex_2D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/gather_ex_2D_int32.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/gather_ex_2D_quant8.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/logical_and_ex_1D.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/logical_and_ex_2D.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/logical_and_ex_3D.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/logical_and_ex_4D.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/logical_and_ex_broadcast.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/logical_and_ex_broadcast_4D_2D.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/logical_not_ex_1D.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/logical_not_ex_4D.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/logical_or_ex_1D.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/logical_or_ex_2D.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/logical_or_ex_3D.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/logical_or_ex_4D.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/logical_or_ex_broadcast.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/logical_or_ex_broadcast_4D_2D.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/neg_ex_1D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/neg_ex_2D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/neg_ex_3D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/neg_ex_3D_int.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/neg_ex_4D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/neg_ex_4D_int.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/notequal_ex_broadcast_4D_2D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/notequal_ex_broadcast_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/notequal_ex_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/notequal_ex_quant8.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/pack_ex_3D_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/pack_ex_3D_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/pack_ex_3D_int_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/pack_ex_3D_int_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/prelu_ex_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/prelu_ex_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/reduce_min_ex_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/reduce_min_ex_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/reduce_min_ex_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/reduce_sum_ex_2D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/reduce_sum_ex_4D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/reduce_sum_ex_4D_float_reducing_C.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/reduce_sum_ex_4D_float_reducing_HW.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/rsqrt_ex_1D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/rsqrt_ex_2D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/rsqrt_ex_3D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/rsqrt_ex_4D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/split_ex_1D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/split_ex_1D_int32.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/split_ex_4D_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/split_ex_4D_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/split_ex_4D_float_3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/split_ex_4D_int32_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/split_ex_4D_int32_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/split_ex_4D_int32_3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/split_ex_4D_int32_4.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/split_ex_4D_int32_5.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/sqrt_ex_1D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/sqrt_ex_2D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/sqrt_ex_3D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/sqrt_ex_4D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/squared_difference_ex_1D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/squared_difference_ex_2D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/squared_difference_ex_3D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/squared_difference_ex_4D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/squared_difference_ex_broadcast_4D_2D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/squared_difference_ex_broadcast_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/tensorflowmax_ex_2D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/tensorflowmax_ex_2D_int32.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/tensorflowmax_ex_4D_float_reducing_C.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/tensorflowmax_ex_4D_float_reducing_HW.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/tensorflowmax_ex_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/tensorflowmax_ex_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/tensorflowmax_ex_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/tensorflowmax_ex_quant8_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/tensorflowmax_ex_quant8_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/topk_v2_ex_1D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/topk_v2_ex_1D_int32.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/topk_v2_ex_1D_quant8.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/topk_v2_ex_2D_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/topk_v2_ex_2D_int32.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/topk_v2_ex_2D_quant8.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/transpose_conv_ex_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/transpose_conv_ex_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/transpose_conv_ex_float_3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/transpose_conv_ex_int_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/transpose_conv_ex_int_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/transpose_conv_ex_int_3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/unpack_ex_3D_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/unpack_ex_3D_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/unpack_ex_3D_int_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/Ex/unpack_ex_3D_int_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/add.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/add_broadcast_4D_2D_after_nops_float_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/add_broadcast_quant8.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/add_quant8.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/avg_pool_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/avg_pool_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/avg_pool_float_3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/avg_pool_float_4.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/avg_pool_float_5.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/avg_pool_quant8_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/avg_pool_quant8_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/avg_pool_quant8_3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/avg_pool_quant8_4.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/avg_pool_quant8_5.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/concat_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/concat_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/concat_float_3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/concat_float_4D_axis3_1_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/concat_quant8_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/concat_quant8_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/concat_quant8_3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_1_h3_w2_SAME.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_1_h3_w2_VALID.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_3_h3_w2_SAME.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_3_h3_w2_VALID.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_float_channels.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_float_channels_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_float_large.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_float_large_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_float_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_quant8.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_quant8_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_quant8_channels.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_quant8_channels_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_quant8_large.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_quant8_large_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_quant8_overflow.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_quant8_overflow_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/conv_quant8_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/depth_to_space_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/depth_to_space_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/depth_to_space_float_3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/depth_to_space_quant8_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/depth_to_space_quant8_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/depthwise_conv.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/depthwise_conv2d_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/depthwise_conv2d_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/depthwise_conv2d_float_large.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/depthwise_conv2d_float_large_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/depthwise_conv2d_float_large_2_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/depthwise_conv2d_float_large_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/depthwise_conv2d_float_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/depthwise_conv2d_quant8.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/depthwise_conv2d_quant8_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/depthwise_conv2d_quant8_large.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/depthwise_conv2d_quant8_large_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/depthwise_conv2d_quant8_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/dequantize.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/embedding_lookup.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/embedding_lookup_2d_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/embedding_lookup_4d_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/floor_.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/fully_connected_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/fully_connected_float_1_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/fully_connected_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/fully_connected_float_3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/fully_connected_float_large.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/fully_connected_float_large_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/fully_connected_float_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/fully_connected_quant8.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/fully_connected_quant8_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/fully_connected_quant8_large.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/fully_connected_quant8_large_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/fully_connected_quant8_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/hashtable_lookup_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/hashtable_lookup_float_4D_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/hashtable_lookup_quant8.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/l2_normalization.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/l2_normalization_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/l2_normalization_large.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/l2_pool_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/l2_pool_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/l2_pool_float_large.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/local_response_norm_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/local_response_norm_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/local_response_norm_float_3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/local_response_norm_float_4.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/logistic_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/logistic_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/logistic_quant8_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/logistic_quant8_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/lsh_projection.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/lsh_projection_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/lsh_projection_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/lstm.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/lstm2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/lstm2_state.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/lstm2_state2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/lstm3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/lstm3_state.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/lstm3_state2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/lstm3_state3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/lstm_state.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/lstm_state2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/max_pool_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/max_pool_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/max_pool_float_3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/max_pool_float_4.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/max_pool_quant8_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/max_pool_quant8_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/max_pool_quant8_3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/max_pool_quant8_4.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/mobilenet_224_gender_basic_fixed.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/mobilenet_quantized.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/mul.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/mul_4D_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/mul_broadcast_3D_1D_1_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/mul_broadcast_3D_1D_2_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/mul_broadcast_quant8.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/mul_quant8.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/mul_relu.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/relu1_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/relu1_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/relu1_quant8_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/relu1_quant8_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/relu6_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/relu6_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/relu6_quant8_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/relu6_quant8_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/relu_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/relu_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/relu_quant8_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/relu_quant8_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/reshape.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/reshape_quant8.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/reshape_quant8_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/reshape_weights_as_inputs.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/resize_bilinear.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/resize_bilinear_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/rnn.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/rnn_state.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/softmax_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/softmax_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/softmax_quant8_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/softmax_quant8_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/space_to_depth_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/space_to_depth_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/space_to_depth_float_3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/space_to_depth_quant8_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/space_to_depth_quant8_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/svdf.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/svdf2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/svdf_state.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_0/tanh_.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/batch_to_space.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/batch_to_space_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/batch_to_space_quant8_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/div_.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/div_broadcast_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/div_broadcast_float_4D_2D_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/fully_connected_float_4d_simple.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/mean.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/mean_4D_float_reducing_C_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/mean_4D_float_reducing_HW_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/mean_axis01_1_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/mean_axis01_2_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/mean_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/mean_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/mean_quant8_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/mean_quant8_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/pad.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/pad_2D_HW_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/pad_3D_HWC_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/pad_BHWC_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/pad_BHW_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/pad_HWD_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/pad_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/pad_quant8_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/space_to_batch.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/space_to_batch_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/space_to_batch_float_1_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/space_to_batch_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/space_to_batch_float_3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/space_to_batch_quant8_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/space_to_batch_quant8_1_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/space_to_batch_quant8_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/space_to_batch_quant8_2_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/space_to_batch_quant8_3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/squeeze.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/squeeze_2D_float_1_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/squeeze_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/squeeze_quant8_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_float_10.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_float_11.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_float_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_float_3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_float_4.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_float_5.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_float_6.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_float_7.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_float_8.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_float_9.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_qaunt8_10.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_qaunt8_11.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_quant8_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_quant8_2.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_quant8_3.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_quant8_4.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_quant8_5.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_quant8_6.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_quant8_7.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_quant8_8.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/strided_slice_quant8_9.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/sub.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/sub_broadcast_4D_2D_float_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/sub_broadcast_float.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/transpose.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/transpose_2D_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/transpose_3D_nnfw.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/transpose_float_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/V1_1/transpose_quant8_1.mod.py (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/generate_test.sh (86%) rename tests/{runtime/neural_networks_test => nnapi}/specs/generate_vts_test.sh (100%) rename tests/{runtime/neural_networks_test => nnapi}/specs/slicing.sh (100%) rename tests/{runtime/neural_networks_test => nnapi/src}/TestGenerated.cpp (100%) rename tests/{runtime/neural_networks_test => nnapi/src}/TestGenerated_Ex.cpp (100%) rename tests/{runtime/neural_networks_test => nnapi/src}/TestGenerated_V1_0.cpp (100%) rename tests/{runtime/neural_networks_test => nnapi/src}/TestGenerated_V1_1.cpp (100%) rename tests/{runtime/neural_networks_test => nnapi/src}/TestGenerated_common.cpp (100%) rename tests/{runtime/neural_networks_test => nnapi/src}/TestMain.cpp (100%) rename tests/{runtime/neural_networks_test => nnapi/src}/TestTrivialModel.cpp (100%) rename tests/{runtime/neural_networks_test => nnapi/src}/TestValidation.cpp (100%) delete mode 100644 tests/runtime/CMakeLists.txt delete mode 100644 tests/runtime/neural_networks_test/CMakeLists.txt diff --git a/.gitignore b/.gitignore index 43cb354..da6e289 100644 --- a/.gitignore +++ b/.gitignore @@ -92,4 +92,6 @@ GRTAGS /tools/tflkit/*.info # Generated tests +/tests/nnapi/src/generated /tests/runtime/neural_networks_test/generated +/runtimes/tests/neural_networks_test/generated diff --git a/Makefile b/Makefile index 3df3048..e06178b 100644 --- a/Makefile +++ b/Makefile @@ -151,7 +151,7 @@ tflite: tflite_build_internal ### configure_internal: ifeq ($(GENERATE_FILES),1) - tests/runtime/neural_networks_test/specs/generate_test.sh + tests/nnapi/specs/generate_test.sh endif mkdir -p $(BUILD_ROOT) diff --git a/cmake/CfgOptionFlags.cmake b/cmake/CfgOptionFlags.cmake index 63e4265..f140335 100644 --- a/cmake/CfgOptionFlags.cmake +++ b/cmake/CfgOptionFlags.cmake @@ -3,7 +3,7 @@ # option(BUILD_PURE_ARM_COMPUTE "Build pure_arm_compute runtime" ON) option(BUILD_NEURUN "Build neurun" OFF) #if implementation is done, it would replace nn runtime. -option(BUILD_ANDROID_NN_RUNTIME_TEST "Build Android NN Runtime Test" ON) +option(BUILD_RUNTIME_NNAPI_TEST "Build Runtime NN API Generated Test" ON) option(BUILD_TFLITE_BENCHMARK_MODEL "Build tflite benchmark model" OFF) option(BUILD_NNAPI_QUICKCHECK "Build NN API Quickcheck tools" OFF) # diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 44baa6b..23d09d1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,2 +1,2 @@ -add_subdirectory(runtime) +add_subdirectory(nnapi) add_subdirectory(tools) diff --git a/tests/runtime/.FORMATDENY b/tests/nnapi/.FORMATDENY similarity index 100% rename from tests/runtime/.FORMATDENY rename to tests/nnapi/.FORMATDENY diff --git a/tests/nnapi/CMakeLists.txt b/tests/nnapi/CMakeLists.txt new file mode 100644 index 0000000..d3c9cab --- /dev/null +++ b/tests/nnapi/CMakeLists.txt @@ -0,0 +1,56 @@ +if (NOT BUILD_RUNTIME_NNAPI_TEST) + return() +endif(NOT BUILD_RUNTIME_NNAPI_TEST) + +# Executable `runtime_run` (Dummy runner executable using NN API) +set(RUNTIME_NNAPI_TEST nnapi_gtest) +set(RUNTIME_NNAPI_TEST_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/TestMain.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/TestTrivialModel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/TestValidation.cpp) + +set(GENERATED_TEST_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/TestGenerated_V1_0.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/TestGenerated_V1_1.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/TestGenerated_Ex.cpp) + +# g++-6.3 can build TestGenerated_XXX.cpp. +if (CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.3) + set(RUNTIME_NNAPI_TEST_SRC ${RUNTIME_NNAPI_TEST_SRC} ${GENERATED_TEST_SRC}) +endif() + +# Both gbs and cross for tizen support building generated test +if (OBS_BUILD) + set(RUNTIME_NNAPI_TEST_SRC ${RUNTIME_NNAPI_TEST_SRC} ${GENERATED_TEST_SRC}) +endif() + +add_executable(${RUNTIME_NNAPI_TEST} ${RUNTIME_NNAPI_TEST_SRC}) + +nnfw_find_package(GTest) + +set(RUNTIME_NNAPI_TEST_SRC_INC ${NNFW_INCLUDE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/src) +target_include_directories(${RUNTIME_NNAPI_TEST} PRIVATE ${RUNTIME_NNAPI_TEST_SRC_INC}) + +if (BUILD_NEURUN) + set(SKIPLIST_FILE_NAME ${RUNTIME_NNAPI_TEST}.skip.${TARGET_PLATFORM}.neurun) +elseif (BUILD_PURE_ARM_COMPUTE) + set(SKIPLIST_FILE_NAME ${RUNTIME_NNAPI_TEST}.skip.${TARGET_PLATFORM}) +endif() +target_link_libraries(${RUNTIME_NNAPI_TEST} gtest) +target_link_libraries(${RUNTIME_NNAPI_TEST} ${LIB_PTHREAD} dl) + +install(TARGETS nnapi_gtest DESTINATION unittest) + +install(FILES ${SKIPLIST_FILE_NAME} + DESTINATION unittest + RENAME ${RUNTIME_NNAPI_TEST}.skip + OPTIONAL) + +# If build both runtime (pure_arm_compute and neurun) at once, +# install both skiplist file as backup +if (BUILD_NEURUN AND BUILD_PURE_ARM_COMPUTE) + set(SKIPLIST_ALL_RUNTIME + ${RUNTIME_NNAPI_TEST}.skip.${TARGET_PLATFORM} + ${RUNTIME_NNAPI_TEST}.skip.${TARGET_PLATFORM}.neurun) + install(FILES ${SKIPLIST_ALL_RUNTIME} DESTINATION unittest OPTIONAL) +endif() diff --git a/tests/runtime/include/NeuralNetworksWrapper.h b/tests/nnapi/include/NeuralNetworksWrapper.h similarity index 100% rename from tests/runtime/include/NeuralNetworksWrapper.h rename to tests/nnapi/include/NeuralNetworksWrapper.h diff --git a/tests/runtime/neural_networks_test/include/TestHarness.h b/tests/nnapi/include/TestHarness.h similarity index 100% rename from tests/runtime/neural_networks_test/include/TestHarness.h rename to tests/nnapi/include/TestHarness.h diff --git a/tests/runtime/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux b/tests/nnapi/nnapi_gtest.skip.armv7l-linux similarity index 100% rename from tests/runtime/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux rename to tests/nnapi/nnapi_gtest.skip.armv7l-linux diff --git a/tests/runtime/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux.neurun b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun similarity index 100% rename from tests/runtime/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux.neurun rename to tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun diff --git a/tests/runtime/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-tizen b/tests/nnapi/nnapi_gtest.skip.armv7l-tizen similarity index 100% rename from tests/runtime/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-tizen rename to tests/nnapi/nnapi_gtest.skip.armv7l-tizen diff --git a/tests/runtime/neural_networks_test/runtime_run_android_nn_test.skip.x86_64-linux b/tests/nnapi/nnapi_gtest.skip.x86_64-linux similarity index 100% rename from tests/runtime/neural_networks_test/runtime_run_android_nn_test.skip.x86_64-linux rename to tests/nnapi/nnapi_gtest.skip.x86_64-linux diff --git a/tests/runtime/neural_networks_test/specs/Ex/argmax_ex_float_1.mod.py b/tests/nnapi/specs/Ex/argmax_ex_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/argmax_ex_float_1.mod.py rename to tests/nnapi/specs/Ex/argmax_ex_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/argmax_ex_float_2.mod.py b/tests/nnapi/specs/Ex/argmax_ex_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/argmax_ex_float_2.mod.py rename to tests/nnapi/specs/Ex/argmax_ex_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/argmax_ex_int32.mod.py b/tests/nnapi/specs/Ex/argmax_ex_int32.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/argmax_ex_int32.mod.py rename to tests/nnapi/specs/Ex/argmax_ex_int32.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/argmax_ex_neg_axis_float.mod.py b/tests/nnapi/specs/Ex/argmax_ex_neg_axis_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/argmax_ex_neg_axis_float.mod.py rename to tests/nnapi/specs/Ex/argmax_ex_neg_axis_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/argmax_ex_neg_axis_int32.mod.py b/tests/nnapi/specs/Ex/argmax_ex_neg_axis_int32.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/argmax_ex_neg_axis_int32.mod.py rename to tests/nnapi/specs/Ex/argmax_ex_neg_axis_int32.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/argmax_ex_quant8.mod.py b/tests/nnapi/specs/Ex/argmax_ex_quant8.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/argmax_ex_quant8.mod.py rename to tests/nnapi/specs/Ex/argmax_ex_quant8.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/argmax_ex_quant8_neg_axis.mod.py b/tests/nnapi/specs/Ex/argmax_ex_quant8_neg_axis.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/argmax_ex_quant8_neg_axis.mod.py rename to tests/nnapi/specs/Ex/argmax_ex_quant8_neg_axis.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/cast_ex_float32_to_int32.mod.py b/tests/nnapi/specs/Ex/cast_ex_float32_to_int32.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/cast_ex_float32_to_int32.mod.py rename to tests/nnapi/specs/Ex/cast_ex_float32_to_int32.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/cast_ex_int32_to_float32.mod.py b/tests/nnapi/specs/Ex/cast_ex_int32_to_float32.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/cast_ex_int32_to_float32.mod.py rename to tests/nnapi/specs/Ex/cast_ex_int32_to_float32.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/equal_ex_1D_float.mod.py b/tests/nnapi/specs/Ex/equal_ex_1D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/equal_ex_1D_float.mod.py rename to tests/nnapi/specs/Ex/equal_ex_1D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/equal_ex_4D_float.mod.py b/tests/nnapi/specs/Ex/equal_ex_4D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/equal_ex_4D_float.mod.py rename to tests/nnapi/specs/Ex/equal_ex_4D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/equal_ex_broadcast_4D_2D_float.mod.py b/tests/nnapi/specs/Ex/equal_ex_broadcast_4D_2D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/equal_ex_broadcast_4D_2D_float.mod.py rename to tests/nnapi/specs/Ex/equal_ex_broadcast_4D_2D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/equal_ex_broadcast_float.mod.py b/tests/nnapi/specs/Ex/equal_ex_broadcast_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/equal_ex_broadcast_float.mod.py rename to tests/nnapi/specs/Ex/equal_ex_broadcast_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/equal_ex_quant8.mod.py b/tests/nnapi/specs/Ex/equal_ex_quant8.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/equal_ex_quant8.mod.py rename to tests/nnapi/specs/Ex/equal_ex_quant8.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/exp_ex_1D_float.mod.py b/tests/nnapi/specs/Ex/exp_ex_1D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/exp_ex_1D_float.mod.py rename to tests/nnapi/specs/Ex/exp_ex_1D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/exp_ex_2D_float.mod.py b/tests/nnapi/specs/Ex/exp_ex_2D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/exp_ex_2D_float.mod.py rename to tests/nnapi/specs/Ex/exp_ex_2D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/exp_ex_3D_float.mod.py b/tests/nnapi/specs/Ex/exp_ex_3D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/exp_ex_3D_float.mod.py rename to tests/nnapi/specs/Ex/exp_ex_3D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/exp_ex_4D_float.mod.py b/tests/nnapi/specs/Ex/exp_ex_4D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/exp_ex_4D_float.mod.py rename to tests/nnapi/specs/Ex/exp_ex_4D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/gather_ex_1D_float.mod.py b/tests/nnapi/specs/Ex/gather_ex_1D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/gather_ex_1D_float.mod.py rename to tests/nnapi/specs/Ex/gather_ex_1D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/gather_ex_1D_int32.mod.py b/tests/nnapi/specs/Ex/gather_ex_1D_int32.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/gather_ex_1D_int32.mod.py rename to tests/nnapi/specs/Ex/gather_ex_1D_int32.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/gather_ex_1D_quant8.mod.py b/tests/nnapi/specs/Ex/gather_ex_1D_quant8.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/gather_ex_1D_quant8.mod.py rename to tests/nnapi/specs/Ex/gather_ex_1D_quant8.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/gather_ex_2D_float.mod.py b/tests/nnapi/specs/Ex/gather_ex_2D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/gather_ex_2D_float.mod.py rename to tests/nnapi/specs/Ex/gather_ex_2D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/gather_ex_2D_int32.mod.py b/tests/nnapi/specs/Ex/gather_ex_2D_int32.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/gather_ex_2D_int32.mod.py rename to tests/nnapi/specs/Ex/gather_ex_2D_int32.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/gather_ex_2D_quant8.mod.py b/tests/nnapi/specs/Ex/gather_ex_2D_quant8.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/gather_ex_2D_quant8.mod.py rename to tests/nnapi/specs/Ex/gather_ex_2D_quant8.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/logical_and_ex_1D.mod.py b/tests/nnapi/specs/Ex/logical_and_ex_1D.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/logical_and_ex_1D.mod.py rename to tests/nnapi/specs/Ex/logical_and_ex_1D.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/logical_and_ex_2D.mod.py b/tests/nnapi/specs/Ex/logical_and_ex_2D.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/logical_and_ex_2D.mod.py rename to tests/nnapi/specs/Ex/logical_and_ex_2D.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/logical_and_ex_3D.mod.py b/tests/nnapi/specs/Ex/logical_and_ex_3D.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/logical_and_ex_3D.mod.py rename to tests/nnapi/specs/Ex/logical_and_ex_3D.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/logical_and_ex_4D.mod.py b/tests/nnapi/specs/Ex/logical_and_ex_4D.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/logical_and_ex_4D.mod.py rename to tests/nnapi/specs/Ex/logical_and_ex_4D.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/logical_and_ex_broadcast.mod.py b/tests/nnapi/specs/Ex/logical_and_ex_broadcast.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/logical_and_ex_broadcast.mod.py rename to tests/nnapi/specs/Ex/logical_and_ex_broadcast.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/logical_and_ex_broadcast_4D_2D.mod.py b/tests/nnapi/specs/Ex/logical_and_ex_broadcast_4D_2D.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/logical_and_ex_broadcast_4D_2D.mod.py rename to tests/nnapi/specs/Ex/logical_and_ex_broadcast_4D_2D.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/logical_not_ex_1D.mod.py b/tests/nnapi/specs/Ex/logical_not_ex_1D.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/logical_not_ex_1D.mod.py rename to tests/nnapi/specs/Ex/logical_not_ex_1D.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/logical_not_ex_4D.mod.py b/tests/nnapi/specs/Ex/logical_not_ex_4D.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/logical_not_ex_4D.mod.py rename to tests/nnapi/specs/Ex/logical_not_ex_4D.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/logical_or_ex_1D.mod.py b/tests/nnapi/specs/Ex/logical_or_ex_1D.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/logical_or_ex_1D.mod.py rename to tests/nnapi/specs/Ex/logical_or_ex_1D.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/logical_or_ex_2D.mod.py b/tests/nnapi/specs/Ex/logical_or_ex_2D.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/logical_or_ex_2D.mod.py rename to tests/nnapi/specs/Ex/logical_or_ex_2D.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/logical_or_ex_3D.mod.py b/tests/nnapi/specs/Ex/logical_or_ex_3D.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/logical_or_ex_3D.mod.py rename to tests/nnapi/specs/Ex/logical_or_ex_3D.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/logical_or_ex_4D.mod.py b/tests/nnapi/specs/Ex/logical_or_ex_4D.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/logical_or_ex_4D.mod.py rename to tests/nnapi/specs/Ex/logical_or_ex_4D.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/logical_or_ex_broadcast.mod.py b/tests/nnapi/specs/Ex/logical_or_ex_broadcast.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/logical_or_ex_broadcast.mod.py rename to tests/nnapi/specs/Ex/logical_or_ex_broadcast.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/logical_or_ex_broadcast_4D_2D.mod.py b/tests/nnapi/specs/Ex/logical_or_ex_broadcast_4D_2D.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/logical_or_ex_broadcast_4D_2D.mod.py rename to tests/nnapi/specs/Ex/logical_or_ex_broadcast_4D_2D.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/neg_ex_1D_float.mod.py b/tests/nnapi/specs/Ex/neg_ex_1D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/neg_ex_1D_float.mod.py rename to tests/nnapi/specs/Ex/neg_ex_1D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/neg_ex_2D_float.mod.py b/tests/nnapi/specs/Ex/neg_ex_2D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/neg_ex_2D_float.mod.py rename to tests/nnapi/specs/Ex/neg_ex_2D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/neg_ex_3D_float.mod.py b/tests/nnapi/specs/Ex/neg_ex_3D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/neg_ex_3D_float.mod.py rename to tests/nnapi/specs/Ex/neg_ex_3D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/neg_ex_3D_int.mod.py b/tests/nnapi/specs/Ex/neg_ex_3D_int.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/neg_ex_3D_int.mod.py rename to tests/nnapi/specs/Ex/neg_ex_3D_int.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/neg_ex_4D_float.mod.py b/tests/nnapi/specs/Ex/neg_ex_4D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/neg_ex_4D_float.mod.py rename to tests/nnapi/specs/Ex/neg_ex_4D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/neg_ex_4D_int.mod.py b/tests/nnapi/specs/Ex/neg_ex_4D_int.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/neg_ex_4D_int.mod.py rename to tests/nnapi/specs/Ex/neg_ex_4D_int.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/notequal_ex_broadcast_4D_2D_float.mod.py b/tests/nnapi/specs/Ex/notequal_ex_broadcast_4D_2D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/notequal_ex_broadcast_4D_2D_float.mod.py rename to tests/nnapi/specs/Ex/notequal_ex_broadcast_4D_2D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/notequal_ex_broadcast_float.mod.py b/tests/nnapi/specs/Ex/notequal_ex_broadcast_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/notequal_ex_broadcast_float.mod.py rename to tests/nnapi/specs/Ex/notequal_ex_broadcast_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/notequal_ex_float.mod.py b/tests/nnapi/specs/Ex/notequal_ex_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/notequal_ex_float.mod.py rename to tests/nnapi/specs/Ex/notequal_ex_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/notequal_ex_quant8.mod.py b/tests/nnapi/specs/Ex/notequal_ex_quant8.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/notequal_ex_quant8.mod.py rename to tests/nnapi/specs/Ex/notequal_ex_quant8.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/pack_ex_3D_float_1.mod.py b/tests/nnapi/specs/Ex/pack_ex_3D_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/pack_ex_3D_float_1.mod.py rename to tests/nnapi/specs/Ex/pack_ex_3D_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/pack_ex_3D_float_2.mod.py b/tests/nnapi/specs/Ex/pack_ex_3D_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/pack_ex_3D_float_2.mod.py rename to tests/nnapi/specs/Ex/pack_ex_3D_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/pack_ex_3D_int_1.mod.py b/tests/nnapi/specs/Ex/pack_ex_3D_int_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/pack_ex_3D_int_1.mod.py rename to tests/nnapi/specs/Ex/pack_ex_3D_int_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/pack_ex_3D_int_2.mod.py b/tests/nnapi/specs/Ex/pack_ex_3D_int_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/pack_ex_3D_int_2.mod.py rename to tests/nnapi/specs/Ex/pack_ex_3D_int_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/prelu_ex_float_1.mod.py b/tests/nnapi/specs/Ex/prelu_ex_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/prelu_ex_float_1.mod.py rename to tests/nnapi/specs/Ex/prelu_ex_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/prelu_ex_float_2.mod.py b/tests/nnapi/specs/Ex/prelu_ex_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/prelu_ex_float_2.mod.py rename to tests/nnapi/specs/Ex/prelu_ex_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/reduce_min_ex_float.mod.py b/tests/nnapi/specs/Ex/reduce_min_ex_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/reduce_min_ex_float.mod.py rename to tests/nnapi/specs/Ex/reduce_min_ex_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/reduce_min_ex_float_1.mod.py b/tests/nnapi/specs/Ex/reduce_min_ex_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/reduce_min_ex_float_1.mod.py rename to tests/nnapi/specs/Ex/reduce_min_ex_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/reduce_min_ex_float_2.mod.py b/tests/nnapi/specs/Ex/reduce_min_ex_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/reduce_min_ex_float_2.mod.py rename to tests/nnapi/specs/Ex/reduce_min_ex_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/reduce_sum_ex_2D_float.mod.py b/tests/nnapi/specs/Ex/reduce_sum_ex_2D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/reduce_sum_ex_2D_float.mod.py rename to tests/nnapi/specs/Ex/reduce_sum_ex_2D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/reduce_sum_ex_4D_float.mod.py b/tests/nnapi/specs/Ex/reduce_sum_ex_4D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/reduce_sum_ex_4D_float.mod.py rename to tests/nnapi/specs/Ex/reduce_sum_ex_4D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/reduce_sum_ex_4D_float_reducing_C.mod.py b/tests/nnapi/specs/Ex/reduce_sum_ex_4D_float_reducing_C.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/reduce_sum_ex_4D_float_reducing_C.mod.py rename to tests/nnapi/specs/Ex/reduce_sum_ex_4D_float_reducing_C.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/reduce_sum_ex_4D_float_reducing_HW.mod.py b/tests/nnapi/specs/Ex/reduce_sum_ex_4D_float_reducing_HW.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/reduce_sum_ex_4D_float_reducing_HW.mod.py rename to tests/nnapi/specs/Ex/reduce_sum_ex_4D_float_reducing_HW.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/rsqrt_ex_1D_float.mod.py b/tests/nnapi/specs/Ex/rsqrt_ex_1D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/rsqrt_ex_1D_float.mod.py rename to tests/nnapi/specs/Ex/rsqrt_ex_1D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/rsqrt_ex_2D_float.mod.py b/tests/nnapi/specs/Ex/rsqrt_ex_2D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/rsqrt_ex_2D_float.mod.py rename to tests/nnapi/specs/Ex/rsqrt_ex_2D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/rsqrt_ex_3D_float.mod.py b/tests/nnapi/specs/Ex/rsqrt_ex_3D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/rsqrt_ex_3D_float.mod.py rename to tests/nnapi/specs/Ex/rsqrt_ex_3D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/rsqrt_ex_4D_float.mod.py b/tests/nnapi/specs/Ex/rsqrt_ex_4D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/rsqrt_ex_4D_float.mod.py rename to tests/nnapi/specs/Ex/rsqrt_ex_4D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/split_ex_1D_float.mod.py b/tests/nnapi/specs/Ex/split_ex_1D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/split_ex_1D_float.mod.py rename to tests/nnapi/specs/Ex/split_ex_1D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/split_ex_1D_int32.mod.py b/tests/nnapi/specs/Ex/split_ex_1D_int32.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/split_ex_1D_int32.mod.py rename to tests/nnapi/specs/Ex/split_ex_1D_int32.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/split_ex_4D_float_1.mod.py b/tests/nnapi/specs/Ex/split_ex_4D_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/split_ex_4D_float_1.mod.py rename to tests/nnapi/specs/Ex/split_ex_4D_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/split_ex_4D_float_2.mod.py b/tests/nnapi/specs/Ex/split_ex_4D_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/split_ex_4D_float_2.mod.py rename to tests/nnapi/specs/Ex/split_ex_4D_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/split_ex_4D_float_3.mod.py b/tests/nnapi/specs/Ex/split_ex_4D_float_3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/split_ex_4D_float_3.mod.py rename to tests/nnapi/specs/Ex/split_ex_4D_float_3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/split_ex_4D_int32_1.mod.py b/tests/nnapi/specs/Ex/split_ex_4D_int32_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/split_ex_4D_int32_1.mod.py rename to tests/nnapi/specs/Ex/split_ex_4D_int32_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/split_ex_4D_int32_2.mod.py b/tests/nnapi/specs/Ex/split_ex_4D_int32_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/split_ex_4D_int32_2.mod.py rename to tests/nnapi/specs/Ex/split_ex_4D_int32_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/split_ex_4D_int32_3.mod.py b/tests/nnapi/specs/Ex/split_ex_4D_int32_3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/split_ex_4D_int32_3.mod.py rename to tests/nnapi/specs/Ex/split_ex_4D_int32_3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/split_ex_4D_int32_4.mod.py b/tests/nnapi/specs/Ex/split_ex_4D_int32_4.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/split_ex_4D_int32_4.mod.py rename to tests/nnapi/specs/Ex/split_ex_4D_int32_4.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/split_ex_4D_int32_5.mod.py b/tests/nnapi/specs/Ex/split_ex_4D_int32_5.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/split_ex_4D_int32_5.mod.py rename to tests/nnapi/specs/Ex/split_ex_4D_int32_5.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/sqrt_ex_1D_float.mod.py b/tests/nnapi/specs/Ex/sqrt_ex_1D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/sqrt_ex_1D_float.mod.py rename to tests/nnapi/specs/Ex/sqrt_ex_1D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/sqrt_ex_2D_float.mod.py b/tests/nnapi/specs/Ex/sqrt_ex_2D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/sqrt_ex_2D_float.mod.py rename to tests/nnapi/specs/Ex/sqrt_ex_2D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/sqrt_ex_3D_float.mod.py b/tests/nnapi/specs/Ex/sqrt_ex_3D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/sqrt_ex_3D_float.mod.py rename to tests/nnapi/specs/Ex/sqrt_ex_3D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/sqrt_ex_4D_float.mod.py b/tests/nnapi/specs/Ex/sqrt_ex_4D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/sqrt_ex_4D_float.mod.py rename to tests/nnapi/specs/Ex/sqrt_ex_4D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/squared_difference_ex_1D_float.mod.py b/tests/nnapi/specs/Ex/squared_difference_ex_1D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/squared_difference_ex_1D_float.mod.py rename to tests/nnapi/specs/Ex/squared_difference_ex_1D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/squared_difference_ex_2D_float.mod.py b/tests/nnapi/specs/Ex/squared_difference_ex_2D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/squared_difference_ex_2D_float.mod.py rename to tests/nnapi/specs/Ex/squared_difference_ex_2D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/squared_difference_ex_3D_float.mod.py b/tests/nnapi/specs/Ex/squared_difference_ex_3D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/squared_difference_ex_3D_float.mod.py rename to tests/nnapi/specs/Ex/squared_difference_ex_3D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/squared_difference_ex_4D_float.mod.py b/tests/nnapi/specs/Ex/squared_difference_ex_4D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/squared_difference_ex_4D_float.mod.py rename to tests/nnapi/specs/Ex/squared_difference_ex_4D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/squared_difference_ex_broadcast_4D_2D_float.mod.py b/tests/nnapi/specs/Ex/squared_difference_ex_broadcast_4D_2D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/squared_difference_ex_broadcast_4D_2D_float.mod.py rename to tests/nnapi/specs/Ex/squared_difference_ex_broadcast_4D_2D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/squared_difference_ex_broadcast_float.mod.py b/tests/nnapi/specs/Ex/squared_difference_ex_broadcast_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/squared_difference_ex_broadcast_float.mod.py rename to tests/nnapi/specs/Ex/squared_difference_ex_broadcast_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/tensorflowmax_ex_2D_float.mod.py b/tests/nnapi/specs/Ex/tensorflowmax_ex_2D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/tensorflowmax_ex_2D_float.mod.py rename to tests/nnapi/specs/Ex/tensorflowmax_ex_2D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/tensorflowmax_ex_2D_int32.mod.py b/tests/nnapi/specs/Ex/tensorflowmax_ex_2D_int32.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/tensorflowmax_ex_2D_int32.mod.py rename to tests/nnapi/specs/Ex/tensorflowmax_ex_2D_int32.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/tensorflowmax_ex_4D_float_reducing_C.mod.py b/tests/nnapi/specs/Ex/tensorflowmax_ex_4D_float_reducing_C.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/tensorflowmax_ex_4D_float_reducing_C.mod.py rename to tests/nnapi/specs/Ex/tensorflowmax_ex_4D_float_reducing_C.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/tensorflowmax_ex_4D_float_reducing_HW.mod.py b/tests/nnapi/specs/Ex/tensorflowmax_ex_4D_float_reducing_HW.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/tensorflowmax_ex_4D_float_reducing_HW.mod.py rename to tests/nnapi/specs/Ex/tensorflowmax_ex_4D_float_reducing_HW.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/tensorflowmax_ex_float.mod.py b/tests/nnapi/specs/Ex/tensorflowmax_ex_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/tensorflowmax_ex_float.mod.py rename to tests/nnapi/specs/Ex/tensorflowmax_ex_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/tensorflowmax_ex_float_1.mod.py b/tests/nnapi/specs/Ex/tensorflowmax_ex_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/tensorflowmax_ex_float_1.mod.py rename to tests/nnapi/specs/Ex/tensorflowmax_ex_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/tensorflowmax_ex_float_2.mod.py b/tests/nnapi/specs/Ex/tensorflowmax_ex_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/tensorflowmax_ex_float_2.mod.py rename to tests/nnapi/specs/Ex/tensorflowmax_ex_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/tensorflowmax_ex_quant8_1.mod.py b/tests/nnapi/specs/Ex/tensorflowmax_ex_quant8_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/tensorflowmax_ex_quant8_1.mod.py rename to tests/nnapi/specs/Ex/tensorflowmax_ex_quant8_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/tensorflowmax_ex_quant8_2.mod.py b/tests/nnapi/specs/Ex/tensorflowmax_ex_quant8_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/tensorflowmax_ex_quant8_2.mod.py rename to tests/nnapi/specs/Ex/tensorflowmax_ex_quant8_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/topk_v2_ex_1D_float.mod.py b/tests/nnapi/specs/Ex/topk_v2_ex_1D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/topk_v2_ex_1D_float.mod.py rename to tests/nnapi/specs/Ex/topk_v2_ex_1D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/topk_v2_ex_1D_int32.mod.py b/tests/nnapi/specs/Ex/topk_v2_ex_1D_int32.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/topk_v2_ex_1D_int32.mod.py rename to tests/nnapi/specs/Ex/topk_v2_ex_1D_int32.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/topk_v2_ex_1D_quant8.mod.py b/tests/nnapi/specs/Ex/topk_v2_ex_1D_quant8.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/topk_v2_ex_1D_quant8.mod.py rename to tests/nnapi/specs/Ex/topk_v2_ex_1D_quant8.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/topk_v2_ex_2D_float.mod.py b/tests/nnapi/specs/Ex/topk_v2_ex_2D_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/topk_v2_ex_2D_float.mod.py rename to tests/nnapi/specs/Ex/topk_v2_ex_2D_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/topk_v2_ex_2D_int32.mod.py b/tests/nnapi/specs/Ex/topk_v2_ex_2D_int32.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/topk_v2_ex_2D_int32.mod.py rename to tests/nnapi/specs/Ex/topk_v2_ex_2D_int32.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/topk_v2_ex_2D_quant8.mod.py b/tests/nnapi/specs/Ex/topk_v2_ex_2D_quant8.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/topk_v2_ex_2D_quant8.mod.py rename to tests/nnapi/specs/Ex/topk_v2_ex_2D_quant8.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/transpose_conv_ex_float_1.mod.py b/tests/nnapi/specs/Ex/transpose_conv_ex_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/transpose_conv_ex_float_1.mod.py rename to tests/nnapi/specs/Ex/transpose_conv_ex_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/transpose_conv_ex_float_2.mod.py b/tests/nnapi/specs/Ex/transpose_conv_ex_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/transpose_conv_ex_float_2.mod.py rename to tests/nnapi/specs/Ex/transpose_conv_ex_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/transpose_conv_ex_float_3.mod.py b/tests/nnapi/specs/Ex/transpose_conv_ex_float_3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/transpose_conv_ex_float_3.mod.py rename to tests/nnapi/specs/Ex/transpose_conv_ex_float_3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/transpose_conv_ex_int_1.mod.py b/tests/nnapi/specs/Ex/transpose_conv_ex_int_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/transpose_conv_ex_int_1.mod.py rename to tests/nnapi/specs/Ex/transpose_conv_ex_int_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/transpose_conv_ex_int_2.mod.py b/tests/nnapi/specs/Ex/transpose_conv_ex_int_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/transpose_conv_ex_int_2.mod.py rename to tests/nnapi/specs/Ex/transpose_conv_ex_int_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/transpose_conv_ex_int_3.mod.py b/tests/nnapi/specs/Ex/transpose_conv_ex_int_3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/transpose_conv_ex_int_3.mod.py rename to tests/nnapi/specs/Ex/transpose_conv_ex_int_3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/unpack_ex_3D_float_1.mod.py b/tests/nnapi/specs/Ex/unpack_ex_3D_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/unpack_ex_3D_float_1.mod.py rename to tests/nnapi/specs/Ex/unpack_ex_3D_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/unpack_ex_3D_float_2.mod.py b/tests/nnapi/specs/Ex/unpack_ex_3D_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/unpack_ex_3D_float_2.mod.py rename to tests/nnapi/specs/Ex/unpack_ex_3D_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/unpack_ex_3D_int_1.mod.py b/tests/nnapi/specs/Ex/unpack_ex_3D_int_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/unpack_ex_3D_int_1.mod.py rename to tests/nnapi/specs/Ex/unpack_ex_3D_int_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/Ex/unpack_ex_3D_int_2.mod.py b/tests/nnapi/specs/Ex/unpack_ex_3D_int_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/Ex/unpack_ex_3D_int_2.mod.py rename to tests/nnapi/specs/Ex/unpack_ex_3D_int_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/add.mod.py b/tests/nnapi/specs/V1_0/add.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/add.mod.py rename to tests/nnapi/specs/V1_0/add.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/add_broadcast_4D_2D_after_nops_float_nnfw.mod.py b/tests/nnapi/specs/V1_0/add_broadcast_4D_2D_after_nops_float_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/add_broadcast_4D_2D_after_nops_float_nnfw.mod.py rename to tests/nnapi/specs/V1_0/add_broadcast_4D_2D_after_nops_float_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/add_broadcast_quant8.mod.py b/tests/nnapi/specs/V1_0/add_broadcast_quant8.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/add_broadcast_quant8.mod.py rename to tests/nnapi/specs/V1_0/add_broadcast_quant8.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/add_quant8.mod.py b/tests/nnapi/specs/V1_0/add_quant8.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/add_quant8.mod.py rename to tests/nnapi/specs/V1_0/add_quant8.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/avg_pool_float_1.mod.py b/tests/nnapi/specs/V1_0/avg_pool_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/avg_pool_float_1.mod.py rename to tests/nnapi/specs/V1_0/avg_pool_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/avg_pool_float_2.mod.py b/tests/nnapi/specs/V1_0/avg_pool_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/avg_pool_float_2.mod.py rename to tests/nnapi/specs/V1_0/avg_pool_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/avg_pool_float_3.mod.py b/tests/nnapi/specs/V1_0/avg_pool_float_3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/avg_pool_float_3.mod.py rename to tests/nnapi/specs/V1_0/avg_pool_float_3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/avg_pool_float_4.mod.py b/tests/nnapi/specs/V1_0/avg_pool_float_4.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/avg_pool_float_4.mod.py rename to tests/nnapi/specs/V1_0/avg_pool_float_4.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/avg_pool_float_5.mod.py b/tests/nnapi/specs/V1_0/avg_pool_float_5.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/avg_pool_float_5.mod.py rename to tests/nnapi/specs/V1_0/avg_pool_float_5.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/avg_pool_quant8_1.mod.py b/tests/nnapi/specs/V1_0/avg_pool_quant8_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/avg_pool_quant8_1.mod.py rename to tests/nnapi/specs/V1_0/avg_pool_quant8_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/avg_pool_quant8_2.mod.py b/tests/nnapi/specs/V1_0/avg_pool_quant8_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/avg_pool_quant8_2.mod.py rename to tests/nnapi/specs/V1_0/avg_pool_quant8_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/avg_pool_quant8_3.mod.py b/tests/nnapi/specs/V1_0/avg_pool_quant8_3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/avg_pool_quant8_3.mod.py rename to tests/nnapi/specs/V1_0/avg_pool_quant8_3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/avg_pool_quant8_4.mod.py b/tests/nnapi/specs/V1_0/avg_pool_quant8_4.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/avg_pool_quant8_4.mod.py rename to tests/nnapi/specs/V1_0/avg_pool_quant8_4.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/avg_pool_quant8_5.mod.py b/tests/nnapi/specs/V1_0/avg_pool_quant8_5.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/avg_pool_quant8_5.mod.py rename to tests/nnapi/specs/V1_0/avg_pool_quant8_5.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/concat_float_1.mod.py b/tests/nnapi/specs/V1_0/concat_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/concat_float_1.mod.py rename to tests/nnapi/specs/V1_0/concat_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/concat_float_2.mod.py b/tests/nnapi/specs/V1_0/concat_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/concat_float_2.mod.py rename to tests/nnapi/specs/V1_0/concat_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/concat_float_3.mod.py b/tests/nnapi/specs/V1_0/concat_float_3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/concat_float_3.mod.py rename to tests/nnapi/specs/V1_0/concat_float_3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/concat_float_4D_axis3_1_nnfw.mod.py b/tests/nnapi/specs/V1_0/concat_float_4D_axis3_1_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/concat_float_4D_axis3_1_nnfw.mod.py rename to tests/nnapi/specs/V1_0/concat_float_4D_axis3_1_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/concat_quant8_1.mod.py b/tests/nnapi/specs/V1_0/concat_quant8_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/concat_quant8_1.mod.py rename to tests/nnapi/specs/V1_0/concat_quant8_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/concat_quant8_2.mod.py b/tests/nnapi/specs/V1_0/concat_quant8_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/concat_quant8_2.mod.py rename to tests/nnapi/specs/V1_0/concat_quant8_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/concat_quant8_3.mod.py b/tests/nnapi/specs/V1_0/concat_quant8_3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/concat_quant8_3.mod.py rename to tests/nnapi/specs/V1_0/concat_quant8_3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_1_h3_w2_SAME.mod.py b/tests/nnapi/specs/V1_0/conv_1_h3_w2_SAME.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_1_h3_w2_SAME.mod.py rename to tests/nnapi/specs/V1_0/conv_1_h3_w2_SAME.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_1_h3_w2_VALID.mod.py b/tests/nnapi/specs/V1_0/conv_1_h3_w2_VALID.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_1_h3_w2_VALID.mod.py rename to tests/nnapi/specs/V1_0/conv_1_h3_w2_VALID.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_3_h3_w2_SAME.mod.py b/tests/nnapi/specs/V1_0/conv_3_h3_w2_SAME.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_3_h3_w2_SAME.mod.py rename to tests/nnapi/specs/V1_0/conv_3_h3_w2_SAME.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_3_h3_w2_VALID.mod.py b/tests/nnapi/specs/V1_0/conv_3_h3_w2_VALID.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_3_h3_w2_VALID.mod.py rename to tests/nnapi/specs/V1_0/conv_3_h3_w2_VALID.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_float.mod.py b/tests/nnapi/specs/V1_0/conv_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_float.mod.py rename to tests/nnapi/specs/V1_0/conv_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_float_2.mod.py b/tests/nnapi/specs/V1_0/conv_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_float_2.mod.py rename to tests/nnapi/specs/V1_0/conv_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_float_channels.mod.py b/tests/nnapi/specs/V1_0/conv_float_channels.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_float_channels.mod.py rename to tests/nnapi/specs/V1_0/conv_float_channels.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_float_channels_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/conv_float_channels_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_float_channels_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/conv_float_channels_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_float_large.mod.py b/tests/nnapi/specs/V1_0/conv_float_large.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_float_large.mod.py rename to tests/nnapi/specs/V1_0/conv_float_large.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_float_large_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/conv_float_large_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_float_large_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/conv_float_large_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_float_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/conv_float_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_float_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/conv_float_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_quant8.mod.py b/tests/nnapi/specs/V1_0/conv_quant8.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_quant8.mod.py rename to tests/nnapi/specs/V1_0/conv_quant8.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_quant8_2.mod.py b/tests/nnapi/specs/V1_0/conv_quant8_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_quant8_2.mod.py rename to tests/nnapi/specs/V1_0/conv_quant8_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_quant8_channels.mod.py b/tests/nnapi/specs/V1_0/conv_quant8_channels.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_quant8_channels.mod.py rename to tests/nnapi/specs/V1_0/conv_quant8_channels.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_quant8_channels_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/conv_quant8_channels_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_quant8_channels_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/conv_quant8_channels_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_quant8_large.mod.py b/tests/nnapi/specs/V1_0/conv_quant8_large.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_quant8_large.mod.py rename to tests/nnapi/specs/V1_0/conv_quant8_large.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_quant8_large_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/conv_quant8_large_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_quant8_large_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/conv_quant8_large_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_quant8_overflow.mod.py b/tests/nnapi/specs/V1_0/conv_quant8_overflow.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_quant8_overflow.mod.py rename to tests/nnapi/specs/V1_0/conv_quant8_overflow.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_quant8_overflow_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/conv_quant8_overflow_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_quant8_overflow_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/conv_quant8_overflow_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/conv_quant8_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/conv_quant8_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/conv_quant8_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/conv_quant8_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/depth_to_space_float_1.mod.py b/tests/nnapi/specs/V1_0/depth_to_space_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/depth_to_space_float_1.mod.py rename to tests/nnapi/specs/V1_0/depth_to_space_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/depth_to_space_float_2.mod.py b/tests/nnapi/specs/V1_0/depth_to_space_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/depth_to_space_float_2.mod.py rename to tests/nnapi/specs/V1_0/depth_to_space_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/depth_to_space_float_3.mod.py b/tests/nnapi/specs/V1_0/depth_to_space_float_3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/depth_to_space_float_3.mod.py rename to tests/nnapi/specs/V1_0/depth_to_space_float_3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/depth_to_space_quant8_1.mod.py b/tests/nnapi/specs/V1_0/depth_to_space_quant8_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/depth_to_space_quant8_1.mod.py rename to tests/nnapi/specs/V1_0/depth_to_space_quant8_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/depth_to_space_quant8_2.mod.py b/tests/nnapi/specs/V1_0/depth_to_space_quant8_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/depth_to_space_quant8_2.mod.py rename to tests/nnapi/specs/V1_0/depth_to_space_quant8_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv.mod.py b/tests/nnapi/specs/V1_0/depthwise_conv.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv.mod.py rename to tests/nnapi/specs/V1_0/depthwise_conv.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_float.mod.py b/tests/nnapi/specs/V1_0/depthwise_conv2d_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_float.mod.py rename to tests/nnapi/specs/V1_0/depthwise_conv2d_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_float_2.mod.py b/tests/nnapi/specs/V1_0/depthwise_conv2d_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_float_2.mod.py rename to tests/nnapi/specs/V1_0/depthwise_conv2d_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_float_large.mod.py b/tests/nnapi/specs/V1_0/depthwise_conv2d_float_large.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_float_large.mod.py rename to tests/nnapi/specs/V1_0/depthwise_conv2d_float_large.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_float_large_2.mod.py b/tests/nnapi/specs/V1_0/depthwise_conv2d_float_large_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_float_large_2.mod.py rename to tests/nnapi/specs/V1_0/depthwise_conv2d_float_large_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_float_large_2_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/depthwise_conv2d_float_large_2_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_float_large_2_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/depthwise_conv2d_float_large_2_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_float_large_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/depthwise_conv2d_float_large_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_float_large_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/depthwise_conv2d_float_large_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_float_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/depthwise_conv2d_float_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_float_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/depthwise_conv2d_float_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_quant8.mod.py b/tests/nnapi/specs/V1_0/depthwise_conv2d_quant8.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_quant8.mod.py rename to tests/nnapi/specs/V1_0/depthwise_conv2d_quant8.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_quant8_2.mod.py b/tests/nnapi/specs/V1_0/depthwise_conv2d_quant8_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_quant8_2.mod.py rename to tests/nnapi/specs/V1_0/depthwise_conv2d_quant8_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_quant8_large.mod.py b/tests/nnapi/specs/V1_0/depthwise_conv2d_quant8_large.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_quant8_large.mod.py rename to tests/nnapi/specs/V1_0/depthwise_conv2d_quant8_large.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_quant8_large_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/depthwise_conv2d_quant8_large_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_quant8_large_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/depthwise_conv2d_quant8_large_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_quant8_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/depthwise_conv2d_quant8_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/depthwise_conv2d_quant8_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/depthwise_conv2d_quant8_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/dequantize.mod.py b/tests/nnapi/specs/V1_0/dequantize.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/dequantize.mod.py rename to tests/nnapi/specs/V1_0/dequantize.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/embedding_lookup.mod.py b/tests/nnapi/specs/V1_0/embedding_lookup.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/embedding_lookup.mod.py rename to tests/nnapi/specs/V1_0/embedding_lookup.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/embedding_lookup_2d_nnfw.mod.py b/tests/nnapi/specs/V1_0/embedding_lookup_2d_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/embedding_lookup_2d_nnfw.mod.py rename to tests/nnapi/specs/V1_0/embedding_lookup_2d_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/embedding_lookup_4d_nnfw.mod.py b/tests/nnapi/specs/V1_0/embedding_lookup_4d_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/embedding_lookup_4d_nnfw.mod.py rename to tests/nnapi/specs/V1_0/embedding_lookup_4d_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/floor_.mod.py b/tests/nnapi/specs/V1_0/floor_.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/floor_.mod.py rename to tests/nnapi/specs/V1_0/floor_.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/fully_connected_float.mod.py b/tests/nnapi/specs/V1_0/fully_connected_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/fully_connected_float.mod.py rename to tests/nnapi/specs/V1_0/fully_connected_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/fully_connected_float_1_nnfw.mod.py b/tests/nnapi/specs/V1_0/fully_connected_float_1_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/fully_connected_float_1_nnfw.mod.py rename to tests/nnapi/specs/V1_0/fully_connected_float_1_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/fully_connected_float_2.mod.py b/tests/nnapi/specs/V1_0/fully_connected_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/fully_connected_float_2.mod.py rename to tests/nnapi/specs/V1_0/fully_connected_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/fully_connected_float_3.mod.py b/tests/nnapi/specs/V1_0/fully_connected_float_3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/fully_connected_float_3.mod.py rename to tests/nnapi/specs/V1_0/fully_connected_float_3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/fully_connected_float_large.mod.py b/tests/nnapi/specs/V1_0/fully_connected_float_large.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/fully_connected_float_large.mod.py rename to tests/nnapi/specs/V1_0/fully_connected_float_large.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/fully_connected_float_large_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/fully_connected_float_large_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/fully_connected_float_large_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/fully_connected_float_large_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/fully_connected_float_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/fully_connected_float_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/fully_connected_float_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/fully_connected_float_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/fully_connected_quant8.mod.py b/tests/nnapi/specs/V1_0/fully_connected_quant8.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/fully_connected_quant8.mod.py rename to tests/nnapi/specs/V1_0/fully_connected_quant8.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/fully_connected_quant8_2.mod.py b/tests/nnapi/specs/V1_0/fully_connected_quant8_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/fully_connected_quant8_2.mod.py rename to tests/nnapi/specs/V1_0/fully_connected_quant8_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/fully_connected_quant8_large.mod.py b/tests/nnapi/specs/V1_0/fully_connected_quant8_large.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/fully_connected_quant8_large.mod.py rename to tests/nnapi/specs/V1_0/fully_connected_quant8_large.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/fully_connected_quant8_large_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/fully_connected_quant8_large_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/fully_connected_quant8_large_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/fully_connected_quant8_large_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/fully_connected_quant8_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/fully_connected_quant8_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/fully_connected_quant8_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/fully_connected_quant8_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/hashtable_lookup_float.mod.py b/tests/nnapi/specs/V1_0/hashtable_lookup_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/hashtable_lookup_float.mod.py rename to tests/nnapi/specs/V1_0/hashtable_lookup_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/hashtable_lookup_float_4D_nnfw.mod.py b/tests/nnapi/specs/V1_0/hashtable_lookup_float_4D_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/hashtable_lookup_float_4D_nnfw.mod.py rename to tests/nnapi/specs/V1_0/hashtable_lookup_float_4D_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/hashtable_lookup_quant8.mod.py b/tests/nnapi/specs/V1_0/hashtable_lookup_quant8.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/hashtable_lookup_quant8.mod.py rename to tests/nnapi/specs/V1_0/hashtable_lookup_quant8.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/l2_normalization.mod.py b/tests/nnapi/specs/V1_0/l2_normalization.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/l2_normalization.mod.py rename to tests/nnapi/specs/V1_0/l2_normalization.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/l2_normalization_2.mod.py b/tests/nnapi/specs/V1_0/l2_normalization_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/l2_normalization_2.mod.py rename to tests/nnapi/specs/V1_0/l2_normalization_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/l2_normalization_large.mod.py b/tests/nnapi/specs/V1_0/l2_normalization_large.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/l2_normalization_large.mod.py rename to tests/nnapi/specs/V1_0/l2_normalization_large.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/l2_pool_float.mod.py b/tests/nnapi/specs/V1_0/l2_pool_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/l2_pool_float.mod.py rename to tests/nnapi/specs/V1_0/l2_pool_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/l2_pool_float_2.mod.py b/tests/nnapi/specs/V1_0/l2_pool_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/l2_pool_float_2.mod.py rename to tests/nnapi/specs/V1_0/l2_pool_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/l2_pool_float_large.mod.py b/tests/nnapi/specs/V1_0/l2_pool_float_large.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/l2_pool_float_large.mod.py rename to tests/nnapi/specs/V1_0/l2_pool_float_large.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/local_response_norm_float_1.mod.py b/tests/nnapi/specs/V1_0/local_response_norm_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/local_response_norm_float_1.mod.py rename to tests/nnapi/specs/V1_0/local_response_norm_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/local_response_norm_float_2.mod.py b/tests/nnapi/specs/V1_0/local_response_norm_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/local_response_norm_float_2.mod.py rename to tests/nnapi/specs/V1_0/local_response_norm_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/local_response_norm_float_3.mod.py b/tests/nnapi/specs/V1_0/local_response_norm_float_3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/local_response_norm_float_3.mod.py rename to tests/nnapi/specs/V1_0/local_response_norm_float_3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/local_response_norm_float_4.mod.py b/tests/nnapi/specs/V1_0/local_response_norm_float_4.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/local_response_norm_float_4.mod.py rename to tests/nnapi/specs/V1_0/local_response_norm_float_4.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/logistic_float_1.mod.py b/tests/nnapi/specs/V1_0/logistic_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/logistic_float_1.mod.py rename to tests/nnapi/specs/V1_0/logistic_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/logistic_float_2.mod.py b/tests/nnapi/specs/V1_0/logistic_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/logistic_float_2.mod.py rename to tests/nnapi/specs/V1_0/logistic_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/logistic_quant8_1.mod.py b/tests/nnapi/specs/V1_0/logistic_quant8_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/logistic_quant8_1.mod.py rename to tests/nnapi/specs/V1_0/logistic_quant8_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/logistic_quant8_2.mod.py b/tests/nnapi/specs/V1_0/logistic_quant8_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/logistic_quant8_2.mod.py rename to tests/nnapi/specs/V1_0/logistic_quant8_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/lsh_projection.mod.py b/tests/nnapi/specs/V1_0/lsh_projection.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/lsh_projection.mod.py rename to tests/nnapi/specs/V1_0/lsh_projection.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/lsh_projection_2.mod.py b/tests/nnapi/specs/V1_0/lsh_projection_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/lsh_projection_2.mod.py rename to tests/nnapi/specs/V1_0/lsh_projection_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/lsh_projection_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/lsh_projection_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/lsh_projection_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/lsh_projection_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/lstm.mod.py b/tests/nnapi/specs/V1_0/lstm.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/lstm.mod.py rename to tests/nnapi/specs/V1_0/lstm.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/lstm2.mod.py b/tests/nnapi/specs/V1_0/lstm2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/lstm2.mod.py rename to tests/nnapi/specs/V1_0/lstm2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/lstm2_state.mod.py b/tests/nnapi/specs/V1_0/lstm2_state.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/lstm2_state.mod.py rename to tests/nnapi/specs/V1_0/lstm2_state.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/lstm2_state2.mod.py b/tests/nnapi/specs/V1_0/lstm2_state2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/lstm2_state2.mod.py rename to tests/nnapi/specs/V1_0/lstm2_state2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/lstm3.mod.py b/tests/nnapi/specs/V1_0/lstm3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/lstm3.mod.py rename to tests/nnapi/specs/V1_0/lstm3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/lstm3_state.mod.py b/tests/nnapi/specs/V1_0/lstm3_state.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/lstm3_state.mod.py rename to tests/nnapi/specs/V1_0/lstm3_state.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/lstm3_state2.mod.py b/tests/nnapi/specs/V1_0/lstm3_state2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/lstm3_state2.mod.py rename to tests/nnapi/specs/V1_0/lstm3_state2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/lstm3_state3.mod.py b/tests/nnapi/specs/V1_0/lstm3_state3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/lstm3_state3.mod.py rename to tests/nnapi/specs/V1_0/lstm3_state3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/lstm_state.mod.py b/tests/nnapi/specs/V1_0/lstm_state.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/lstm_state.mod.py rename to tests/nnapi/specs/V1_0/lstm_state.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/lstm_state2.mod.py b/tests/nnapi/specs/V1_0/lstm_state2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/lstm_state2.mod.py rename to tests/nnapi/specs/V1_0/lstm_state2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/max_pool_float_1.mod.py b/tests/nnapi/specs/V1_0/max_pool_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/max_pool_float_1.mod.py rename to tests/nnapi/specs/V1_0/max_pool_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/max_pool_float_2.mod.py b/tests/nnapi/specs/V1_0/max_pool_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/max_pool_float_2.mod.py rename to tests/nnapi/specs/V1_0/max_pool_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/max_pool_float_3.mod.py b/tests/nnapi/specs/V1_0/max_pool_float_3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/max_pool_float_3.mod.py rename to tests/nnapi/specs/V1_0/max_pool_float_3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/max_pool_float_4.mod.py b/tests/nnapi/specs/V1_0/max_pool_float_4.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/max_pool_float_4.mod.py rename to tests/nnapi/specs/V1_0/max_pool_float_4.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/max_pool_quant8_1.mod.py b/tests/nnapi/specs/V1_0/max_pool_quant8_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/max_pool_quant8_1.mod.py rename to tests/nnapi/specs/V1_0/max_pool_quant8_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/max_pool_quant8_2.mod.py b/tests/nnapi/specs/V1_0/max_pool_quant8_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/max_pool_quant8_2.mod.py rename to tests/nnapi/specs/V1_0/max_pool_quant8_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/max_pool_quant8_3.mod.py b/tests/nnapi/specs/V1_0/max_pool_quant8_3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/max_pool_quant8_3.mod.py rename to tests/nnapi/specs/V1_0/max_pool_quant8_3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/max_pool_quant8_4.mod.py b/tests/nnapi/specs/V1_0/max_pool_quant8_4.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/max_pool_quant8_4.mod.py rename to tests/nnapi/specs/V1_0/max_pool_quant8_4.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/mobilenet_224_gender_basic_fixed.mod.py b/tests/nnapi/specs/V1_0/mobilenet_224_gender_basic_fixed.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/mobilenet_224_gender_basic_fixed.mod.py rename to tests/nnapi/specs/V1_0/mobilenet_224_gender_basic_fixed.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/mobilenet_quantized.mod.py b/tests/nnapi/specs/V1_0/mobilenet_quantized.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/mobilenet_quantized.mod.py rename to tests/nnapi/specs/V1_0/mobilenet_quantized.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/mul.mod.py b/tests/nnapi/specs/V1_0/mul.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/mul.mod.py rename to tests/nnapi/specs/V1_0/mul.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/mul_4D_nnfw.mod.py b/tests/nnapi/specs/V1_0/mul_4D_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/mul_4D_nnfw.mod.py rename to tests/nnapi/specs/V1_0/mul_4D_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/mul_broadcast_3D_1D_1_nnfw.mod.py b/tests/nnapi/specs/V1_0/mul_broadcast_3D_1D_1_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/mul_broadcast_3D_1D_1_nnfw.mod.py rename to tests/nnapi/specs/V1_0/mul_broadcast_3D_1D_1_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/mul_broadcast_3D_1D_2_nnfw.mod.py b/tests/nnapi/specs/V1_0/mul_broadcast_3D_1D_2_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/mul_broadcast_3D_1D_2_nnfw.mod.py rename to tests/nnapi/specs/V1_0/mul_broadcast_3D_1D_2_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/mul_broadcast_quant8.mod.py b/tests/nnapi/specs/V1_0/mul_broadcast_quant8.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/mul_broadcast_quant8.mod.py rename to tests/nnapi/specs/V1_0/mul_broadcast_quant8.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/mul_quant8.mod.py b/tests/nnapi/specs/V1_0/mul_quant8.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/mul_quant8.mod.py rename to tests/nnapi/specs/V1_0/mul_quant8.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/mul_relu.mod.py b/tests/nnapi/specs/V1_0/mul_relu.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/mul_relu.mod.py rename to tests/nnapi/specs/V1_0/mul_relu.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/relu1_float_1.mod.py b/tests/nnapi/specs/V1_0/relu1_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/relu1_float_1.mod.py rename to tests/nnapi/specs/V1_0/relu1_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/relu1_float_2.mod.py b/tests/nnapi/specs/V1_0/relu1_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/relu1_float_2.mod.py rename to tests/nnapi/specs/V1_0/relu1_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/relu1_quant8_1.mod.py b/tests/nnapi/specs/V1_0/relu1_quant8_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/relu1_quant8_1.mod.py rename to tests/nnapi/specs/V1_0/relu1_quant8_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/relu1_quant8_2.mod.py b/tests/nnapi/specs/V1_0/relu1_quant8_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/relu1_quant8_2.mod.py rename to tests/nnapi/specs/V1_0/relu1_quant8_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/relu6_float_1.mod.py b/tests/nnapi/specs/V1_0/relu6_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/relu6_float_1.mod.py rename to tests/nnapi/specs/V1_0/relu6_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/relu6_float_2.mod.py b/tests/nnapi/specs/V1_0/relu6_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/relu6_float_2.mod.py rename to tests/nnapi/specs/V1_0/relu6_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/relu6_quant8_1.mod.py b/tests/nnapi/specs/V1_0/relu6_quant8_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/relu6_quant8_1.mod.py rename to tests/nnapi/specs/V1_0/relu6_quant8_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/relu6_quant8_2.mod.py b/tests/nnapi/specs/V1_0/relu6_quant8_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/relu6_quant8_2.mod.py rename to tests/nnapi/specs/V1_0/relu6_quant8_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/relu_float_1.mod.py b/tests/nnapi/specs/V1_0/relu_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/relu_float_1.mod.py rename to tests/nnapi/specs/V1_0/relu_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/relu_float_2.mod.py b/tests/nnapi/specs/V1_0/relu_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/relu_float_2.mod.py rename to tests/nnapi/specs/V1_0/relu_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/relu_quant8_1.mod.py b/tests/nnapi/specs/V1_0/relu_quant8_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/relu_quant8_1.mod.py rename to tests/nnapi/specs/V1_0/relu_quant8_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/relu_quant8_2.mod.py b/tests/nnapi/specs/V1_0/relu_quant8_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/relu_quant8_2.mod.py rename to tests/nnapi/specs/V1_0/relu_quant8_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/reshape.mod.py b/tests/nnapi/specs/V1_0/reshape.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/reshape.mod.py rename to tests/nnapi/specs/V1_0/reshape.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/reshape_quant8.mod.py b/tests/nnapi/specs/V1_0/reshape_quant8.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/reshape_quant8.mod.py rename to tests/nnapi/specs/V1_0/reshape_quant8.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/reshape_quant8_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/reshape_quant8_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/reshape_quant8_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/reshape_quant8_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/reshape_weights_as_inputs.mod.py b/tests/nnapi/specs/V1_0/reshape_weights_as_inputs.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/reshape_weights_as_inputs.mod.py rename to tests/nnapi/specs/V1_0/reshape_weights_as_inputs.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/resize_bilinear.mod.py b/tests/nnapi/specs/V1_0/resize_bilinear.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/resize_bilinear.mod.py rename to tests/nnapi/specs/V1_0/resize_bilinear.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/resize_bilinear_2.mod.py b/tests/nnapi/specs/V1_0/resize_bilinear_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/resize_bilinear_2.mod.py rename to tests/nnapi/specs/V1_0/resize_bilinear_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/rnn.mod.py b/tests/nnapi/specs/V1_0/rnn.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/rnn.mod.py rename to tests/nnapi/specs/V1_0/rnn.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/rnn_state.mod.py b/tests/nnapi/specs/V1_0/rnn_state.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/rnn_state.mod.py rename to tests/nnapi/specs/V1_0/rnn_state.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/softmax_float_1.mod.py b/tests/nnapi/specs/V1_0/softmax_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/softmax_float_1.mod.py rename to tests/nnapi/specs/V1_0/softmax_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/softmax_float_2.mod.py b/tests/nnapi/specs/V1_0/softmax_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/softmax_float_2.mod.py rename to tests/nnapi/specs/V1_0/softmax_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/softmax_quant8_1.mod.py b/tests/nnapi/specs/V1_0/softmax_quant8_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/softmax_quant8_1.mod.py rename to tests/nnapi/specs/V1_0/softmax_quant8_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/softmax_quant8_2.mod.py b/tests/nnapi/specs/V1_0/softmax_quant8_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/softmax_quant8_2.mod.py rename to tests/nnapi/specs/V1_0/softmax_quant8_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/space_to_depth_float_1.mod.py b/tests/nnapi/specs/V1_0/space_to_depth_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/space_to_depth_float_1.mod.py rename to tests/nnapi/specs/V1_0/space_to_depth_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/space_to_depth_float_2.mod.py b/tests/nnapi/specs/V1_0/space_to_depth_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/space_to_depth_float_2.mod.py rename to tests/nnapi/specs/V1_0/space_to_depth_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/space_to_depth_float_3.mod.py b/tests/nnapi/specs/V1_0/space_to_depth_float_3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/space_to_depth_float_3.mod.py rename to tests/nnapi/specs/V1_0/space_to_depth_float_3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/space_to_depth_quant8_1.mod.py b/tests/nnapi/specs/V1_0/space_to_depth_quant8_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/space_to_depth_quant8_1.mod.py rename to tests/nnapi/specs/V1_0/space_to_depth_quant8_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/space_to_depth_quant8_2.mod.py b/tests/nnapi/specs/V1_0/space_to_depth_quant8_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/space_to_depth_quant8_2.mod.py rename to tests/nnapi/specs/V1_0/space_to_depth_quant8_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/svdf.mod.py b/tests/nnapi/specs/V1_0/svdf.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/svdf.mod.py rename to tests/nnapi/specs/V1_0/svdf.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/svdf2.mod.py b/tests/nnapi/specs/V1_0/svdf2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/svdf2.mod.py rename to tests/nnapi/specs/V1_0/svdf2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/svdf_state.mod.py b/tests/nnapi/specs/V1_0/svdf_state.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/svdf_state.mod.py rename to tests/nnapi/specs/V1_0/svdf_state.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_0/tanh_.mod.py b/tests/nnapi/specs/V1_0/tanh_.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_0/tanh_.mod.py rename to tests/nnapi/specs/V1_0/tanh_.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/batch_to_space.mod.py b/tests/nnapi/specs/V1_1/batch_to_space.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/batch_to_space.mod.py rename to tests/nnapi/specs/V1_1/batch_to_space.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/batch_to_space_float_1.mod.py b/tests/nnapi/specs/V1_1/batch_to_space_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/batch_to_space_float_1.mod.py rename to tests/nnapi/specs/V1_1/batch_to_space_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/batch_to_space_quant8_1.mod.py b/tests/nnapi/specs/V1_1/batch_to_space_quant8_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/batch_to_space_quant8_1.mod.py rename to tests/nnapi/specs/V1_1/batch_to_space_quant8_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/div_.mod.py b/tests/nnapi/specs/V1_1/div_.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/div_.mod.py rename to tests/nnapi/specs/V1_1/div_.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/div_broadcast_float.mod.py b/tests/nnapi/specs/V1_1/div_broadcast_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/div_broadcast_float.mod.py rename to tests/nnapi/specs/V1_1/div_broadcast_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/div_broadcast_float_4D_2D_nnfw.mod.py b/tests/nnapi/specs/V1_1/div_broadcast_float_4D_2D_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/div_broadcast_float_4D_2D_nnfw.mod.py rename to tests/nnapi/specs/V1_1/div_broadcast_float_4D_2D_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/fully_connected_float_4d_simple.mod.py b/tests/nnapi/specs/V1_1/fully_connected_float_4d_simple.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/fully_connected_float_4d_simple.mod.py rename to tests/nnapi/specs/V1_1/fully_connected_float_4d_simple.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/mean.mod.py b/tests/nnapi/specs/V1_1/mean.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/mean.mod.py rename to tests/nnapi/specs/V1_1/mean.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/mean_4D_float_reducing_C_nnfw.mod.py b/tests/nnapi/specs/V1_1/mean_4D_float_reducing_C_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/mean_4D_float_reducing_C_nnfw.mod.py rename to tests/nnapi/specs/V1_1/mean_4D_float_reducing_C_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/mean_4D_float_reducing_HW_nnfw.mod.py b/tests/nnapi/specs/V1_1/mean_4D_float_reducing_HW_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/mean_4D_float_reducing_HW_nnfw.mod.py rename to tests/nnapi/specs/V1_1/mean_4D_float_reducing_HW_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/mean_axis01_1_nnfw.mod.py b/tests/nnapi/specs/V1_1/mean_axis01_1_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/mean_axis01_1_nnfw.mod.py rename to tests/nnapi/specs/V1_1/mean_axis01_1_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/mean_axis01_2_nnfw.mod.py b/tests/nnapi/specs/V1_1/mean_axis01_2_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/mean_axis01_2_nnfw.mod.py rename to tests/nnapi/specs/V1_1/mean_axis01_2_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/mean_float_1.mod.py b/tests/nnapi/specs/V1_1/mean_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/mean_float_1.mod.py rename to tests/nnapi/specs/V1_1/mean_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/mean_float_2.mod.py b/tests/nnapi/specs/V1_1/mean_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/mean_float_2.mod.py rename to tests/nnapi/specs/V1_1/mean_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/mean_quant8_1.mod.py b/tests/nnapi/specs/V1_1/mean_quant8_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/mean_quant8_1.mod.py rename to tests/nnapi/specs/V1_1/mean_quant8_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/mean_quant8_2.mod.py b/tests/nnapi/specs/V1_1/mean_quant8_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/mean_quant8_2.mod.py rename to tests/nnapi/specs/V1_1/mean_quant8_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/pad.mod.py b/tests/nnapi/specs/V1_1/pad.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/pad.mod.py rename to tests/nnapi/specs/V1_1/pad.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/pad_2D_HW_nnfw.mod.py b/tests/nnapi/specs/V1_1/pad_2D_HW_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/pad_2D_HW_nnfw.mod.py rename to tests/nnapi/specs/V1_1/pad_2D_HW_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/pad_3D_HWC_nnfw.mod.py b/tests/nnapi/specs/V1_1/pad_3D_HWC_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/pad_3D_HWC_nnfw.mod.py rename to tests/nnapi/specs/V1_1/pad_3D_HWC_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/pad_BHWC_nnfw.mod.py b/tests/nnapi/specs/V1_1/pad_BHWC_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/pad_BHWC_nnfw.mod.py rename to tests/nnapi/specs/V1_1/pad_BHWC_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/pad_BHW_nnfw.mod.py b/tests/nnapi/specs/V1_1/pad_BHW_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/pad_BHW_nnfw.mod.py rename to tests/nnapi/specs/V1_1/pad_BHW_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/pad_HWD_nnfw.mod.py b/tests/nnapi/specs/V1_1/pad_HWD_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/pad_HWD_nnfw.mod.py rename to tests/nnapi/specs/V1_1/pad_HWD_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/pad_float_1.mod.py b/tests/nnapi/specs/V1_1/pad_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/pad_float_1.mod.py rename to tests/nnapi/specs/V1_1/pad_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/pad_quant8_nnfw.mod.py b/tests/nnapi/specs/V1_1/pad_quant8_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/pad_quant8_nnfw.mod.py rename to tests/nnapi/specs/V1_1/pad_quant8_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/space_to_batch.mod.py b/tests/nnapi/specs/V1_1/space_to_batch.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/space_to_batch.mod.py rename to tests/nnapi/specs/V1_1/space_to_batch.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/space_to_batch_float_1.mod.py b/tests/nnapi/specs/V1_1/space_to_batch_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/space_to_batch_float_1.mod.py rename to tests/nnapi/specs/V1_1/space_to_batch_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/space_to_batch_float_1_nnfw.mod.py b/tests/nnapi/specs/V1_1/space_to_batch_float_1_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/space_to_batch_float_1_nnfw.mod.py rename to tests/nnapi/specs/V1_1/space_to_batch_float_1_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/space_to_batch_float_2.mod.py b/tests/nnapi/specs/V1_1/space_to_batch_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/space_to_batch_float_2.mod.py rename to tests/nnapi/specs/V1_1/space_to_batch_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/space_to_batch_float_3.mod.py b/tests/nnapi/specs/V1_1/space_to_batch_float_3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/space_to_batch_float_3.mod.py rename to tests/nnapi/specs/V1_1/space_to_batch_float_3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/space_to_batch_quant8_1.mod.py b/tests/nnapi/specs/V1_1/space_to_batch_quant8_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/space_to_batch_quant8_1.mod.py rename to tests/nnapi/specs/V1_1/space_to_batch_quant8_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/space_to_batch_quant8_1_nnfw.mod.py b/tests/nnapi/specs/V1_1/space_to_batch_quant8_1_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/space_to_batch_quant8_1_nnfw.mod.py rename to tests/nnapi/specs/V1_1/space_to_batch_quant8_1_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/space_to_batch_quant8_2.mod.py b/tests/nnapi/specs/V1_1/space_to_batch_quant8_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/space_to_batch_quant8_2.mod.py rename to tests/nnapi/specs/V1_1/space_to_batch_quant8_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/space_to_batch_quant8_2_nnfw.mod.py b/tests/nnapi/specs/V1_1/space_to_batch_quant8_2_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/space_to_batch_quant8_2_nnfw.mod.py rename to tests/nnapi/specs/V1_1/space_to_batch_quant8_2_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/space_to_batch_quant8_3.mod.py b/tests/nnapi/specs/V1_1/space_to_batch_quant8_3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/space_to_batch_quant8_3.mod.py rename to tests/nnapi/specs/V1_1/space_to_batch_quant8_3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/squeeze.mod.py b/tests/nnapi/specs/V1_1/squeeze.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/squeeze.mod.py rename to tests/nnapi/specs/V1_1/squeeze.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/squeeze_2D_float_1_nnfw.mod.py b/tests/nnapi/specs/V1_1/squeeze_2D_float_1_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/squeeze_2D_float_1_nnfw.mod.py rename to tests/nnapi/specs/V1_1/squeeze_2D_float_1_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/squeeze_float_1.mod.py b/tests/nnapi/specs/V1_1/squeeze_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/squeeze_float_1.mod.py rename to tests/nnapi/specs/V1_1/squeeze_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/squeeze_quant8_1.mod.py b/tests/nnapi/specs/V1_1/squeeze_quant8_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/squeeze_quant8_1.mod.py rename to tests/nnapi/specs/V1_1/squeeze_quant8_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice.mod.py b/tests/nnapi/specs/V1_1/strided_slice.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice.mod.py rename to tests/nnapi/specs/V1_1/strided_slice.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_1.mod.py b/tests/nnapi/specs/V1_1/strided_slice_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_1.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_10.mod.py b/tests/nnapi/specs/V1_1/strided_slice_float_10.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_10.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_float_10.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_11.mod.py b/tests/nnapi/specs/V1_1/strided_slice_float_11.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_11.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_float_11.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_2.mod.py b/tests/nnapi/specs/V1_1/strided_slice_float_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_2.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_float_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_3.mod.py b/tests/nnapi/specs/V1_1/strided_slice_float_3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_3.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_float_3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_4.mod.py b/tests/nnapi/specs/V1_1/strided_slice_float_4.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_4.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_float_4.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_5.mod.py b/tests/nnapi/specs/V1_1/strided_slice_float_5.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_5.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_float_5.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_6.mod.py b/tests/nnapi/specs/V1_1/strided_slice_float_6.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_6.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_float_6.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_7.mod.py b/tests/nnapi/specs/V1_1/strided_slice_float_7.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_7.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_float_7.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_8.mod.py b/tests/nnapi/specs/V1_1/strided_slice_float_8.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_8.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_float_8.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_9.mod.py b/tests/nnapi/specs/V1_1/strided_slice_float_9.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_float_9.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_float_9.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_qaunt8_10.mod.py b/tests/nnapi/specs/V1_1/strided_slice_qaunt8_10.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_qaunt8_10.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_qaunt8_10.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_qaunt8_11.mod.py b/tests/nnapi/specs/V1_1/strided_slice_qaunt8_11.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_qaunt8_11.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_qaunt8_11.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_quant8_1.mod.py b/tests/nnapi/specs/V1_1/strided_slice_quant8_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_quant8_1.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_quant8_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_quant8_2.mod.py b/tests/nnapi/specs/V1_1/strided_slice_quant8_2.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_quant8_2.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_quant8_2.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_quant8_3.mod.py b/tests/nnapi/specs/V1_1/strided_slice_quant8_3.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_quant8_3.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_quant8_3.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_quant8_4.mod.py b/tests/nnapi/specs/V1_1/strided_slice_quant8_4.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_quant8_4.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_quant8_4.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_quant8_5.mod.py b/tests/nnapi/specs/V1_1/strided_slice_quant8_5.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_quant8_5.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_quant8_5.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_quant8_6.mod.py b/tests/nnapi/specs/V1_1/strided_slice_quant8_6.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_quant8_6.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_quant8_6.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_quant8_7.mod.py b/tests/nnapi/specs/V1_1/strided_slice_quant8_7.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_quant8_7.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_quant8_7.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_quant8_8.mod.py b/tests/nnapi/specs/V1_1/strided_slice_quant8_8.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_quant8_8.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_quant8_8.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/strided_slice_quant8_9.mod.py b/tests/nnapi/specs/V1_1/strided_slice_quant8_9.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/strided_slice_quant8_9.mod.py rename to tests/nnapi/specs/V1_1/strided_slice_quant8_9.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/sub.mod.py b/tests/nnapi/specs/V1_1/sub.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/sub.mod.py rename to tests/nnapi/specs/V1_1/sub.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/sub_broadcast_4D_2D_float_nnfw.mod.py b/tests/nnapi/specs/V1_1/sub_broadcast_4D_2D_float_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/sub_broadcast_4D_2D_float_nnfw.mod.py rename to tests/nnapi/specs/V1_1/sub_broadcast_4D_2D_float_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/sub_broadcast_float.mod.py b/tests/nnapi/specs/V1_1/sub_broadcast_float.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/sub_broadcast_float.mod.py rename to tests/nnapi/specs/V1_1/sub_broadcast_float.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/transpose.mod.py b/tests/nnapi/specs/V1_1/transpose.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/transpose.mod.py rename to tests/nnapi/specs/V1_1/transpose.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/transpose_2D_nnfw.mod.py b/tests/nnapi/specs/V1_1/transpose_2D_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/transpose_2D_nnfw.mod.py rename to tests/nnapi/specs/V1_1/transpose_2D_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/transpose_3D_nnfw.mod.py b/tests/nnapi/specs/V1_1/transpose_3D_nnfw.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/transpose_3D_nnfw.mod.py rename to tests/nnapi/specs/V1_1/transpose_3D_nnfw.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/transpose_float_1.mod.py b/tests/nnapi/specs/V1_1/transpose_float_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/transpose_float_1.mod.py rename to tests/nnapi/specs/V1_1/transpose_float_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/V1_1/transpose_quant8_1.mod.py b/tests/nnapi/specs/V1_1/transpose_quant8_1.mod.py similarity index 100% rename from tests/runtime/neural_networks_test/specs/V1_1/transpose_quant8_1.mod.py rename to tests/nnapi/specs/V1_1/transpose_quant8_1.mod.py diff --git a/tests/runtime/neural_networks_test/specs/generate_test.sh b/tests/nnapi/specs/generate_test.sh similarity index 86% rename from tests/runtime/neural_networks_test/specs/generate_test.sh rename to tests/nnapi/specs/generate_test.sh index 473ce50..2d7e5cc 100755 --- a/tests/runtime/neural_networks_test/specs/generate_test.sh +++ b/tests/nnapi/specs/generate_test.sh @@ -34,8 +34,8 @@ Ex # test framework in one shot. spec_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -export NNAPI_BASE=$(readlink -f "$spec_dir/../../../..") -[ -z "$TEST_DIR" ] && TEST_DIR="tests/runtime/neural_networks_test" +export NNAPI_BASE=$(readlink -f "$spec_dir/../../..") +[ -z "$TEST_DIR" ] && TEST_DIR="tests/nnapi" function generate_one_testcase { # Generate one testcase @@ -45,10 +45,10 @@ function generate_one_testcase { fi local BASENAME=`basename $1` BASENAME=${BASENAME%".mod.py"}; - local EXAMPLE="-e $NNAPI_BASE/$TEST_DIR/generated/examples/$BASENAME.example.cpp" + local EXAMPLE="-e $NNAPI_BASE/$TEST_DIR/src/generated/examples/$BASENAME.example.cpp" $NNAPI_BASE/externals/nnapi_test_generator/test_generator.py ./`basename $1`\ - -m $NNAPI_BASE/$TEST_DIR/generated/models/$BASENAME.model.cpp $EXAMPLE + -m $NNAPI_BASE/$TEST_DIR/src/generated/models/$BASENAME.model.cpp $EXAMPLE ret=$? # Paste these lines into TestGenerated.cpp echo @@ -83,14 +83,14 @@ function generate_wrapper { shift fi - mkdir -vp $NNAPI_BASE/$TEST_DIR/generated/models - mkdir -vp $NNAPI_BASE/$TEST_DIR/generated/examples + mkdir -vp $NNAPI_BASE/$TEST_DIR/src/generated/models + mkdir -vp $NNAPI_BASE/$TEST_DIR/src/generated/examples cd $NNAPI_BASE/$TEST_DIR/specs for ver in $NNAPI_VERSION; do - OUTFILE=$NNAPI_BASE/$TEST_DIR/generated/all_generated_${ver}_cts_tests.cpp + OUTFILE=$NNAPI_BASE/$TEST_DIR/src/generated/all_generated_${ver}_cts_tests.cpp echo "// DO NOT EDIT;" > $OUTFILE echo "// Generated by ${TEST_DIR}/specs/generate_test.sh" >> $OUTFILE @@ -120,6 +120,6 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then if [ $? -ne 0 ]; then exit $? fi - echo "Generated file in ${TEST_DIR}/generated/"`basename $OUTFILE` + echo "Generated file in ${TEST_DIR}/src/generated/"`basename $OUTFILE` fi # [[ "${BASH_SOURCE[0]}" == "${0}" ]] diff --git a/tests/runtime/neural_networks_test/specs/generate_vts_test.sh b/tests/nnapi/specs/generate_vts_test.sh similarity index 100% rename from tests/runtime/neural_networks_test/specs/generate_vts_test.sh rename to tests/nnapi/specs/generate_vts_test.sh diff --git a/tests/runtime/neural_networks_test/specs/slicing.sh b/tests/nnapi/specs/slicing.sh similarity index 100% rename from tests/runtime/neural_networks_test/specs/slicing.sh rename to tests/nnapi/specs/slicing.sh diff --git a/tests/runtime/neural_networks_test/TestGenerated.cpp b/tests/nnapi/src/TestGenerated.cpp similarity index 100% rename from tests/runtime/neural_networks_test/TestGenerated.cpp rename to tests/nnapi/src/TestGenerated.cpp diff --git a/tests/runtime/neural_networks_test/TestGenerated_Ex.cpp b/tests/nnapi/src/TestGenerated_Ex.cpp similarity index 100% rename from tests/runtime/neural_networks_test/TestGenerated_Ex.cpp rename to tests/nnapi/src/TestGenerated_Ex.cpp diff --git a/tests/runtime/neural_networks_test/TestGenerated_V1_0.cpp b/tests/nnapi/src/TestGenerated_V1_0.cpp similarity index 100% rename from tests/runtime/neural_networks_test/TestGenerated_V1_0.cpp rename to tests/nnapi/src/TestGenerated_V1_0.cpp diff --git a/tests/runtime/neural_networks_test/TestGenerated_V1_1.cpp b/tests/nnapi/src/TestGenerated_V1_1.cpp similarity index 100% rename from tests/runtime/neural_networks_test/TestGenerated_V1_1.cpp rename to tests/nnapi/src/TestGenerated_V1_1.cpp diff --git a/tests/runtime/neural_networks_test/TestGenerated_common.cpp b/tests/nnapi/src/TestGenerated_common.cpp similarity index 100% rename from tests/runtime/neural_networks_test/TestGenerated_common.cpp rename to tests/nnapi/src/TestGenerated_common.cpp diff --git a/tests/runtime/neural_networks_test/TestMain.cpp b/tests/nnapi/src/TestMain.cpp similarity index 100% rename from tests/runtime/neural_networks_test/TestMain.cpp rename to tests/nnapi/src/TestMain.cpp diff --git a/tests/runtime/neural_networks_test/TestTrivialModel.cpp b/tests/nnapi/src/TestTrivialModel.cpp similarity index 100% rename from tests/runtime/neural_networks_test/TestTrivialModel.cpp rename to tests/nnapi/src/TestTrivialModel.cpp diff --git a/tests/runtime/neural_networks_test/TestValidation.cpp b/tests/nnapi/src/TestValidation.cpp similarity index 100% rename from tests/runtime/neural_networks_test/TestValidation.cpp rename to tests/nnapi/src/TestValidation.cpp diff --git a/tests/runtime/CMakeLists.txt b/tests/runtime/CMakeLists.txt deleted file mode 100644 index 795c544..0000000 --- a/tests/runtime/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -set(NNRUNTIME_TEST_INC_COMMON ${NNFW_INCLUDE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include -) - -if (BUILD_ANDROID_NN_RUNTIME_TEST) - add_subdirectory(neural_networks_test) -endif() diff --git a/tests/runtime/neural_networks_test/CMakeLists.txt b/tests/runtime/neural_networks_test/CMakeLists.txt deleted file mode 100644 index 677fc67..0000000 --- a/tests/runtime/neural_networks_test/CMakeLists.txt +++ /dev/null @@ -1,49 +0,0 @@ -# Executable `runtime_run` (Dummy runner executable using NN API) -set(RUNTIME_ANDROID_NN_TEST runtime_run_android_nn_test) -set(RUNTIME_ANDROID_NN_TEST_SRC TestMain.cpp - TestTrivialModel.cpp - TestValidation.cpp) - -# g++-6.3 can build TestGenerated.cpp. -if (CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.3) - set(RUNTIME_ANDROID_NN_TEST_SRC ${RUNTIME_ANDROID_NN_TEST_SRC} - TestGenerated_V1_0.cpp TestGenerated_V1_1.cpp TestGenerated_Ex.cpp) -endif() - -# Both gbs and cross for tizen support building generated test -if (OBS_BUILD) - set(RUNTIME_ANDROID_NN_TEST_SRC ${RUNTIME_ANDROID_NN_TEST_SRC} - TestGenerated_V1_0.cpp TestGenerated_V1_1.cpp TestGenerated_Ex.cpp) -endif() - -add_executable(${RUNTIME_ANDROID_NN_TEST} ${RUNTIME_ANDROID_NN_TEST_SRC}) - -nnfw_find_package(GTest) - -target_include_directories(${RUNTIME_ANDROID_NN_TEST} PRIVATE - ${NNRUNTIME_TEST_INC_COMMON} - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include) -if (BUILD_NEURUN) - set(SKIPLIST_FILE_NAME ${RUNTIME_ANDROID_NN_TEST}.skip.${TARGET_PLATFORM}.neurun) -elseif (BUILD_PURE_ARM_COMPUTE) - set(SKIPLIST_FILE_NAME ${RUNTIME_ANDROID_NN_TEST}.skip.${TARGET_PLATFORM}) -endif() -target_link_libraries(${RUNTIME_ANDROID_NN_TEST} gtest) -target_link_libraries(${RUNTIME_ANDROID_NN_TEST} ${LIB_PTHREAD} dl) - -install(TARGETS runtime_run_android_nn_test DESTINATION unittest) - -install(FILES ${SKIPLIST_FILE_NAME} - DESTINATION unittest - RENAME ${RUNTIME_ANDROID_NN_TEST}.skip - OPTIONAL) - -# If build both runtime (pure_arm_compute and neurun) at once, -# install both skiplist file as backup -if (BUILD_NEURUN AND BUILD_PURE_ARM_COMPUTE) - set(SKIPLIST_ALL_RUNTIME - ${RUNTIME_ANDROID_NN_TEST}.skip.${TARGET_PLATFORM} - ${RUNTIME_ANDROID_NN_TEST}.skip.${TARGET_PLATFORM}.neurun) - install(FILES ${SKIPLIST_ALL_RUNTIME} DESTINATION unittest OPTIONAL) -endif() -- 2.7.4