From c37d017ab8201c177f07737c421aa58a37c2c549 Mon Sep 17 00:00:00 2001 From: luxuhui Date: Tue, 14 Jan 2020 19:49:18 +0800 Subject: [PATCH] fix bug in converter and dana N/A Signed-off-by: Luxuhui --- tools/bazel_adb_run.py | 9 +++++---- tools/python/transform/transformer.py | 10 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tools/bazel_adb_run.py b/tools/bazel_adb_run.py index 309ac90f..564401eb 100644 --- a/tools/bazel_adb_run.py +++ b/tools/bazel_adb_run.py @@ -195,10 +195,11 @@ def main(unused_args): address_sanitizer=FLAGS.address_sanitizer, simpleperf=FLAGS.simpleperf) globals()[FLAGS.stdout_processor](stdouts, dev, target_abi) - report_run_statistics(stdouts=stdouts, - device=dev['device_name'], - soc=dev['target_socs'], - abi=target_abi, dana_util=dana_util) + if dana_util.service_available(): + report_run_statistics(stdouts=stdouts, + device=dev['device_name'], + soc=dev['target_socs'], + abi=target_abi, dana_util=dana_util) if __name__ == "__main__": diff --git a/tools/python/transform/transformer.py b/tools/python/transform/transformer.py index 4b5b9811..69411e41 100644 --- a/tools/python/transform/transformer.py +++ b/tools/python/transform/transformer.py @@ -2134,12 +2134,12 @@ class Transformer(base_converter.ConverterInterface): continue shape_idx = kOpTypeInputIdxMap[op.type] dim_arg = ConverterUtil.get_arg(op, MaceKeyword.mace_dim_str) - if len(op.input) > shape_idx and dim_arg is None: + if len(op.input) > shape_idx and dim_arg is None and \ + op.input[shape_idx] in self._consts: shape_tensor = self._consts[op.input[shape_idx]] - if shape_tensor is not None: - dim_arg = op.arg.add() - dim_arg.name = MaceKeyword.mace_dim_str - dim_arg.ints.extend(shape_tensor.int32_data) + dim_arg = op.arg.add() + dim_arg.name = MaceKeyword.mace_dim_str + dim_arg.ints.extend(shape_tensor.int32_data) def fold_fc_reshape(self): net = self._model -- GitLab