From eb8fe44de3f6d8019086fa4c70317a1b7b3d4bda Mon Sep 17 00:00:00 2001 From: Evgeny Lazarev Date: Wed, 29 Jul 2020 13:23:52 +0300 Subject: [PATCH] Updated MO requirements files (#1511) * Updated MO requirements files * Updated requirements in the CI config to run the pylint --- .github/workflows/mo.yml | 2 -- model-optimizer/extensions/load/tf/loader.py | 2 +- model-optimizer/mo/front/tf/common.py | 2 +- model-optimizer/mo/utils/tensorboard_util.py | 2 +- model-optimizer/requirements.txt | 2 +- model-optimizer/requirements_dev.txt | 6 +----- model-optimizer/requirements_tf.txt | 2 +- 7 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/mo.yml b/.github/workflows/mo.yml index 552003f..b3a1a61 100644 --- a/.github/workflows/mo.yml +++ b/.github/workflows/mo.yml @@ -32,8 +32,6 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools - # For Pylint - pip install tensorflow==1.14.0 tensorboard==1.14.0 tensorflow-estimator==1.14.0 # For UT pip install unittest-xml-reporting==3.0.2 # MO requirements diff --git a/model-optimizer/extensions/load/tf/loader.py b/model-optimizer/extensions/load/tf/loader.py index f3ff7f8..755caa9 100644 --- a/model-optimizer/extensions/load/tf/loader.py +++ b/model-optimizer/extensions/load/tf/loader.py @@ -20,7 +20,7 @@ except ImportError: import tensorflow as tf_v1 try: - import tensorflow.contrib + import tensorflow.contrib # pylint: disable=no-name-in-module,import-error except: pass # we try to import contrib for loading models that use contrib operations diff --git a/model-optimizer/mo/front/tf/common.py b/model-optimizer/mo/front/tf/common.py index c548eef..938d56b 100644 --- a/model-optimizer/mo/front/tf/common.py +++ b/model-optimizer/mo/front/tf/common.py @@ -15,7 +15,7 @@ """ import numpy as np -from tensorflow.core.framework import types_pb2 as tf_types # pylint: disable=no-name-in-module +from tensorflow.core.framework import types_pb2 as tf_types # pylint: disable=no-name-in-module,import-error # mapping between TF data type and numpy data type and function to extract data from TF tensor _tf_np_mapping = [('DT_BOOL', np.bool, lambda pb: pb.bool_val, lambda x: bool_cast(x)), diff --git a/model-optimizer/mo/utils/tensorboard_util.py b/model-optimizer/mo/utils/tensorboard_util.py index bc8a600..47e97d4 100644 --- a/model-optimizer/mo/utils/tensorboard_util.py +++ b/model-optimizer/mo/utils/tensorboard_util.py @@ -19,7 +19,7 @@ try: except ImportError: import tensorflow as tf_v1 try: - import tensorflow.contrib + import tensorflow.contrib # pylint: disable=no-name-in-module,import-error except: pass # we try to import contrib for loading models that use contrib operations from mo.utils.error import Error diff --git a/model-optimizer/requirements.txt b/model-optimizer/requirements.txt index a602470..9906a8e 100644 --- a/model-optimizer/requirements.txt +++ b/model-optimizer/requirements.txt @@ -1,4 +1,4 @@ -tensorflow>=1.2.0 +tensorflow>=1.15.2 mxnet>=1.0.0,<=1.5.1 networkx>=1.11 numpy>=1.13.0 diff --git a/model-optimizer/requirements_dev.txt b/model-optimizer/requirements_dev.txt index d102b91..1c18781 100644 --- a/model-optimizer/requirements_dev.txt +++ b/model-optimizer/requirements_dev.txt @@ -1,9 +1,5 @@ coverage==4.4.2 -m2r==0.1.12 +pylint==2.5.0 pyenchant==1.6.11 -isort==4.3.21 -astroid==2.1.0 -pylint==2.1.1 -Sphinx==1.6.5 test-generator==0.1.1 defusedxml>=0.5.0 diff --git a/model-optimizer/requirements_tf.txt b/model-optimizer/requirements_tf.txt index 09ae7b6..61b88bd 100644 --- a/model-optimizer/requirements_tf.txt +++ b/model-optimizer/requirements_tf.txt @@ -1,4 +1,4 @@ -tensorflow>=1.2.0 +tensorflow>=1.15.2 networkx>=1.11 numpy>=1.13.0 test-generator==0.1.1 -- 2.7.4