From 55a8eb404c9cee3be26a52d5e9aab80399d65482 Mon Sep 17 00:00:00 2001 From: "yuze.zyz" Date: Fri, 13 Sep 2024 13:44:14 +0800 Subject: [PATCH 01/13] fix code for downloading models from modelscope --- vllm/envs.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vllm/envs.py b/vllm/envs.py index b3678399fe207..ac1839f89bd36 100644 --- a/vllm/envs.py +++ b/vllm/envs.py @@ -426,3 +426,9 @@ def __getattr__(name: str): def __dir__(): return list(environment_variables.keys()) + + +if environment_variables.get('VLLM_USE_MODELSCOPE', False): + from modelscope.utils.hf_util import patch_hub + # Patch hub to download models from modelscope to speed up. + patch_hub() From 5926f613905dccd5ca17751b12ce6f6a81b82cee Mon Sep 17 00:00:00 2001 From: "yuze.zyz" Date: Fri, 13 Sep 2024 13:50:13 +0800 Subject: [PATCH 02/13] add version comments --- vllm/envs.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vllm/envs.py b/vllm/envs.py index ac1839f89bd36..ccfca0e8fa66a 100644 --- a/vllm/envs.py +++ b/vllm/envs.py @@ -429,6 +429,12 @@ def __dir__(): if environment_variables.get('VLLM_USE_MODELSCOPE', False): + from packaging import version + import modelscope + if version.parse(modelscope.__version__) <= version.parse('1.18.0'): + raise ImportError(f'Using vLLM with ModelScope needs modelscope>=1.18.1, please ' + f'install by `pip install modelscope>=1.18.1`') + from modelscope.utils.hf_util import patch_hub # Patch hub to download models from modelscope to speed up. patch_hub() From 87e5c2bf35b4009547d0a0988341e373b2eb454d Mon Sep 17 00:00:00 2001 From: "yuze.zyz" Date: Fri, 13 Sep 2024 14:00:24 +0800 Subject: [PATCH 03/13] lint code --- vllm/envs.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/vllm/envs.py b/vllm/envs.py index ccfca0e8fa66a..cc7b0e75bf3e0 100644 --- a/vllm/envs.py +++ b/vllm/envs.py @@ -429,12 +429,14 @@ def __dir__(): if environment_variables.get('VLLM_USE_MODELSCOPE', False): - from packaging import version import modelscope + from packaging import version if version.parse(modelscope.__version__) <= version.parse('1.18.0'): - raise ImportError(f'Using vLLM with ModelScope needs modelscope>=1.18.1, please ' - f'install by `pip install modelscope>=1.18.1`') + raise ImportError( + 'Using vLLM with ModelScope needs modelscope>=1.18.1, please ' + 'install by `pip install modelscope>=1.18.1`') from modelscope.utils.hf_util import patch_hub + # Patch hub to download models from modelscope to speed up. patch_hub() From 024b0ceab2a18e4467a2bcc841d7be7f7a83b63a Mon Sep 17 00:00:00 2001 From: "yuze.zyz" Date: Fri, 13 Sep 2024 22:01:00 +0800 Subject: [PATCH 04/13] fix CI --- vllm/envs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vllm/envs.py b/vllm/envs.py index cc7b0e75bf3e0..c2a700388d483 100644 --- a/vllm/envs.py +++ b/vllm/envs.py @@ -428,7 +428,7 @@ def __dir__(): return list(environment_variables.keys()) -if environment_variables.get('VLLM_USE_MODELSCOPE', False): +if environment_variables.get('VLLM_USE_MODELSCOPE', lambda: False)(): import modelscope from packaging import version if version.parse(modelscope.__version__) <= version.parse('1.18.0'): From 1581ed1a30f2f00cbd8c031af3589a449b4e192f Mon Sep 17 00:00:00 2001 From: "yuze.zyz" Date: Sat, 14 Sep 2024 17:29:54 +0800 Subject: [PATCH 05/13] refactor code --- vllm/envs.py | 14 -------------- vllm/transformers_utils/__init__.py | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/vllm/envs.py b/vllm/envs.py index c2a700388d483..b3678399fe207 100644 --- a/vllm/envs.py +++ b/vllm/envs.py @@ -426,17 +426,3 @@ def __getattr__(name: str): def __dir__(): return list(environment_variables.keys()) - - -if environment_variables.get('VLLM_USE_MODELSCOPE', lambda: False)(): - import modelscope - from packaging import version - if version.parse(modelscope.__version__) <= version.parse('1.18.0'): - raise ImportError( - 'Using vLLM with ModelScope needs modelscope>=1.18.1, please ' - 'install by `pip install modelscope>=1.18.1`') - - from modelscope.utils.hf_util import patch_hub - - # Patch hub to download models from modelscope to speed up. - patch_hub() diff --git a/vllm/transformers_utils/__init__.py b/vllm/transformers_utils/__init__.py index e69de29bb2d1d..2cd2afbca7ae3 100644 --- a/vllm/transformers_utils/__init__.py +++ b/vllm/transformers_utils/__init__.py @@ -0,0 +1,15 @@ +from vllm.envs import VLLM_USE_MODELSCOPE + + +if VLLM_USE_MODELSCOPE: + import modelscope + from packaging import version + if version.parse(modelscope.__version__) <= version.parse('1.18.0'): + raise ImportError( + 'Using vLLM with ModelScope needs modelscope>=1.18.1, please ' + 'install by `pip install modelscope>=1.18.1`') + + from modelscope.utils.hf_util import patch_hub + + # Patch hub to download models from modelscope to speed up. + patch_hub() \ No newline at end of file From 68302873f824bc8388bf511c6723c1c8bbc7b975 Mon Sep 17 00:00:00 2001 From: "yuze.zyz" Date: Sat, 14 Sep 2024 18:03:39 +0800 Subject: [PATCH 06/13] lint code --- vllm/transformers_utils/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vllm/transformers_utils/__init__.py b/vllm/transformers_utils/__init__.py index 2cd2afbca7ae3..b626f80321fa9 100644 --- a/vllm/transformers_utils/__init__.py +++ b/vllm/transformers_utils/__init__.py @@ -1,6 +1,5 @@ from vllm.envs import VLLM_USE_MODELSCOPE - if VLLM_USE_MODELSCOPE: import modelscope from packaging import version @@ -12,4 +11,4 @@ from modelscope.utils.hf_util import patch_hub # Patch hub to download models from modelscope to speed up. - patch_hub() \ No newline at end of file + patch_hub() From 6fbbd53d722cc1fa430b7d66cb07a2a33d7d70c4 Mon Sep 17 00:00:00 2001 From: "yuze.zyz" Date: Wed, 18 Sep 2024 10:20:32 +0800 Subject: [PATCH 07/13] add a comment --- vllm/transformers_utils/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/vllm/transformers_utils/__init__.py b/vllm/transformers_utils/__init__.py index b626f80321fa9..4e81aa39ff147 100644 --- a/vllm/transformers_utils/__init__.py +++ b/vllm/transformers_utils/__init__.py @@ -1,6 +1,7 @@ from vllm.envs import VLLM_USE_MODELSCOPE if VLLM_USE_MODELSCOPE: + # Patch here, before each import happens import modelscope from packaging import version if version.parse(modelscope.__version__) <= version.parse('1.18.0'): From 6bab79be2a8b3d1a836a2c4b25b5b4688bf3675e Mon Sep 17 00:00:00 2001 From: "yuze.zyz" Date: Mon, 23 Sep 2024 10:54:32 +0800 Subject: [PATCH 08/13] add a comment --- vllm/transformers_utils/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vllm/transformers_utils/__init__.py b/vllm/transformers_utils/__init__.py index 4e81aa39ff147..74ca396276c3f 100644 --- a/vllm/transformers_utils/__init__.py +++ b/vllm/transformers_utils/__init__.py @@ -4,6 +4,8 @@ # Patch here, before each import happens import modelscope from packaging import version + + # patch_hub begins from modelscope>=1.18.1 if version.parse(modelscope.__version__) <= version.parse('1.18.0'): raise ImportError( 'Using vLLM with ModelScope needs modelscope>=1.18.1, please ' From 459d43d6fcba774bd2eaa2e086d35ad622389188 Mon Sep 17 00:00:00 2001 From: "yuze.zyz" Date: Mon, 23 Sep 2024 13:38:21 +0800 Subject: [PATCH 09/13] temp remove code to test CI --- vllm/transformers_utils/__init__.py | 34 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/vllm/transformers_utils/__init__.py b/vllm/transformers_utils/__init__.py index 74ca396276c3f..d34a3784f9061 100644 --- a/vllm/transformers_utils/__init__.py +++ b/vllm/transformers_utils/__init__.py @@ -1,17 +1,17 @@ -from vllm.envs import VLLM_USE_MODELSCOPE - -if VLLM_USE_MODELSCOPE: - # Patch here, before each import happens - import modelscope - from packaging import version - - # patch_hub begins from modelscope>=1.18.1 - if version.parse(modelscope.__version__) <= version.parse('1.18.0'): - raise ImportError( - 'Using vLLM with ModelScope needs modelscope>=1.18.1, please ' - 'install by `pip install modelscope>=1.18.1`') - - from modelscope.utils.hf_util import patch_hub - - # Patch hub to download models from modelscope to speed up. - patch_hub() +# from vllm.envs import VLLM_USE_MODELSCOPE +# +# if VLLM_USE_MODELSCOPE: +# # Patch here, before each import happens +# import modelscope +# from packaging import version +# +# # patch_hub begins from modelscope>=1.18.1 +# if version.parse(modelscope.__version__) <= version.parse('1.18.0'): +# raise ImportError( +# 'Using vLLM with ModelScope needs modelscope>=1.18.1, please ' +# 'install by `pip install modelscope>=1.18.1`') +# +# from modelscope.utils.hf_util import patch_hub +# +# # Patch hub to download models from modelscope to speed up. +# patch_hub() From 8a026dd0b102fd8a24e2df1f0c46f82c463a9d99 Mon Sep 17 00:00:00 2001 From: "yuze.zyz" Date: Tue, 24 Sep 2024 11:49:47 +0800 Subject: [PATCH 10/13] add test code --- vllm/transformers_utils/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/vllm/transformers_utils/__init__.py b/vllm/transformers_utils/__init__.py index d34a3784f9061..2b2b46c860f35 100644 --- a/vllm/transformers_utils/__init__.py +++ b/vllm/transformers_utils/__init__.py @@ -15,3 +15,4 @@ # # # Patch hub to download models from modelscope to speed up. # patch_hub() +# Test again! From 33409404821775377d8c608242e415d93639c3cd Mon Sep 17 00:00:00 2001 From: "yuze.zyz" Date: Tue, 24 Sep 2024 13:37:15 +0800 Subject: [PATCH 11/13] revert code --- vllm/transformers_utils/__init__.py | 35 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/vllm/transformers_utils/__init__.py b/vllm/transformers_utils/__init__.py index 2b2b46c860f35..74ca396276c3f 100644 --- a/vllm/transformers_utils/__init__.py +++ b/vllm/transformers_utils/__init__.py @@ -1,18 +1,17 @@ -# from vllm.envs import VLLM_USE_MODELSCOPE -# -# if VLLM_USE_MODELSCOPE: -# # Patch here, before each import happens -# import modelscope -# from packaging import version -# -# # patch_hub begins from modelscope>=1.18.1 -# if version.parse(modelscope.__version__) <= version.parse('1.18.0'): -# raise ImportError( -# 'Using vLLM with ModelScope needs modelscope>=1.18.1, please ' -# 'install by `pip install modelscope>=1.18.1`') -# -# from modelscope.utils.hf_util import patch_hub -# -# # Patch hub to download models from modelscope to speed up. -# patch_hub() -# Test again! +from vllm.envs import VLLM_USE_MODELSCOPE + +if VLLM_USE_MODELSCOPE: + # Patch here, before each import happens + import modelscope + from packaging import version + + # patch_hub begins from modelscope>=1.18.1 + if version.parse(modelscope.__version__) <= version.parse('1.18.0'): + raise ImportError( + 'Using vLLM with ModelScope needs modelscope>=1.18.1, please ' + 'install by `pip install modelscope>=1.18.1`') + + from modelscope.utils.hf_util import patch_hub + + # Patch hub to download models from modelscope to speed up. + patch_hub() From 8ce004bf18df9124a2b9d60f5c206c97f4f2ca53 Mon Sep 17 00:00:00 2001 From: "yuze.zyz" Date: Tue, 24 Sep 2024 15:47:55 +0800 Subject: [PATCH 12/13] add print --- vllm/transformers_utils/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/vllm/transformers_utils/__init__.py b/vllm/transformers_utils/__init__.py index 74ca396276c3f..c06b8985a8cf1 100644 --- a/vllm/transformers_utils/__init__.py +++ b/vllm/transformers_utils/__init__.py @@ -1,5 +1,6 @@ from vllm.envs import VLLM_USE_MODELSCOPE +print(f'VLLM_USE_MODELSCOPE={VLLM_USE_MODELSCOPE}') if VLLM_USE_MODELSCOPE: # Patch here, before each import happens import modelscope From 0a39a0ee3ff05798878c669b0676c4869c95f0da Mon Sep 17 00:00:00 2001 From: "yuze.zyz" Date: Tue, 24 Sep 2024 17:45:39 +0800 Subject: [PATCH 13/13] remove useless code --- vllm/transformers_utils/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/vllm/transformers_utils/__init__.py b/vllm/transformers_utils/__init__.py index c06b8985a8cf1..74ca396276c3f 100644 --- a/vllm/transformers_utils/__init__.py +++ b/vllm/transformers_utils/__init__.py @@ -1,6 +1,5 @@ from vllm.envs import VLLM_USE_MODELSCOPE -print(f'VLLM_USE_MODELSCOPE={VLLM_USE_MODELSCOPE}') if VLLM_USE_MODELSCOPE: # Patch here, before each import happens import modelscope