Update CPU docker to support numpy 2.0

This commit is contained in:
Fangjun Kuang 2024-10-29 20:53:18 +08:00
parent 31aaee60e8
commit 56523fd7eb
2 changed files with 15 additions and 20 deletions

View File

@ -36,7 +36,9 @@ RUN pip install --no-cache-dir \
\ \
git+https://github.com/lhotse-speech/lhotse \ git+https://github.com/lhotse-speech/lhotse \
kaldifeat==${_KALDIFEAT_VERSION} -f https://csukuangfj.github.io/kaldifeat/cpu.html \ kaldifeat==${_KALDIFEAT_VERSION} -f https://csukuangfj.github.io/kaldifeat/cpu.html \
conformer==0.3.2 \
cython \ cython \
diffusers \
dill \ dill \
espnet_tts_frontend \ espnet_tts_frontend \
graphviz \ graphviz \
@ -45,6 +47,7 @@ RUN pip install --no-cache-dir \
kaldialign \ kaldialign \
kaldifst \ kaldifst \
kaldilm \ kaldilm \
librosa \
matplotlib \ matplotlib \
multi_quantization \ multi_quantization \
numba \ numba \

View File

@ -43,10 +43,10 @@ def get_torchaudio_version(torch_version):
def get_matrix(): def get_matrix():
k2_version = "1.24.4.dev20240223" k2_version = "1.24.4.dev20241029"
kaldifeat_version = "1.25.4.dev20240223" kaldifeat_version = "1.25.5.dev20241029"
version = "20240905" version = "20241029"
python_version = ["3.8", "3.9", "3.10", "3.11", "3.12"] python_version = ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
torch_version = [] torch_version = []
# torch_version += ["1.13.0", "1.13.1"] # torch_version += ["1.13.0", "1.13.1"]
# torch_version += ["2.0.0", "2.0.1"] # torch_version += ["2.0.0", "2.0.1"]
@ -56,6 +56,7 @@ def get_matrix():
torch_version += ["2.3.0", "2.3.1"] torch_version += ["2.3.0", "2.3.1"]
torch_version += ["2.4.0"] torch_version += ["2.4.0"]
torch_version += ["2.4.1"] torch_version += ["2.4.1"]
torch_version += ["2.5.0"]
matrix = [] matrix = []
for p in python_version: for p in python_version:
@ -69,25 +70,16 @@ def get_matrix():
if version_gt(p, "3.11") and not version_gt(t, "2.1"): if version_gt(p, "3.11") and not version_gt(t, "2.1"):
continue continue
if version_gt(p, "3.12") and not version_gt(t, "2.4"):
continue
if version_gt(t, "2.4") and version_gt("3.10", p):
# torch>=2.5 requires python 3.10
continue
k2_version_2 = k2_version k2_version_2 = k2_version
kaldifeat_version_2 = kaldifeat_version kaldifeat_version_2 = kaldifeat_version
if t == "2.2.2":
k2_version_2 = "1.24.4.dev20240328"
kaldifeat_version_2 = "1.25.4.dev20240329"
elif t == "2.3.0":
k2_version_2 = "1.24.4.dev20240425"
kaldifeat_version_2 = "1.25.4.dev20240425"
elif t == "2.3.1":
k2_version_2 = "1.24.4.dev20240606"
kaldifeat_version_2 = "1.25.4.dev20240606"
elif t == "2.4.0":
k2_version_2 = "1.24.4.dev20240725"
kaldifeat_version_2 = "1.25.4.dev20240725"
elif t == "2.4.1":
k2_version_2 = "1.24.4.dev20240905"
kaldifeat_version_2 = "1.25.4.dev20240905"
matrix.append( matrix.append(
{ {
"k2-version": k2_version_2, "k2-version": k2_version_2,