From 2b3850315c1e4a9d4064b9e4ac0791addf0e5d95 Mon Sep 17 00:00:00 2001
From: yejianwu <yejianwu@xiaomi.com>
Date: Thu, 1 Mar 2018 19:57:20 +0800
Subject: [PATCH] remove TF_ prefix

---
 example.yaml           | 12 ++++++------
 generate_model_code.sh |  6 +++---
 mace_tools.py          |  6 ++----
 validate_tools.sh      |  6 +++---
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/example.yaml b/example.yaml
index 4c4b3d17..c3358c40 100644
--- a/example.yaml
+++ b/example.yaml
@@ -5,18 +5,18 @@ target_abi: armeabi-v7a # arm64-v8a
 embed_model_data: 1
 models:
   preview_net:
-    tf_model_file_path: path/to/model64.pb
-    tf_input_node: input
-    tf_output_node: softmax/Reshape_1
+    model_file_path: path/to/model64.pb
+    input_node: input
+    output_node: softmax/Reshape_1
     input_shape: 1,64,64,3
     output_shape: 1,64,64,2
     runtime: gpu
     limit_opencl_kernel_time: 0
     dsp_mode: 0
   capture_net:
-    tf_model_file_path: path/to/model256.pb
-    tf_input_node: input_node
-    tf_output_node: softmax/Reshape_1
+    model_file_path: path/to/model256.pb
+    input_node: input_node
+    output_node: softmax/Reshape_1
     input_shape: 1,256,256,3
     output_shape: 1,256,256,2
     runtime: gpu
diff --git a/generate_model_code.sh b/generate_model_code.sh
index 8184b871..6247cdc4 100644
--- a/generate_model_code.sh
+++ b/generate_model_code.sh
@@ -15,10 +15,10 @@ if [ "${BENCHMARK_FLAG}" = "1" ]; then
   OBFUSCATE=False
 fi
 
-bazel-bin/lib/python/tools/tf_converter --input=${TF_MODEL_FILE_PATH} \
+bazel-bin/lib/python/tools/tf_converter --input=${MODEL_FILE_PATH} \
                                         --output=${MODEL_CODEGEN_DIR}/model.cc \
-                                        --input_node=${TF_INPUT_NODE} \
-                                        --output_node=${TF_OUTPUT_NODE} \
+                                        --input_node=${INPUT_NODE} \
+                                        --output_node=${OUTPUT_NODE} \
                                         --data_type=${DATA_TYPE} \
                                         --runtime=${RUNTIME} \
                                         --output_type=source \
diff --git a/mace_tools.py b/mace_tools.py
index e4b3a1b0..d03ac326 100644
--- a/mace_tools.py
+++ b/mace_tools.py
@@ -2,7 +2,7 @@
 
 # Must run at root dir of libmace project.
 # python tools/mace_tools.py \
-#     --config=models/config \
+#     --config=tools/example.yaml \
 #     --round=100 \
 #     --mode=all
 
@@ -15,8 +15,6 @@ import yaml
 
 from ConfigParser import ConfigParser
 
-tf_model_file_dir_key = "TF_MODEL_FILE_DIR"
-
 
 def run_command(command):
   print("Run command: {}".format(command))
@@ -204,7 +202,7 @@ def main(unused_args):
       os.environ[key.upper()] = str(model_config[key])
 
     model_output_dir = FLAGS.output_dir + "/" + target_abi + "/" + os.path.splitext(
-        model_config["tf_model_file_path"])[0]
+        model_config["model_file_path"])[0]
     model_output_dirs.append(model_output_dir)
 
     if FLAGS.mode == "build" or FLAGS.mode == "all":
diff --git a/validate_tools.sh b/validate_tools.sh
index 75f93a80..17b30a60 100644
--- a/validate_tools.sh
+++ b/validate_tools.sh
@@ -23,12 +23,12 @@ if [ "$GENERATE_DATA_OR_NOT" = 1 ]; then
 else
   rm -rf ${MODEL_OUTPUT_DIR}/${OUTPUT_FILE_NAME}
   adb </dev/null pull ${PHONE_DATA_DIR}/${OUTPUT_FILE_NAME} ${MODEL_OUTPUT_DIR}
-  python tools/validate.py --model_file ${TF_MODEL_FILE_PATH} \
+  python tools/validate.py --model_file ${MODEL_FILE_PATH} \
       --input_file ${MODEL_OUTPUT_DIR}/${INPUT_FILE_NAME} \
       --mace_out_file ${MODEL_OUTPUT_DIR}/${OUTPUT_FILE_NAME} \
       --mace_runtime ${RUNTIME} \
-      --input_node ${TF_INPUT_NODE} \
-      --output_node ${TF_OUTPUT_NODE} \
+      --input_node ${INPUT_NODE} \
+      --output_node ${OUTPUT_NODE} \
       --input_shape ${INPUT_SHAPE} \
       --output_shape ${OUTPUT_SHAPE}
 fi
-- 
GitLab