From 7632c26ff6ddd56ee89d6e209ca2286282d5d00e Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=A2=85=ED=98=84/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Thu, 6 Dec 2018 17:09:23 +0900 Subject: [PATCH] [tflchef] Use nnkit-run in testing (#2534) This commit replaces all the use of deprecated nni in tflchef testing framework with nnkit-run. Signed-off-by: Jonghyun Park --- contrib/tflchef/tests/CMakeLists.txt | 6 +++--- contrib/tflchef/tests/runall | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/tflchef/tests/CMakeLists.txt b/contrib/tflchef/tests/CMakeLists.txt index 1e312a2..7955f17 100644 --- a/contrib/tflchef/tests/CMakeLists.txt +++ b/contrib/tflchef/tests/CMakeLists.txt @@ -1,6 +1,6 @@ -if(NOT TARGET nni) +if(NOT TARGET nnkit-run) return() -endif(NOT TARGET nni) +endif(NOT TARGET nnkit-run) if(NOT TARGET nnkit_tflite_backend) return() @@ -68,7 +68,7 @@ endforeach(TFLITEFILE) add_test(NAME tflchef_test COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/runall" - $ + $ $ "${CMAKE_CURRENT_BINARY_DIR}" ${TESTS}) diff --git a/contrib/tflchef/tests/runall b/contrib/tflchef/tests/runall index a1f5e0a..535119e 100755 --- a/contrib/tflchef/tests/runall +++ b/contrib/tflchef/tests/runall @@ -1,15 +1,15 @@ #!/bin/bash if [[ $# -le 3 ]]; then - echo "USAGE: $0 [nni path] [tflite backend path] [working directory] [prefix 0] [prefix 1] ..." + echo "USAGE: $0 [nnkit-run path] [tflite backend path] [working directory] [prefix 0] [prefix 1] ..." exit 255 fi -NNI_PATH="$1"; shift +NNKIT_RUN_PATH="$1"; shift TFLITE_BACKEND_PATH="$1"; shift WORKDIR="$1"; shift -echo "-- Found nni: ${NNI_PATH}" +echo "-- Found nnkit-run: ${NNKIT_RUN_PATH}" echo "-- Found tflite backend: ${TFLITE_BACKEND_PATH}" echo "-- Found workdir: ${WORKDIR}" @@ -23,7 +23,7 @@ while [[ $# -ne 0 ]]; do TESTED+=("${PREFIX}") - "${NNI_PATH}" --backend "${TFLITE_BACKEND_PATH}" --backend-arg "${PREFIX}.tflite" + "${NNKIT_RUN_PATH}" --backend "${TFLITE_BACKEND_PATH}" --backend-arg "${PREFIX}.tflite" if [[ $? -eq 0 ]]; then PASSED+=("$PREFIX") -- 2.7.4