From: 박종현/동작제어Lab(SR)/Staff Engineer/삼성전자 <jh1302.park@samsung.com>
Date: Mon, 10 Dec 2018 18:34:03 +0000 (+0900)
Subject: [nnc] Use nnkit-run for test (#2585)
X-Git-Tag: nncc_backup~1129
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ad2ed0435b5acbcb69219d506b5301212aa1613;p=platform%2Fcore%2Fml%2Fnnfw.git

[nnc] Use nnkit-run for test (#2585)

Now, infer_testcase.py script will invoke nnkit-run instead of
deprecated nni.

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

diff --git a/contrib/nnc/utils/infer_tests/infer_testcases.py b/contrib/nnc/utils/infer_tests/infer_testcases.py
index 4587075..be77fd2 100644
--- a/contrib/nnc/utils/infer_tests/infer_testcases.py
+++ b/contrib/nnc/utils/infer_tests/infer_testcases.py
@@ -8,7 +8,7 @@ import datetime
 # This script uses nnkit to run inference for given model on a given data
 # Messages are printed to stderr
 # Usage:
-# -b - specifies path to nnkit build folder, inside which tools/nni is located
+# -b - specifies path to nnkit build folder, inside which tools/run is located
 # -f - specifies framework ('tfl' for tflite or 'caf' for caffe) that the model belogs to
 # -t - specifies path to testcase folder (see it's structure in readme)
 # -p - allow some sort of parallelism by processing only a subset of files, 
@@ -93,7 +93,7 @@ hdf_suffix = '.hdf5'
 bin_suffix = '.dat'
 
 def get_command_caf(infilename, outfilename, proto, caffemodel):
-    return [build_path + "/tools/nni/nni", 
+    return [build_path + "/tools/run/nnkit-run", 
             "--pre", build_path + "/actions/HDF5/libnnkit_HDF5_import_action.so", 
             "--pre-arg", infilename, 
             "--backend", build_path + "/backends/caffe/libnnkit_caffe_backend.so",
@@ -103,7 +103,7 @@ def get_command_caf(infilename, outfilename, proto, caffemodel):
             "--post-arg", outfilename]
 
 def get_command_tfl(infilename, outfilename, model_file):
-    return [build_path + "/tools/nni/nni", 
+    return [build_path + "/tools/run/nnkit-run", 
             "--pre", build_path + "/actions/HDF5/libnnkit_HDF5_import_action.so", 
             "--pre-arg", infilename, 
             "--backend", build_path + "/backends/tflite/libnnkit_tflite_backend.so",