Skip to content

Commit

Permalink
Update cpu docker images to support torch 2.2.0 (#1499)
Browse files Browse the repository at this point in the history
  • Loading branch information
csukuangfj authored Feb 18, 2024
1 parent d9ae8c0 commit 06b356a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
1 change: 1 addition & 0 deletions .github/scripts/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ ARG _KALDIFEAT_VERSION="${KALDIFEAT_VERSION}+cpu.torch${TORCH_VERSION}"

RUN apt-get update -y && \
apt-get install -qq -y \
cmake \
ffmpeg \
git \
git-lfs \
Expand Down
21 changes: 13 additions & 8 deletions .github/scripts/docker/generate_build_matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@


def version_gt(a, b):
a_major, a_minor = a.split(".")[:2]
b_major, b_minor = b.split(".")[:2]
a_major, a_minor = list(map(int, a.split(".")))[:2]
b_major, b_minor = list(map(int, b.split(".")))[:2]
if a_major > b_major:
return True

Expand All @@ -18,8 +18,8 @@ def version_gt(a, b):


def version_ge(a, b):
a_major, a_minor = a.split(".")[:2]
b_major, b_minor = b.split(".")[:2]
a_major, a_minor = list(map(int, a.split(".")))[:2]
b_major, b_minor = list(map(int, b.split(".")))[:2]
if a_major > b_major:
return True

Expand All @@ -43,11 +43,12 @@ def get_torchaudio_version(torch_version):


def get_matrix():
k2_version = "1.24.4.dev20231220"
kaldifeat_version = "1.25.3.dev20231221"
version = "1.2"
python_version = ["3.8", "3.9", "3.10", "3.11"]
k2_version = "1.24.4.dev20240211"
kaldifeat_version = "1.25.4.dev20240210"
version = "1.3"
python_version = ["3.8", "3.9", "3.10", "3.11", "3.12"]
torch_version = ["1.13.0", "1.13.1", "2.0.0", "2.0.1", "2.1.0", "2.1.1", "2.1.2"]
torch_version += ["2.2.0"]

matrix = []
for p in python_version:
Expand All @@ -57,6 +58,10 @@ def get_matrix():
if version_gt(p, "3.10") and not version_gt(t, "2.0"):
continue

# only torch>=2.2.0 supports python 3.12
if version_gt(p, "3.11") and not version_gt(t, "2.1"):
continue

matrix.append(
{
"k2-version": k2_version,
Expand Down

0 comments on commit 06b356a

Please sign in to comment.