From bed79b4414dc133cbff74e9e7a3b98db3eff9da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=AF=85?= <liyin@xiaomi.com>
Date: Fri, 29 Jun 2018 16:58:26 +0800
Subject: [PATCH] Make config file param name friendly

---
 mace/python/tools/converter.py | 9 +++++----
 tools/converter.py             | 4 ++--
 tools/sh_commands.py           | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/mace/python/tools/converter.py b/mace/python/tools/converter.py
index d39a8da5..fb5b8753 100644
--- a/mace/python/tools/converter.py
+++ b/mace/python/tools/converter.py
@@ -108,8 +108,9 @@ def main(unused_args):
             print("%s does not support dsp runtime yet." % FLAGS.platform)
             sys.exit(-1)
     else:
-        if FLAGS.transformers:
-            option = cvt.ConverterOption(FLAGS.transformers.split(','))
+        if FLAGS.graph_optimize_options:
+            option = cvt.ConverterOption(
+                FLAGS.graph_optimize_options.split(','))
         else:
             option = cvt.ConverterOption()
         option.winograd = FLAGS.winograd
@@ -287,10 +288,10 @@ def parse_args():
         default="fp16_fp32",
         help="fp16_fp32/fp32_fp32")
     parser.add_argument(
-        "--transformers",
+        "--graph_optimize_options",
         type=str,
         default="",
-        help="model transformers")
+        help="graph optimize options")
     return parser.parse_known_args()
 
 
diff --git a/tools/converter.py b/tools/converter.py
index 8e36e9f6..be376415 100644
--- a/tools/converter.py
+++ b/tools/converter.py
@@ -148,7 +148,7 @@ class YAMLKeyword(object):
     obfuscate = 'obfuscate'
     winograd = 'winograd'
     validation_inputs_data = 'validation_inputs_data'
-    transformers = 'transformers'  # keep it private for now
+    graph_optimize_options = 'graph_optimize_options'  # internal use for now
 
 
 class ModuleName(object):
@@ -657,7 +657,7 @@ def convert_model(configs):
             model_config[YAMLKeyword.obfuscate],
             configs[YAMLKeyword.build_type],
             data_type,
-            ",".join(model_config.get(YAMLKeyword.transformers, [])))
+            ",".join(model_config.get(YAMLKeyword.graph_optimize_options, [])))
 
         if configs[YAMLKeyword.build_type] == BuildType.proto:
             sh.mv("-f",
diff --git a/tools/sh_commands.py b/tools/sh_commands.py
index 97d66ca4..42c570c0 100644
--- a/tools/sh_commands.py
+++ b/tools/sh_commands.py
@@ -490,7 +490,7 @@ def gen_model_code(model_codegen_dir,
                    obfuscate,
                    model_build_type,
                    data_type,
-                   transformers):
+                   graph_optimize_options):
     bazel_build_common("//mace/python/tools:converter")
 
     if os.path.exists(model_codegen_dir):
@@ -517,7 +517,7 @@ def gen_model_code(model_codegen_dir,
               "--output_dir=%s" % model_codegen_dir,
               "--model_build_type=%s" % model_build_type,
               "--data_type=%s" % data_type,
-              "--transformers=%s" % transformers,
+              "--graph_optimize_options=%s" % graph_optimize_options,
               _fg=True)
 
 
-- 
GitLab