From 7fef22fdf455a454bc909bfc967b147efd572a8d Mon Sep 17 00:00:00 2001 From: "cling.lai" <429600880@qq.com> Date: Sun, 16 Feb 2020 22:23:59 +0800 Subject: [PATCH 1/3] update main.py. fix import issue --- main.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/main.py b/main.py index cd9c3e0..2daeb4c 100644 --- a/main.py +++ b/main.py @@ -1,13 +1,8 @@ import configparser import os import shutil -from caffe_impl.caffe_compare import CaffeCompare -from tensorflow.python.util import deprecation -from tf_impl.tf_basic_compare import TensorflowBasicCompare from utils.convert2davinci import convert_model -deprecation._PRINT_DEPRECATION_WARNINGS = False - def parameter_check(config): '''check the params in user.config''' @@ -182,9 +177,11 @@ if __name__ == '__main__': exit() if user_config_dict['framework_name'].lower() == 'tensorflow': + from tf_impl.tf_basic_compare import TensorflowBasicCompare tf_compare_instance = TensorflowBasicCompare(user_config_dict) tf_compare_instance.run() elif user_config_dict['framework_name'].lower() == 'caffe': + from caffe_impl.caffe_compare import CaffeCompare caffe_compare_instance = CaffeCompare(user_config_dict) caffe_compare_instance.run() else: -- Gitee From 613e2a82d7901d8730b3db6f1a564f12a4f04c61 Mon Sep 17 00:00:00 2001 From: "cling.lai" <429600880@qq.com> Date: Sun, 16 Feb 2020 22:26:04 +0800 Subject: [PATCH 2/3] update README.en.md. fix dependent issue --- README.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.en.md b/README.en.md index 6a2f733..3c3b424 100644 --- a/README.en.md +++ b/README.en.md @@ -26,7 +26,7 @@ npu-smi info Ubuntu 16.04 or CentOS 7.0 Python >= 3.5.2 (Python 2 is not supported) -tensorflow >= 1.12 +tensorflow >= 1.14 caffe == 1.0 ### Directory Structure -- Gitee From f00fede77f861bb4cc638c996cc4b1f80aa71132 Mon Sep 17 00:00:00 2001 From: "cling.lai" <429600880@qq.com> Date: Sun, 16 Feb 2020 22:27:38 +0800 Subject: [PATCH 3/3] update README.zh.md. fix dependent issue --- README.zh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.zh.md b/README.zh.md index 021f3e1..1ea88b7 100644 --- a/README.zh.md +++ b/README.zh.md @@ -24,7 +24,7 @@ npu-smi info Ubuntu 16.04 或 CentOS 7.0 Python >= 3.5.2 (Python 2 is not supported) -tensorflow >= 1.12 +tensorflow >= 1.14 caffe == 1.0 ### 目录结构 -- Gitee