diff --git a/.ctags b/.ctags index 13c27abbeff..8815f1fc65e 100644 --- a/.ctags +++ b/.ctags @@ -3,5 +3,6 @@ --exclude=build --exclude=tags --exclude=tests/scripts/framework/cache +--exclude=tests/scripts/models/cache --exclude=tools/cross/rootfs --exclude=doxygen diff --git a/.gitignore b/.gitignore index d0931912a92..263856b3f57 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ *.pyc # Test cache for model download -/tests/scripts/framework/cache +/tests/scripts/**/cache # Test report /report diff --git a/infra/scripts/tizen_xu4_test.sh b/infra/scripts/tizen_xu4_test.sh index 640a0e0a309..dccfef665b9 100755 --- a/infra/scripts/tizen_xu4_test.sh +++ b/infra/scripts/tizen_xu4_test.sh @@ -23,12 +23,12 @@ function install_model() { # download tflite model files pushd $HOST_HOME - tests/scripts/framework/run_test.sh --download=on --run=off + tests/scripts/models/run_test.sh --download=on --run=off # TODO Since this command removes model file(.zip), # We must always download the file unlike model file(.tflite). # Because caching applies only to tflite file. find tests -name "*.zip" -exec rm {} \; - tar -zcf cache.tar.gz tests/scripts/framework/cache + tar -zcf cache.tar.gz tests/scripts/models/cache $SDB_CMD push cache.tar.gz $TEST_ROOT/. rm -rf cache.tar.gz $SDB_CMD shell tar -zxf $TEST_ROOT/cache.tar.gz -C $TEST_ROOT diff --git a/runtime/contrib/android_benchmark_app/README.md b/runtime/contrib/android_benchmark_app/README.md index ce165cd5d49..19640e32f26 100644 --- a/runtime/contrib/android_benchmark_app/README.md +++ b/runtime/contrib/android_benchmark_app/README.md @@ -28,7 +28,7 @@ make TARGET_OS=android \ EXT_ACL_FOLDER=/home/hanjoung/ws/temp/arm_compute-v19.05-bin-android/lib/android-arm64-v8a-neon-cl \ ANDROID_BUILD_TOOLS_DIR=/home/hanjoung/ws/android-tools/sdk/build-tools/27.0.3/ \ ANDROID_SDK_DIR=/home/hanjoung/ws/android-tools/sdk \ - TFLITE_MODEL_PATH=/Users/hanjoung/ws/ghent/STAR/nnfw/tests/scripts/framework/cache/MODELS/mobilenet/mobilenet_v1_0.25_128.tflite \ + TFLITE_MODEL_PATH=/Users/hanjoung/ws/ghent/STAR/nnfw/tests/scripts/models/cache/MODELS/mobilenet/mobilenet_v1_0.25_128.tflite \ ANDROID_BOOST_ROOT=/home/hanjoung/ws/gh/moritz-wundke/Boost-for-Android/build/out/arm64-v8a ``` diff --git a/tests/scripts/CMakeLists.txt b/tests/scripts/CMakeLists.txt index 0db3fd6d4f3..a89225765b4 100644 --- a/tests/scripts/CMakeLists.txt +++ b/tests/scripts/CMakeLists.txt @@ -16,10 +16,10 @@ install(PROGRAMS ${TEST_SCRIPTS} DESTINATION tests/scripts) file(GLOB TEST_LISTS "list/*.txt") install(FILES ${TEST_LISTS} DESTINATION tests/scripts/list) -# Install framework test script -file(GLOB FRAMEWORKTEST_SCRIPT "framework/run_test.sh") -install(PROGRAMS ${FRAMEWORKTEST_SCRIPT} DESTINATION tests/scripts/framework) +# Install models test script +file(GLOB MODEL_TEST_SCRIPT "models/run_test.sh") +install(PROGRAMS ${MODEL_TEST_SCRIPT} DESTINATION tests/scripts/models) -# Install framework test list file -file(GLOB FRAMEWORKTEST_DIR framework/tests) -install(DIRECTORY ${FRAMEWORKTEST_DIR} DESTINATION tests/scripts/framework) +# Install models test list file +file(GLOB MODEL_TEST_DIR models/config) +install(DIRECTORY ${MODEL_TEST_DIR} DESTINATION tests/scripts/models) diff --git a/tests/scripts/common.sh b/tests/scripts/common.sh index b2799c2d837..87aec86b30a 100755 --- a/tests/scripts/common.sh +++ b/tests/scripts/common.sh @@ -23,7 +23,7 @@ function get_result_of_benchmark_test() local LOG_FILE=$3 local RET=0 - $MY_PATH/framework/run_test.sh --driverbin="$DRIVER_BIN -r 5 -w 3" $MODEL > $LOG_FILE 2>&1 + $MY_PATH/models/run_test.sh --driverbin="$DRIVER_BIN -r 5 -w 3" $MODEL > $LOG_FILE 2>&1 RET=$? if [[ $RET -ne 0 ]]; then echo "Testing $MODEL aborted... exit code: $RET" diff --git a/tests/scripts/framework/tests/MODELS/inception_module/config.sh b/tests/scripts/models/config/MODELS/inception_module/config.sh similarity index 100% rename from tests/scripts/framework/tests/MODELS/inception_module/config.sh rename to tests/scripts/models/config/MODELS/inception_module/config.sh diff --git a/tests/scripts/framework/tests/MODELS/inception_nonslim/config.sh b/tests/scripts/models/config/MODELS/inception_nonslim/config.sh similarity index 100% rename from tests/scripts/framework/tests/MODELS/inception_nonslim/config.sh rename to tests/scripts/models/config/MODELS/inception_nonslim/config.sh diff --git a/tests/scripts/framework/tests/MODELS/inception_slim/config.sh b/tests/scripts/models/config/MODELS/inception_slim/config.sh similarity index 100% rename from tests/scripts/framework/tests/MODELS/inception_slim/config.sh rename to tests/scripts/models/config/MODELS/inception_slim/config.sh diff --git a/tests/scripts/framework/tests/MODELS/mobilenet/config.sh b/tests/scripts/models/config/MODELS/mobilenet/config.sh similarity index 100% rename from tests/scripts/framework/tests/MODELS/mobilenet/config.sh rename to tests/scripts/models/config/MODELS/mobilenet/config.sh diff --git a/tests/scripts/framework/tests/MODELS/mobilenet_quant8/config.sh b/tests/scripts/models/config/MODELS/mobilenet_quant8/config.sh similarity index 100% rename from tests/scripts/framework/tests/MODELS/mobilenet_quant8/config.sh rename to tests/scripts/models/config/MODELS/mobilenet_quant8/config.sh diff --git a/tests/scripts/framework/tests/abs/config.sh b/tests/scripts/models/config/abs/config.sh similarity index 100% rename from tests/scripts/framework/tests/abs/config.sh rename to tests/scripts/models/config/abs/config.sh diff --git a/tests/scripts/framework/tests/add/1D/config.sh b/tests/scripts/models/config/add/1D/config.sh similarity index 100% rename from tests/scripts/framework/tests/add/1D/config.sh rename to tests/scripts/models/config/add/1D/config.sh diff --git a/tests/scripts/framework/tests/add/4D/config.sh b/tests/scripts/models/config/add/4D/config.sh similarity index 100% rename from tests/scripts/framework/tests/add/4D/config.sh rename to tests/scripts/models/config/add/4D/config.sh diff --git a/tests/scripts/framework/tests/average_pool_2d/aligned/config.sh b/tests/scripts/models/config/average_pool_2d/aligned/config.sh similarity index 100% rename from tests/scripts/framework/tests/average_pool_2d/aligned/config.sh rename to tests/scripts/models/config/average_pool_2d/aligned/config.sh diff --git a/tests/scripts/framework/tests/average_pool_2d/avgpool1/config.sh b/tests/scripts/models/config/average_pool_2d/avgpool1/config.sh similarity index 100% rename from tests/scripts/framework/tests/average_pool_2d/avgpool1/config.sh rename to tests/scripts/models/config/average_pool_2d/avgpool1/config.sh diff --git a/tests/scripts/framework/tests/average_pool_2d/avgpool2/config.sh b/tests/scripts/models/config/average_pool_2d/avgpool2/config.sh similarity index 100% rename from tests/scripts/framework/tests/average_pool_2d/avgpool2/config.sh rename to tests/scripts/models/config/average_pool_2d/avgpool2/config.sh diff --git a/tests/scripts/framework/tests/batch_to_space_nd2/config.sh b/tests/scripts/models/config/batch_to_space_nd2/config.sh similarity index 100% rename from tests/scripts/framework/tests/batch_to_space_nd2/config.sh rename to tests/scripts/models/config/batch_to_space_nd2/config.sh diff --git a/tests/scripts/framework/tests/cast/config.sh b/tests/scripts/models/config/cast/config.sh similarity index 100% rename from tests/scripts/framework/tests/cast/config.sh rename to tests/scripts/models/config/cast/config.sh diff --git a/tests/scripts/framework/tests/concat/2D/config.sh b/tests/scripts/models/config/concat/2D/config.sh similarity index 100% rename from tests/scripts/framework/tests/concat/2D/config.sh rename to tests/scripts/models/config/concat/2D/config.sh diff --git a/tests/scripts/framework/tests/concat/concat1/config.sh b/tests/scripts/models/config/concat/concat1/config.sh similarity index 100% rename from tests/scripts/framework/tests/concat/concat1/config.sh rename to tests/scripts/models/config/concat/concat1/config.sh diff --git a/tests/scripts/framework/tests/concat/concat2/config.sh b/tests/scripts/models/config/concat/concat2/config.sh similarity index 100% rename from tests/scripts/framework/tests/concat/concat2/config.sh rename to tests/scripts/models/config/concat/concat2/config.sh diff --git a/tests/scripts/framework/tests/conv_2d/convolution1/config.sh b/tests/scripts/models/config/conv_2d/convolution1/config.sh similarity index 100% rename from tests/scripts/framework/tests/conv_2d/convolution1/config.sh rename to tests/scripts/models/config/conv_2d/convolution1/config.sh diff --git a/tests/scripts/framework/tests/conv_2d/convolution2/config.sh b/tests/scripts/models/config/conv_2d/convolution2/config.sh similarity index 100% rename from tests/scripts/framework/tests/conv_2d/convolution2/config.sh rename to tests/scripts/models/config/conv_2d/convolution2/config.sh diff --git a/tests/scripts/framework/tests/custom/squared_difference/config.sh b/tests/scripts/models/config/custom/squared_difference/config.sh similarity index 100% rename from tests/scripts/framework/tests/custom/squared_difference/config.sh rename to tests/scripts/models/config/custom/squared_difference/config.sh diff --git a/tests/scripts/framework/tests/depthwise_conv_2d/depthconv1/config.sh b/tests/scripts/models/config/depthwise_conv_2d/depthconv1/config.sh similarity index 100% rename from tests/scripts/framework/tests/depthwise_conv_2d/depthconv1/config.sh rename to tests/scripts/models/config/depthwise_conv_2d/depthconv1/config.sh diff --git a/tests/scripts/framework/tests/depthwise_conv_2d/depthconv2/config.sh b/tests/scripts/models/config/depthwise_conv_2d/depthconv2/config.sh similarity index 100% rename from tests/scripts/framework/tests/depthwise_conv_2d/depthconv2/config.sh rename to tests/scripts/models/config/depthwise_conv_2d/depthconv2/config.sh diff --git a/tests/scripts/framework/tests/depthwise_conv_2d_no_fuse/config.sh b/tests/scripts/models/config/depthwise_conv_2d_no_fuse/config.sh similarity index 100% rename from tests/scripts/framework/tests/depthwise_conv_2d_no_fuse/config.sh rename to tests/scripts/models/config/depthwise_conv_2d_no_fuse/config.sh diff --git a/tests/scripts/framework/tests/div/broadcast/config.sh b/tests/scripts/models/config/div/broadcast/config.sh similarity index 100% rename from tests/scripts/framework/tests/div/broadcast/config.sh rename to tests/scripts/models/config/div/broadcast/config.sh diff --git a/tests/scripts/framework/tests/embedding_lookup/config.sh b/tests/scripts/models/config/embedding_lookup/config.sh similarity index 100% rename from tests/scripts/framework/tests/embedding_lookup/config.sh rename to tests/scripts/models/config/embedding_lookup/config.sh diff --git a/tests/scripts/framework/tests/equal/config.sh b/tests/scripts/models/config/equal/config.sh similarity index 100% rename from tests/scripts/framework/tests/equal/config.sh rename to tests/scripts/models/config/equal/config.sh diff --git a/tests/scripts/framework/tests/exp/config.sh b/tests/scripts/models/config/exp/config.sh similarity index 100% rename from tests/scripts/framework/tests/exp/config.sh rename to tests/scripts/models/config/exp/config.sh diff --git a/tests/scripts/framework/tests/floor/floor1/config.sh b/tests/scripts/models/config/floor/floor1/config.sh similarity index 100% rename from tests/scripts/framework/tests/floor/floor1/config.sh rename to tests/scripts/models/config/floor/floor1/config.sh diff --git a/tests/scripts/framework/tests/floor/floor2/config.sh b/tests/scripts/models/config/floor/floor2/config.sh similarity index 100% rename from tests/scripts/framework/tests/floor/floor2/config.sh rename to tests/scripts/models/config/floor/floor2/config.sh diff --git a/tests/scripts/framework/tests/fullyconnected/fc1/config.sh b/tests/scripts/models/config/fullyconnected/fc1/config.sh similarity index 100% rename from tests/scripts/framework/tests/fullyconnected/fc1/config.sh rename to tests/scripts/models/config/fullyconnected/fc1/config.sh diff --git a/tests/scripts/framework/tests/fullyconnected/hybrid/config.sh b/tests/scripts/models/config/fullyconnected/hybrid/config.sh similarity index 100% rename from tests/scripts/framework/tests/fullyconnected/hybrid/config.sh rename to tests/scripts/models/config/fullyconnected/hybrid/config.sh diff --git a/tests/scripts/framework/tests/fullyconnected/matmul2x2/config.sh b/tests/scripts/models/config/fullyconnected/matmul2x2/config.sh similarity index 100% rename from tests/scripts/framework/tests/fullyconnected/matmul2x2/config.sh rename to tests/scripts/models/config/fullyconnected/matmul2x2/config.sh diff --git a/tests/scripts/framework/tests/fullyconnected/weights_as_input/config.sh b/tests/scripts/models/config/fullyconnected/weights_as_input/config.sh similarity index 100% rename from tests/scripts/framework/tests/fullyconnected/weights_as_input/config.sh rename to tests/scripts/models/config/fullyconnected/weights_as_input/config.sh diff --git a/tests/scripts/framework/tests/gather/config.sh b/tests/scripts/models/config/gather/config.sh similarity index 100% rename from tests/scripts/framework/tests/gather/config.sh rename to tests/scripts/models/config/gather/config.sh diff --git a/tests/scripts/framework/tests/greater/config.sh b/tests/scripts/models/config/greater/config.sh similarity index 100% rename from tests/scripts/framework/tests/greater/config.sh rename to tests/scripts/models/config/greater/config.sh diff --git a/tests/scripts/framework/tests/greater_equal/config.sh b/tests/scripts/models/config/greater_equal/config.sh similarity index 100% rename from tests/scripts/framework/tests/greater_equal/config.sh rename to tests/scripts/models/config/greater_equal/config.sh diff --git a/tests/scripts/framework/tests/hashtable_lookup/config.sh b/tests/scripts/models/config/hashtable_lookup/config.sh similarity index 100% rename from tests/scripts/framework/tests/hashtable_lookup/config.sh rename to tests/scripts/models/config/hashtable_lookup/config.sh diff --git a/tests/scripts/framework/tests/l2_normalization/config.sh b/tests/scripts/models/config/l2_normalization/config.sh similarity index 100% rename from tests/scripts/framework/tests/l2_normalization/config.sh rename to tests/scripts/models/config/l2_normalization/config.sh diff --git a/tests/scripts/framework/tests/l2_pool_2d/config.sh b/tests/scripts/models/config/l2_pool_2d/config.sh similarity index 100% rename from tests/scripts/framework/tests/l2_pool_2d/config.sh rename to tests/scripts/models/config/l2_pool_2d/config.sh diff --git a/tests/scripts/framework/tests/less/config.sh b/tests/scripts/models/config/less/config.sh similarity index 100% rename from tests/scripts/framework/tests/less/config.sh rename to tests/scripts/models/config/less/config.sh diff --git a/tests/scripts/framework/tests/less_equal/config.sh b/tests/scripts/models/config/less_equal/config.sh similarity index 100% rename from tests/scripts/framework/tests/less_equal/config.sh rename to tests/scripts/models/config/less_equal/config.sh diff --git a/tests/scripts/framework/tests/logistic/config.sh b/tests/scripts/models/config/logistic/config.sh similarity index 100% rename from tests/scripts/framework/tests/logistic/config.sh rename to tests/scripts/models/config/logistic/config.sh diff --git a/tests/scripts/framework/tests/max/config.sh b/tests/scripts/models/config/max/config.sh similarity index 100% rename from tests/scripts/framework/tests/max/config.sh rename to tests/scripts/models/config/max/config.sh diff --git a/tests/scripts/framework/tests/max_pool_2d/maxpool1/config.sh b/tests/scripts/models/config/max_pool_2d/maxpool1/config.sh similarity index 100% rename from tests/scripts/framework/tests/max_pool_2d/maxpool1/config.sh rename to tests/scripts/models/config/max_pool_2d/maxpool1/config.sh diff --git a/tests/scripts/framework/tests/max_pool_2d/maxpool2/config.sh b/tests/scripts/models/config/max_pool_2d/maxpool2/config.sh similarity index 100% rename from tests/scripts/framework/tests/max_pool_2d/maxpool2/config.sh rename to tests/scripts/models/config/max_pool_2d/maxpool2/config.sh diff --git a/tests/scripts/framework/tests/mean/config.sh b/tests/scripts/models/config/mean/config.sh similarity index 100% rename from tests/scripts/framework/tests/mean/config.sh rename to tests/scripts/models/config/mean/config.sh diff --git a/tests/scripts/framework/tests/min/config.sh b/tests/scripts/models/config/min/config.sh similarity index 100% rename from tests/scripts/framework/tests/min/config.sh rename to tests/scripts/models/config/min/config.sh diff --git a/tests/scripts/framework/tests/mul/broadcast/config.sh b/tests/scripts/models/config/mul/broadcast/config.sh similarity index 100% rename from tests/scripts/framework/tests/mul/broadcast/config.sh rename to tests/scripts/models/config/mul/broadcast/config.sh diff --git a/tests/scripts/framework/tests/neg/config.sh b/tests/scripts/models/config/neg/config.sh similarity index 100% rename from tests/scripts/framework/tests/neg/config.sh rename to tests/scripts/models/config/neg/config.sh diff --git a/tests/scripts/framework/tests/not_equal/config.sh b/tests/scripts/models/config/not_equal/config.sh similarity index 100% rename from tests/scripts/framework/tests/not_equal/config.sh rename to tests/scripts/models/config/not_equal/config.sh diff --git a/tests/scripts/framework/tests/one_hot/config.sh b/tests/scripts/models/config/one_hot/config.sh similarity index 100% rename from tests/scripts/framework/tests/one_hot/config.sh rename to tests/scripts/models/config/one_hot/config.sh diff --git a/tests/scripts/framework/tests/pack/config.sh b/tests/scripts/models/config/pack/config.sh similarity index 100% rename from tests/scripts/framework/tests/pack/config.sh rename to tests/scripts/models/config/pack/config.sh diff --git a/tests/scripts/framework/tests/pad/4D_2D/config.sh b/tests/scripts/models/config/pad/4D_2D/config.sh similarity index 100% rename from tests/scripts/framework/tests/pad/4D_2D/config.sh rename to tests/scripts/models/config/pad/4D_2D/config.sh diff --git a/tests/scripts/framework/tests/pad/pad1/config.sh b/tests/scripts/models/config/pad/pad1/config.sh similarity index 100% rename from tests/scripts/framework/tests/pad/pad1/config.sh rename to tests/scripts/models/config/pad/pad1/config.sh diff --git a/tests/scripts/framework/tests/pad/pad2/config.sh b/tests/scripts/models/config/pad/pad2/config.sh similarity index 100% rename from tests/scripts/framework/tests/pad/pad2/config.sh rename to tests/scripts/models/config/pad/pad2/config.sh diff --git a/tests/scripts/framework/tests/reduce_max/config.sh b/tests/scripts/models/config/reduce_max/config.sh similarity index 100% rename from tests/scripts/framework/tests/reduce_max/config.sh rename to tests/scripts/models/config/reduce_max/config.sh diff --git a/tests/scripts/framework/tests/reduce_mean/test1/config.sh b/tests/scripts/models/config/reduce_mean/test1/config.sh similarity index 100% rename from tests/scripts/framework/tests/reduce_mean/test1/config.sh rename to tests/scripts/models/config/reduce_mean/test1/config.sh diff --git a/tests/scripts/framework/tests/reduce_mean/test2/config.sh b/tests/scripts/models/config/reduce_mean/test2/config.sh similarity index 100% rename from tests/scripts/framework/tests/reduce_mean/test2/config.sh rename to tests/scripts/models/config/reduce_mean/test2/config.sh diff --git a/tests/scripts/framework/tests/reduce_sum/config.sh b/tests/scripts/models/config/reduce_sum/config.sh similarity index 100% rename from tests/scripts/framework/tests/reduce_sum/config.sh rename to tests/scripts/models/config/reduce_sum/config.sh diff --git a/tests/scripts/framework/tests/relu/config.sh b/tests/scripts/models/config/relu/config.sh similarity index 100% rename from tests/scripts/framework/tests/relu/config.sh rename to tests/scripts/models/config/relu/config.sh diff --git a/tests/scripts/framework/tests/relu6/config.sh b/tests/scripts/models/config/relu6/config.sh similarity index 100% rename from tests/scripts/framework/tests/relu6/config.sh rename to tests/scripts/models/config/relu6/config.sh diff --git a/tests/scripts/framework/tests/reshape/3D/config.sh b/tests/scripts/models/config/reshape/3D/config.sh similarity index 100% rename from tests/scripts/framework/tests/reshape/3D/config.sh rename to tests/scripts/models/config/reshape/3D/config.sh diff --git a/tests/scripts/framework/tests/reshape/reshape1/config.sh b/tests/scripts/models/config/reshape/reshape1/config.sh similarity index 100% rename from tests/scripts/framework/tests/reshape/reshape1/config.sh rename to tests/scripts/models/config/reshape/reshape1/config.sh diff --git a/tests/scripts/framework/tests/reshape/reshape2/config.sh b/tests/scripts/models/config/reshape/reshape2/config.sh similarity index 100% rename from tests/scripts/framework/tests/reshape/reshape2/config.sh rename to tests/scripts/models/config/reshape/reshape2/config.sh diff --git a/tests/scripts/framework/tests/resize_bilinear/config.sh b/tests/scripts/models/config/resize_bilinear/config.sh similarity index 100% rename from tests/scripts/framework/tests/resize_bilinear/config.sh rename to tests/scripts/models/config/resize_bilinear/config.sh diff --git a/tests/scripts/framework/tests/rnn/config.sh b/tests/scripts/models/config/rnn/config.sh similarity index 100% rename from tests/scripts/framework/tests/rnn/config.sh rename to tests/scripts/models/config/rnn/config.sh diff --git a/tests/scripts/framework/tests/rsqrt/config.sh b/tests/scripts/models/config/rsqrt/config.sh similarity index 100% rename from tests/scripts/framework/tests/rsqrt/config.sh rename to tests/scripts/models/config/rsqrt/config.sh diff --git a/tests/scripts/framework/tests/select/config.sh b/tests/scripts/models/config/select/config.sh similarity index 100% rename from tests/scripts/framework/tests/select/config.sh rename to tests/scripts/models/config/select/config.sh diff --git a/tests/scripts/framework/tests/shape/config.sh b/tests/scripts/models/config/shape/config.sh similarity index 100% rename from tests/scripts/framework/tests/shape/config.sh rename to tests/scripts/models/config/shape/config.sh diff --git a/tests/scripts/framework/tests/sin/config.sh b/tests/scripts/models/config/sin/config.sh similarity index 100% rename from tests/scripts/framework/tests/sin/config.sh rename to tests/scripts/models/config/sin/config.sh diff --git a/tests/scripts/framework/tests/slice/config.sh b/tests/scripts/models/config/slice/config.sh similarity index 100% rename from tests/scripts/framework/tests/slice/config.sh rename to tests/scripts/models/config/slice/config.sh diff --git a/tests/scripts/framework/tests/softmax/config.sh b/tests/scripts/models/config/softmax/config.sh similarity index 100% rename from tests/scripts/framework/tests/softmax/config.sh rename to tests/scripts/models/config/softmax/config.sh diff --git a/tests/scripts/framework/tests/space_to_batch_nd2/config.sh b/tests/scripts/models/config/space_to_batch_nd2/config.sh similarity index 100% rename from tests/scripts/framework/tests/space_to_batch_nd2/config.sh rename to tests/scripts/models/config/space_to_batch_nd2/config.sh diff --git a/tests/scripts/framework/tests/space_to_depth/config.sh b/tests/scripts/models/config/space_to_depth/config.sh similarity index 100% rename from tests/scripts/framework/tests/space_to_depth/config.sh rename to tests/scripts/models/config/space_to_depth/config.sh diff --git a/tests/scripts/framework/tests/sqrt/config.sh b/tests/scripts/models/config/sqrt/config.sh similarity index 100% rename from tests/scripts/framework/tests/sqrt/config.sh rename to tests/scripts/models/config/sqrt/config.sh diff --git a/tests/scripts/framework/tests/squeeze/config.sh b/tests/scripts/models/config/squeeze/config.sh similarity index 100% rename from tests/scripts/framework/tests/squeeze/config.sh rename to tests/scripts/models/config/squeeze/config.sh diff --git a/tests/scripts/framework/tests/strided_slice/config.sh b/tests/scripts/models/config/strided_slice/config.sh similarity index 100% rename from tests/scripts/framework/tests/strided_slice/config.sh rename to tests/scripts/models/config/strided_slice/config.sh diff --git a/tests/scripts/framework/tests/sub/broadcast/config.sh b/tests/scripts/models/config/sub/broadcast/config.sh similarity index 100% rename from tests/scripts/framework/tests/sub/broadcast/config.sh rename to tests/scripts/models/config/sub/broadcast/config.sh diff --git a/tests/scripts/framework/tests/tanh/config.sh b/tests/scripts/models/config/tanh/config.sh similarity index 100% rename from tests/scripts/framework/tests/tanh/config.sh rename to tests/scripts/models/config/tanh/config.sh diff --git a/tests/scripts/framework/tests/tile/config.sh b/tests/scripts/models/config/tile/config.sh similarity index 100% rename from tests/scripts/framework/tests/tile/config.sh rename to tests/scripts/models/config/tile/config.sh diff --git a/tests/scripts/framework/tests/topk_v2/config.sh b/tests/scripts/models/config/topk_v2/config.sh similarity index 100% rename from tests/scripts/framework/tests/topk_v2/config.sh rename to tests/scripts/models/config/topk_v2/config.sh diff --git a/tests/scripts/framework/tests/transpose/config.sh b/tests/scripts/models/config/transpose/config.sh similarity index 100% rename from tests/scripts/framework/tests/transpose/config.sh rename to tests/scripts/models/config/transpose/config.sh diff --git a/tests/scripts/framework/tests/transpose_conv/same/config.sh b/tests/scripts/models/config/transpose_conv/same/config.sh similarity index 100% rename from tests/scripts/framework/tests/transpose_conv/same/config.sh rename to tests/scripts/models/config/transpose_conv/same/config.sh diff --git a/tests/scripts/framework/tests/transpose_conv/valid/config.sh b/tests/scripts/models/config/transpose_conv/valid/config.sh similarity index 100% rename from tests/scripts/framework/tests/transpose_conv/valid/config.sh rename to tests/scripts/models/config/transpose_conv/valid/config.sh diff --git a/tests/scripts/framework/tests/zeros_like/config.sh b/tests/scripts/models/config/zeros_like/config.sh similarity index 100% rename from tests/scripts/framework/tests/zeros_like/config.sh rename to tests/scripts/models/config/zeros_like/config.sh diff --git a/tests/scripts/framework/run_test.sh b/tests/scripts/models/run_test.sh similarity index 99% rename from tests/scripts/framework/run_test.sh rename to tests/scripts/models/run_test.sh index 230d312cfc8..e6b7c30fd24 100755 --- a/tests/scripts/framework/run_test.sh +++ b/tests/scripts/models/run_test.sh @@ -18,7 +18,7 @@ MY_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" NNFW_HOME="$(dirname $(dirname $(dirname ${MY_PATH})))" CACHE_ROOT_PATH=$MY_PATH/"cache" -TEST_ROOT_PATH=$MY_PATH/"tests" +TEST_ROOT_PATH=$MY_PATH/"config" REPORT_DIR="report" RUN_DISABLED="true" diff --git a/tests/scripts/test-driver.sh b/tests/scripts/test-driver.sh index a720b15372c..99f0c4b01b0 100755 --- a/tests/scripts/test-driver.sh +++ b/tests/scripts/test-driver.sh @@ -166,7 +166,7 @@ if [ "$BENCHMARK_ONERT_OP_ON" == "true" ]; then --test_op \ --driverbin=$DRIVER_BIN \ --reportdir=$REPORT_DIR/benchmark_op \ - --modelfilepath=$ARTIFACT_PATH/tests/scripts/framework + --modelfilepath=$ARTIFACT_PATH/tests/scripts/models fi # Make json file. Actually, this process is only needed on CI. That's why it is in test-driver.sh. diff --git a/tests/scripts/test_framework.sh b/tests/scripts/test_framework.sh index bd86cd37173..6bf9c89c5f2 100755 --- a/tests/scripts/test_framework.sh +++ b/tests/scripts/test_framework.sh @@ -82,7 +82,7 @@ if [ ! -z "$FRAMEWORKTEST_LIST_FILE" ]; then MODELLIST=$(cat "${FRAMEWORKTEST_LIST_FILE}") fi -$MY_PATH/framework/run_test.sh --driverbin=$FWTEST_DRIVER_BIN \ +$MY_PATH/models/run_test.sh --driverbin=$FWTEST_DRIVER_BIN \ --reportdir=$FWTEST_REPORT_DIR \ --tapname=$FWTEST_TAP_NAME \ ${MODELLIST:-} \ diff --git a/tests/scripts/test_scheduler_with_profiling.sh b/tests/scripts/test_scheduler_with_profiling.sh index 8b2f2d28134..5c24572d8e1 100755 --- a/tests/scripts/test_scheduler_with_profiling.sh +++ b/tests/scripts/test_scheduler_with_profiling.sh @@ -11,7 +11,7 @@ TEST_DRIVER_DIR="$( cd "$( dirname "${BASH_SOURCE}" )" && pwd )" ARTIFACT_PATH="$TEST_DRIVER_DIR/../.." BENCHMARK_DRIVER_BIN=$ARTIFACT_PATH/Product/out/bin/tflite_run REPORT_DIR=$ARTIFACT_PATH/report -RUN_TEST_SH=$ARTIFACT_PATH/tests/scripts/framework/run_test.sh +RUN_TEST_SH=$ARTIFACT_PATH/tests/scripts/models/run_test.sh BENCHMARK_MODEL_LIST="MODELS/inception_nonslim MODELS/inception_slim MODELS/mobilenet" if [ ! -e "$RUN_TEST_SH" ]; then