From 34acc596e1d2c1ed4b3d42181ec8d60f72e49aa2 Mon Sep 17 00:00:00 2001 From: "wenmeng.zwm" Date: Mon, 1 Aug 2022 15:42:58 +0800 Subject: [PATCH] [to #43115513] fix module path error for ast and add numpy<=1.18 1. fix module path error, if code path contains multiple `modelscope` str, use the last one as the start position of modelscope source direcotry 2. add numpy version constraint <=1.18 3. add __init__.py to models/cv/image_to_image_translation 4. split audio requirements from all Link: https://code.alibaba-inc.com/Ali-MaaS/MaaS-lib/codereview/9587929 --- modelscope/models/cv/image_to_image_translation/__init__.py | 0 modelscope/utils/ast_utils.py | 2 +- requirements/audio.txt | 4 ++-- setup.py | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 modelscope/models/cv/image_to_image_translation/__init__.py diff --git a/modelscope/models/cv/image_to_image_translation/__init__.py b/modelscope/models/cv/image_to_image_translation/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/modelscope/utils/ast_utils.py b/modelscope/utils/ast_utils.py index e7577c78..b7b32c81 100644 --- a/modelscope/utils/ast_utils.py +++ b/modelscope/utils/ast_utils.py @@ -490,7 +490,7 @@ class FilesAstScaning(object): result = dict() for file in self.file_dirs: - filepath = file[file.find('modelscope'):] + filepath = file[file.rfind('modelscope'):] module_name = filepath.replace(osp.sep, '.').replace('.py', '') decorator_list, import_list = self._get_single_file_scan_result( file) diff --git a/requirements/audio.txt b/requirements/audio.txt index 3bd0d8af..132b48ed 100644 --- a/requirements/audio.txt +++ b/requirements/audio.txt @@ -11,8 +11,8 @@ matplotlib MinDAEC nara_wpe nltk -# numpy requirements should be declared with tensorflow 1.15 but not here -# numpy<=1.18 +# tensorflow 1.15 requires numpy<=1.18 +numpy<=1.18 # protobuf version beyond 3.20.0 is not compatible with TensorFlow 1.x, therefore is discouraged. protobuf>3,<3.21.0 ptflops diff --git a/setup.py b/setup.py index 2a551fb7..21195f6a 100644 --- a/setup.py +++ b/setup.py @@ -178,7 +178,11 @@ if __name__ == '__main__': continue extra_requires[field], _ = parse_requirements( f'requirements/{field}.txt') - all_requires.extend(extra_requires[field]) + + # skip audio requirements due to its hard dependency which + # result in mac/windows compatibility problems + if field != Fields.audio: + all_requires.append(extra_requires[field]) extra_requires['all'] = all_requires