diff --git a/README.en.md b/README.en.md index 6a2f73359444fa011b903847cd6e1a52fb6bfd58..3c3b4243f953e7267befa7c48684682a30182e98 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 diff --git a/README.zh.md b/README.zh.md index 021f3e115df4038c3706e6358f3c95dd776779e0..1ea88b7c82ca542cf717294b9376bb725a8e0faa 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 ### 目录结构 diff --git a/main.py b/main.py index cd9c3e049dee67a185264b713eeca6f68611225d..2daeb4c22de4696e27bac12992f8ad36e09cbc77 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: