[enco] Use nnkit-run instead of nni for test (#2576)

This commit replaces all the use of nni with nnkit-run in enco test
framework.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/contrib/enco/test/caffe/CMakeLists.txt b/contrib/enco/test/caffe/CMakeLists.txt
index b5beb27..a93ff73 100644 (file)
--- a/contrib/enco/test/caffe/CMakeLists.txt
+++ b/contrib/enco/test/caffe/CMakeLists.txt
@@ -107,7 +107,7 @@ endforeach(PREFIX)
 # Run tests
 add_test(NAME enco_test_caffe
          COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/runall"
-                            $<TARGET_FILE:nni>
+                            $<TARGET_FILE:nnkit-run>
                             $<TARGET_FILE:nnkit_caffe_backend>
                             $<TARGET_FILE:nnkit_randomize_action>
                             $<TARGET_FILE:nnkit_HDF5_export_action>

diff --git a/contrib/enco/test/caffe/runall b/contrib/enco/test/caffe/runall
index a788363..3b18f1c 100755 (executable)
--- a/contrib/enco/test/caffe/runall
+++ b/contrib/enco/test/caffe/runall
@@ -1,18 +1,18 @@
 #!/bin/bash
 
 if [[ $# -le 6 ]]; then
-  echo "USAGE: $0 [nni path] [reference backend path] [randomize action path] [HDF5 export action path] [HDF5 import action path] [WORKDIR] [Prefix1] [Prefix2]..."
+  echo "USAGE: $0 [nnkit-run path] [reference backend path] [randomize action path] [HDF5 export action path] [HDF5 import action path] [WORKDIR] [Prefix1] [Prefix2]..."
   exit 255
 fi
 
-NNI_PATH="$1"; shift
+NNKIT_RUN_PATH="$1"; shift
 REFERENCE_BACKEND_PATH="$1"; shift
 RANDOMIZE_ACTION_PATH="$1"; shift
 HDF5_EXPORT_ACTION_PATH="$1"; shift
 HDF5_IMPORT_ACTION_PATH="$1"; shift
 WORKDIR="$1"; shift
 
-echo "-- Found nni: ${NNI_PATH}"
+echo "-- Found nnkit-run: ${NNKIT_RUN_PATH}"
 echo "-- Found reference backend: ${REFERENCE_BACKEND_PATH}"
 echo "-- Found randomize action: ${RANDOMIZE_ACTION_PATH}"
 echo "-- Found HDF5 export action: ${HDF5_EXPORT_ACTION_PATH}"
@@ -40,7 +40,7 @@ while [[ $# -ne 0 ]]; do
     echo "-- Found caffemodel: ${PREFIX}.caffemodel"
     echo "-- Found backend: lib${PREFIX}.so"
 
-    "${NNI_PATH}" \
+    "${NNKIT_RUN_PATH}" \
       --backend "${REFERENCE_BACKEND_PATH}" \
       --backend-arg "${WORKDIR}/${PREFIX}.prototxt" \
       --backend-arg "${WORKDIR}/${PREFIX}.caffemodel" \
@@ -50,7 +50,7 @@ while [[ $# -ne 0 ]]; do
       --post "${HDF5_EXPORT_ACTION_PATH}" \
       --post-arg "${PREFIX}.expected.h5"
 
-    "${NNI_PATH}" \
+    "${NNKIT_RUN_PATH}" \
       --backend "./lib${PREFIX}.so" \
       --pre "${HDF5_IMPORT_ACTION_PATH}" \
       --pre-arg "${PREFIX}.input.h5" \

diff --git a/contrib/enco/test/tflite/CMakeLists.txt b/contrib/enco/test/tflite/CMakeLists.txt
index 887188f..cbe37cc 100644 (file)
--- a/contrib/enco/test/tflite/CMakeLists.txt
+++ b/contrib/enco/test/tflite/CMakeLists.txt
@@ -103,7 +103,7 @@ endforeach(PREFIX)
 # Run tests
 add_test(NAME enco_test_tflite
          COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/runall"
-                            $<TARGET_FILE:nni>
+                            $<TARGET_FILE:nnkit-run>
                             $<TARGET_FILE:nnkit_tflite_backend>
                             $<TARGET_FILE:nnkit_randomize_action>
                             $<TARGET_FILE:nnkit_HDF5_export_action>

diff --git a/contrib/enco/test/tflite/runall b/contrib/enco/test/tflite/runall
index 05dfae3..c274f72 100755 (executable)
--- a/contrib/enco/test/tflite/runall
+++ b/contrib/enco/test/tflite/runall
@@ -1,18 +1,18 @@
 #!/bin/bash
 
 if [[ $# -le 6 ]]; then
-  echo "USAGE: $0 [nni path] [reference backend path] [randomize action path] [HDF5 export action path] [HDF5 import action path] [WORKDIR] [Prefix1] [Prefix2] ..."
+  echo "USAGE: $0 [nnkit-run path] [reference backend path] [randomize action path] [HDF5 export action path] [HDF5 import action path] [WORKDIR] [Prefix1] [Prefix2] ..."
   exit 255
 fi
 
-NNI_PATH="$1"; shift
+NNKIT_RUN_PATH="$1"; shift
 REFERENCE_BACKEND_PATH="$1"; shift
 RANDOMIZE_ACTION_PATH="$1"; shift
 HDF5_EXPORT_ACTION_PATH="$1"; shift
 HDF5_IMPORT_ACTION_PATH="$1"; shift
 WORKDIR="$1"; shift
 
-echo "-- Found nni: ${NNI_PATH}"
+echo "-- Found nnkit-run: ${NNKIT_RUN_PATH}"
 echo "-- Found reference backend: ${REFERENCE_BACKEND_PATH}"
 echo "-- Found randomize action: ${RANDOMIZE_ACTION_PATH}"
 echo "-- Found HDF5 export action: ${HDF5_EXPORT_ACTION_PATH}"
@@ -39,7 +39,7 @@ while [[ $# -ne 0 ]]; do
     echo "-- Found tflite: ${PREFIX}.tflite"
     echo "-- Found backend: lib${PREFIX}.so"
 
-    "${NNI_PATH}" \
+    "${NNKIT_RUN_PATH}" \
       --backend "${REFERENCE_BACKEND_PATH}" \
       --backend-arg "${WORKDIR}/${PREFIX}.tflite" \
       --pre "${RANDOMIZE_ACTION_PATH}" \
@@ -48,7 +48,7 @@ while [[ $# -ne 0 ]]; do
       --post "${HDF5_EXPORT_ACTION_PATH}" \
       --post-arg "${PREFIX}.expected.h5"
 
-    "${NNI_PATH}" \
+    "${NNKIT_RUN_PATH}" \
       --backend "./lib${PREFIX}.so" \
       --pre "${HDF5_IMPORT_ACTION_PATH}" \
       --pre-arg "${PREFIX}.input.h5" \