mirror of
https://github.com/modelscope/modelscope.git
synced 2026-05-18 05:05:00 +02:00
[Refactor] Refactor the modelscope download module (#1683)
This commit is contained in:
@@ -112,9 +112,10 @@ RUN set -eux; \
|
||||
done
|
||||
|
||||
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
|
||||
ENV PYTHON_PIP_VERSION 23.0.1
|
||||
# pip>=23.3 required for Python 3.12 (pkgutil.ImpImporter removed; older pip crashes on any install)
|
||||
ENV PYTHON_PIP_VERSION 24.3.1
|
||||
# https://github.com/docker-library/python/issues/365
|
||||
ENV PYTHON_SETUPTOOLS_VERSION 65.5.1
|
||||
ENV PYTHON_SETUPTOOLS_VERSION 75.8.2
|
||||
# https://github.com/pypa/get-pip
|
||||
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/dbf0c85f76fb6e1ab42aa672ffca6f0a675d9ee4/public/get-pip.py
|
||||
ENV PYTHON_GET_PIP_SHA256 dfe9fd5c28dc98b5ac17979a953ea550cec37ae1b47a5116007395bfacff2ab9
|
||||
|
||||
@@ -112,9 +112,10 @@ RUN set -eux; \
|
||||
done
|
||||
|
||||
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
|
||||
ENV PYTHON_PIP_VERSION 23.0.1
|
||||
# pip>=23.3 required for Python 3.12 (pkgutil.ImpImporter removed; older pip crashes on any install)
|
||||
ENV PYTHON_PIP_VERSION 24.3.1
|
||||
# https://github.com/docker-library/python/issues/365
|
||||
ENV PYTHON_SETUPTOOLS_VERSION 65.5.1
|
||||
ENV PYTHON_SETUPTOOLS_VERSION 75.8.2
|
||||
# https://github.com/pypa/get-pip
|
||||
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/dbf0c85f76fb6e1ab42aa672ffca6f0a675d9ee4/public/get-pip.py
|
||||
ENV PYTHON_GET_PIP_SHA256 dfe9fd5c28dc98b5ac17979a953ea550cec37ae1b47a5116007395bfacff2ab9
|
||||
|
||||
@@ -54,6 +54,13 @@ class Builder:
|
||||
def generate_dockerfile(self) -> str:
|
||||
raise NotImplementedError
|
||||
|
||||
@staticmethod
|
||||
def _remove_pynini_related_dependency(content: str) -> str:
|
||||
return content.replace(
|
||||
'pip install --no-cache-dir funtextprocessing typeguard==2.13.3 scikit-learn -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html &&', # noqa: E501
|
||||
'pip install --no-cache-dir typeguard==2.13.3 scikit-learn -f https://modelscope.oss-cn-beijing.aliyuncs.com/releases/repo.html &&' # noqa: E501
|
||||
)
|
||||
|
||||
def _save_dockerfile(self, content: str) -> None:
|
||||
if os.path.exists('./Dockerfile'):
|
||||
os.remove('./Dockerfile')
|
||||
@@ -302,7 +309,7 @@ class StableCPUImageBuilder(Builder):
|
||||
content = content.replace('{modelscope_branch}',
|
||||
self.args.modelscope_branch)
|
||||
content = content.replace('{swift_branch}', self.args.swift_branch)
|
||||
return content
|
||||
return self._remove_pynini_related_dependency(content)
|
||||
|
||||
def image(self) -> str:
|
||||
return (
|
||||
@@ -363,7 +370,7 @@ RUN pip install --no-cache-dir -U icecream soundfile pybind11 py-spy
|
||||
content = content.replace('{modelscope_branch}',
|
||||
self.args.modelscope_branch)
|
||||
content = content.replace('{swift_branch}', self.args.swift_branch)
|
||||
return content
|
||||
return self._remove_pynini_related_dependency(content)
|
||||
|
||||
def image(self) -> str:
|
||||
return (
|
||||
|
||||
Reference in New Issue
Block a user