From 88af527e3847620fe1276ba786c73cff10c36478 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=9D=B4=ED=95=9C=EC=A2=85/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Engineer/=EC=82=BC=EC=84=B1=EC=A0=84?= =?utf8?q?=EC=9E=90?= Date: Wed, 25 Jul 2018 17:34:12 +0900 Subject: [PATCH] [model_parser] Change `GetBuiltinOptions` usage (#2072) * [model_parser] Rename `GetBuiltinOptions` and usage Rename `GetBuiltinOptions` to `GetOptions` and change the arguments. Signed-off-by: Hanjoung Lee * Revert renaming Signed-off-by: Hanjoung Lee --- tools/tflitefile_tool/operator_wrapping.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/tflitefile_tool/operator_wrapping.py b/tools/tflitefile_tool/operator_wrapping.py index 6802daa..ff5b47b 100755 --- a/tools/tflitefile_tool/operator_wrapping.py +++ b/tools/tflitefile_tool/operator_wrapping.py @@ -34,7 +34,8 @@ def GetStrTensorIndex(tensors): return return_string -def GetBuiltinOptions(tf_operator): +# NOTE Currently not all builtin operations are supported +def GetBuiltinOptions(options_type, options_table): import tflite.Conv2DOptions import tflite.DepthwiseConv2DOptions import tflite.Pool2DOptions @@ -72,8 +73,7 @@ def GetBuiltinOptions(tf_operator): bo.GatherOptions: tflite.GatherOptions.GatherOptions } - options_table = tf_operator.BuiltinOptions() - options = bo_gen[tf_operator.BuiltinOptionsType()]() + options = bo_gen[options_type]() options.Init(options_table.Bytes, options_table.Pos) return options @@ -114,7 +114,8 @@ class Operator(object): def PrintOptionInfo(self): # FIXME: workaround for ops such as custom try: - options = GetBuiltinOptions(self.tf_operator) + options = GetBuiltinOptions(self.tf_operator.BuiltinOptionsType(), + self.tf_operator.BuiltinOptions()) except KeyError: return -- 2.7.4