From 7d8f54193c0c682d41156aa3a20cb0b04f602deb Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Sat, 24 Feb 2024 15:22:17 +0800 Subject: [PATCH] Support torch 2.2.1 (#1270) --- .github/workflows/macos-cpu-wheels.yml | 2 +- .github/workflows/run-tests-cpu.yml | 2 +- .github/workflows/run-tests.yml | 2 +- .github/workflows/ubuntu-cpu-wheels.yml | 2 +- .github/workflows/ubuntu-cuda-wheels.yml | 2 +- .github/workflows/windows-x64-cpu-wheels.yml | 2 +- scripts/github_actions/generate_build_matrix.py | 8 +++++++- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/macos-cpu-wheels.yml b/.github/workflows/macos-cpu-wheels.yml index ed2eeaa46..27ef0f780 100644 --- a/.github/workflows/macos-cpu-wheels.yml +++ b/.github/workflows/macos-cpu-wheels.yml @@ -12,7 +12,7 @@ concurrency: jobs: generate_build_matrix: - if: github.repository_owner == 'csukuangfj' || github.repository_owner == 'k2-fsa' + if: github.repository_owner == 'csukuangfj' || github.repository_owner == 'k2-fsa' || github.repository_owner == 'csu-fangjun' # see https://github.com/pytorch/pytorch/pull/50633 runs-on: ubuntu-latest outputs: diff --git a/.github/workflows/run-tests-cpu.yml b/.github/workflows/run-tests-cpu.yml index c8af455c5..40eba583c 100644 --- a/.github/workflows/run-tests-cpu.yml +++ b/.github/workflows/run-tests-cpu.yml @@ -52,7 +52,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest] - torch: ["2.2.0"] + torch: ["2.2.1"] python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] build_type: ["Release", "Debug"] diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 83a2c9106..9af6b5a43 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -52,7 +52,7 @@ jobs: matrix: os: [ubuntu-latest] cuda: ["12.1"] - torch: ["2.2.0"] + torch: ["2.2.1"] python-version: ["3.12"] steps: diff --git a/.github/workflows/ubuntu-cpu-wheels.yml b/.github/workflows/ubuntu-cpu-wheels.yml index 48e9b0e72..0fcad767f 100644 --- a/.github/workflows/ubuntu-cpu-wheels.yml +++ b/.github/workflows/ubuntu-cpu-wheels.yml @@ -12,7 +12,7 @@ concurrency: jobs: generate_build_matrix: - if: github.repository_owner == 'csukuangfj' || github.repository_owner == 'k2-fsa' + if: github.repository_owner == 'csukuangfj' || github.repository_owner == 'k2-fsa' || github.repository_owner == 'csu-fangjun' # see https://github.com/pytorch/pytorch/pull/50633 runs-on: ubuntu-latest outputs: diff --git a/.github/workflows/ubuntu-cuda-wheels.yml b/.github/workflows/ubuntu-cuda-wheels.yml index f0778216b..8679f5b03 100644 --- a/.github/workflows/ubuntu-cuda-wheels.yml +++ b/.github/workflows/ubuntu-cuda-wheels.yml @@ -12,7 +12,7 @@ concurrency: jobs: generate_build_matrix: - if: github.repository_owner == 'csukuangfj' || github.repository_owner == 'k2-fsa' + if: github.repository_owner == 'csukuangfj' || github.repository_owner == 'k2-fsa' || github.repository_owner == 'csu-fangjun' # see https://github.com/pytorch/pytorch/pull/50633 runs-on: ubuntu-latest outputs: diff --git a/.github/workflows/windows-x64-cpu-wheels.yml b/.github/workflows/windows-x64-cpu-wheels.yml index d517e3272..33b9e81eb 100644 --- a/.github/workflows/windows-x64-cpu-wheels.yml +++ b/.github/workflows/windows-x64-cpu-wheels.yml @@ -12,7 +12,7 @@ concurrency: jobs: generate_build_matrix: - if: github.repository_owner == 'csukuangfj' || github.repository_owner == 'k2-fsa' + if: github.repository_owner == 'csukuangfj' || github.repository_owner == 'k2-fsa' || github.repository_owner == 'csu-fangjun' # see https://github.com/pytorch/pytorch/pull/50633 runs-on: ubuntu-latest outputs: diff --git a/scripts/github_actions/generate_build_matrix.py b/scripts/github_actions/generate_build_matrix.py index 87a9534b0..2fa40260d 100755 --- a/scripts/github_actions/generate_build_matrix.py +++ b/scripts/github_actions/generate_build_matrix.py @@ -196,10 +196,16 @@ def generate_build_matrix( if not for_windows else ["11.8.0", "12.1.0"], }, + "2.2.1": { + "python-version": ["3.8", "3.9", "3.10", "3.11", "3.12"], + "cuda": ["11.8", "12.1"] # default 12.1 + if not for_windows + else ["11.8.0", "12.1.0"], + }, # https://github.com/Jimver/cuda-toolkit/blob/master/src/links/windows-links.ts } if test_only_latest_torch: - latest = "2.2.0" + latest = "2.2.1" matrix = {latest: matrix[latest]} if for_windows or for_macos: