Skip to content

Commit

Permalink
[onert/test] Rename framework (Samsung#3546)
Browse files Browse the repository at this point in the history
Rename directory tests/scripts/framework to tests/scripts/models
Rename directory tests/scripts/framework/tests to tests/scripts/models/config

Signed-off-by: Hyeongseok Oh <[email protected]>
  • Loading branch information
hseok-oh authored Jul 30, 2020
1 parent 12d9682 commit 608a5a2
Show file tree
Hide file tree
Showing 94 changed files with 16 additions and 15 deletions.
1 change: 1 addition & 0 deletions .ctags
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
--exclude=build
--exclude=tags
--exclude=tests/scripts/framework/cache
--exclude=tests/scripts/models/cache
--exclude=tools/cross/rootfs
--exclude=doxygen
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*.pyc

# Test cache for model download
/tests/scripts/framework/cache
/tests/scripts/**/cache

# Test report
/report
Expand Down
4 changes: 2 additions & 2 deletions infra/scripts/tizen_xu4_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion runtime/contrib/android_benchmark_app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
12 changes: 6 additions & 6 deletions tests/scripts/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion tests/scripts/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/test-driver.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/test_framework.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:-} \
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/test_scheduler_with_profiling.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 608a5a2

Please sign in to comment.