From 4ebfecb6cb65a04b5ae9b2da607ae16e802aa526 Mon Sep 17 00:00:00 2001 From: Jintao Huang Date: Tue, 16 Sep 2025 00:07:44 +0800 Subject: [PATCH] update swift docker --- docker/Dockerfile.ubuntu | 4 ++-- docker/build_image.py | 4 ++-- modelscope/hub/utils/utils.py | 2 +- tests/hub/test_hub_repo_info.py | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index 45360f0f..e889c8d7 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -79,8 +79,8 @@ RUN if [ "$INSTALL_MS_DEPS" = "True" ]; then \ pip install --no-cache-dir huggingface-hub transformers peft -U; \ fi; \ if [ "$INSTALL_MEGATRON_DEPS" = "True" ]; then \ - pip install "sglang[all]<0.4.10" "math_verify==0.5.2" "gradio<5.33" -U && \ - pip install liger_kernel nvitop pre-commit "transformers<4.55" huggingface-hub -U && \ + pip install "sglang[all]<0.5" "math_verify==0.5.2" "gradio<5.33" -U && \ + pip install liger_kernel wandb swanlab nvitop pre-commit "transformers<4.57" "trl<0.21" huggingface-hub -U && \ SITE_PACKAGES=$(python -c "import site; print(site.getsitepackages()[0])") && echo $SITE_PACKAGES && \ CUDNN_PATH=$SITE_PACKAGES/nvidia/cudnn CPLUS_INCLUDE_PATH=$SITE_PACKAGES/nvidia/cudnn/include \ pip install --no-build-isolation transformer_engine[pytorch]; \ diff --git a/docker/build_image.py b/docker/build_image.py index 2568f2a8..07c616f4 100644 --- a/docker/build_image.py +++ b/docker/build_image.py @@ -354,9 +354,9 @@ class SwiftImageBuilder(LLMImageBuilder): args.torchaudio_version = '2.7.1' args.torchvision_version = '0.22.1' if not args.vllm_version: - args.vllm_version = '0.10.0' + args.vllm_version = '0.10.1.1' if not args.lmdeploy_version: - args.lmdeploy_version = '0.9.2' + args.lmdeploy_version = '0.9.2.post1' if not args.flashattn_version: args.flashattn_version = '2.7.4.post1' return super().init_args(args) diff --git a/modelscope/hub/utils/utils.py b/modelscope/hub/utils/utils.py index 10658b0e..8953d926 100644 --- a/modelscope/hub/utils/utils.py +++ b/modelscope/hub/utils/utils.py @@ -5,11 +5,11 @@ import hashlib import os import sys import time -import zoneinfo from datetime import datetime from pathlib import Path from typing import Generator, List, Optional, Union +import zoneinfo from filelock import BaseFileLock, FileLock, SoftFileLock, Timeout from modelscope.hub.constants import (DEFAULT_MODELSCOPE_DOMAIN, diff --git a/tests/hub/test_hub_repo_info.py b/tests/hub/test_hub_repo_info.py index 0b021931..cb26cc10 100644 --- a/tests/hub/test_hub_repo_info.py +++ b/tests/hub/test_hub_repo_info.py @@ -3,9 +3,10 @@ import datetime import unittest -import zoneinfo from unittest.mock import Mock, patch +import zoneinfo + from modelscope.hub.api import DatasetInfo, HubApi, ModelInfo from modelscope.utils.constant import REPO_TYPE_DATASET, REPO_TYPE_MODEL from modelscope.utils.repo_utils import DetailedCommitInfo