diff --git a/.github/workflows/develop_install.yml b/.github/workflows/develop_install.yml index a640d3b74..3dc804fb5 100644 --- a/.github/workflows/develop_install.yml +++ b/.github/workflows/develop_install.yml @@ -16,7 +16,7 @@ jobs: matrix: python_version: ['3.9', '3.10'] - pytorch_version: ['1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0'] + pytorch_version: ['1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0', '2.2.2', '2.3.1'] platform: ['windows-latest', 'ubuntu-latest', 'macos-latest'] diff --git a/.github/workflows/end_to_end.yml b/.github/workflows/end_to_end.yml index 666d036de..ff54defca 100644 --- a/.github/workflows/end_to_end.yml +++ b/.github/workflows/end_to_end.yml @@ -16,7 +16,7 @@ jobs: matrix: python_version: ['3.9', '3.10'] - pytorch_version: ['1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0'] + pytorch_version: ['1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0', '2.2.2', '2.3.1'] platform: ['windows-latest', 'ubuntu-latest', 'macos-latest'] diff --git a/.github/workflows/examples_pytest.yml b/.github/workflows/examples_pytest.yml index 8dda65bc9..0396f3f72 100644 --- a/.github/workflows/examples_pytest.yml +++ b/.github/workflows/examples_pytest.yml @@ -16,7 +16,7 @@ jobs: matrix: python_version: ['3.9', '3.10'] - pytorch_version: ['1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0'] + pytorch_version: ['1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0', '2.2.2', '2.3.1'] platform: ['windows-latest', 'ubuntu-latest', 'macos-latest'] jit_status: ['jit_disabled', 'jit_enabled'] diff --git a/.github/workflows/finn_integration.yml b/.github/workflows/finn_integration.yml index c676549f7..5167617c1 100644 --- a/.github/workflows/finn_integration.yml +++ b/.github/workflows/finn_integration.yml @@ -16,7 +16,7 @@ jobs: matrix: python_version: ['3.9', '3.10'] - pytorch_version: ['1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0'] + pytorch_version: ['1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0', '2.2.2', '2.3.1'] platform: ['windows-latest', 'ubuntu-latest'] diff --git a/.github/workflows/gen_github_actions.py b/.github/workflows/gen_github_actions.py index 726446bbf..a2138fd84 100644 --- a/.github/workflows/gen_github_actions.py +++ b/.github/workflows/gen_github_actions.py @@ -4,6 +4,16 @@ from utils import combine_od_list from utils import generate_exclusion_list +TORCHVISION_VERSION_DICT = { + '1.11.0': '0.12.0', + '1.12.1': '0.13.1', + '1.13.0': '0.14.0', + '2.0.1': '0.15.2', + '2.1.0': '0.16.0', + '2.2.2': '0.17.2', + '2.3.1': '0.18.1', + '2.4.0': '0.19.0'} + BASE_YML_TEMPLATE = 'base.yml.template' BASE_YML_REDUCED_TEMPLATE = 'base_reduced.yml.template' PYTEST_YML = 'pytest.yml' @@ -18,7 +28,7 @@ # Reduced Test for PRs, except when a review is requested PYTHON_VERSIONS_REDUCED = ('3.9',) -PYTORCH_LIST_REDUCED = ["1.11.0", "1.13.0", "2.1.0"] +PYTORCH_LIST_REDUCED = ["1.11.0", "2.0.1", "2.3.1"] PLATFORM_LIST_REDUCED = ['ubuntu-latest'] @@ -40,7 +50,7 @@ # Data shared betwen Nox sessions and Github Actions, formatted as tuples PYTHON_VERSIONS = ('3.9', '3.10') -PYTORCH_VERSIONS = ('1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0') +PYTORCH_VERSIONS = ('1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0', '2.2.2', '2.3.1') JIT_STATUSES = ('jit_disabled', 'jit_enabled') # Data used only by Github Actions, formatted as lists or lists of ordered dicts diff --git a/.github/workflows/notebook.yml b/.github/workflows/notebook.yml index ef1e8270f..da3a5fec0 100644 --- a/.github/workflows/notebook.yml +++ b/.github/workflows/notebook.yml @@ -16,7 +16,7 @@ jobs: matrix: python_version: ['3.9', '3.10'] - pytorch_version: ['1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0'] + pytorch_version: ['1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0', '2.2.2', '2.3.1'] platform: ['windows-latest', 'ubuntu-latest', 'macos-latest'] diff --git a/.github/workflows/ort_integration.yml b/.github/workflows/ort_integration.yml index 1abcb32de..1b55e5118 100644 --- a/.github/workflows/ort_integration.yml +++ b/.github/workflows/ort_integration.yml @@ -16,7 +16,7 @@ jobs: matrix: python_version: ['3.9', '3.10'] - pytorch_version: ['1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0'] + pytorch_version: ['1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0', '2.2.2', '2.3.1'] platform: ['windows-latest', 'ubuntu-latest', 'macos-latest'] diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 0be1cbc54..fda4a0af3 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -16,7 +16,7 @@ jobs: matrix: python_version: ['3.9', '3.10'] - pytorch_version: ['1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0'] + pytorch_version: ['1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0', '2.2.2', '2.3.1'] platform: ['windows-latest', 'ubuntu-latest', 'macos-latest'] jit_status: ['jit_disabled', 'jit_enabled'] diff --git a/.github/workflows/reduced_develop_install.yml b/.github/workflows/reduced_develop_install.yml index e9fa9ed6a..db83a062e 100644 --- a/.github/workflows/reduced_develop_install.yml +++ b/.github/workflows/reduced_develop_install.yml @@ -18,7 +18,7 @@ jobs: matrix: python_version: ['3.9'] - pytorch_version: ['1.11.0', '1.13.0', '2.1.0'] + pytorch_version: ['1.11.0', '2.0.1', '2.3.1'] platform: ['ubuntu-latest'] diff --git a/.github/workflows/reduced_end_to_end.yml b/.github/workflows/reduced_end_to_end.yml index d4dfd3f2e..db2948a1d 100644 --- a/.github/workflows/reduced_end_to_end.yml +++ b/.github/workflows/reduced_end_to_end.yml @@ -18,7 +18,7 @@ jobs: matrix: python_version: ['3.9'] - pytorch_version: ['1.11.0', '1.13.0', '2.1.0'] + pytorch_version: ['1.11.0', '2.0.1', '2.3.1'] platform: ['ubuntu-latest'] diff --git a/.github/workflows/reduced_examples_pytest.yml b/.github/workflows/reduced_examples_pytest.yml index ba8fd34ba..c6fc13bf7 100644 --- a/.github/workflows/reduced_examples_pytest.yml +++ b/.github/workflows/reduced_examples_pytest.yml @@ -18,7 +18,7 @@ jobs: matrix: python_version: ['3.9'] - pytorch_version: ['1.11.0', '1.13.0', '2.1.0'] + pytorch_version: ['1.11.0', '2.0.1', '2.3.1'] platform: ['ubuntu-latest'] jit_status: ['jit_disabled'] diff --git a/.github/workflows/reduced_finn_integration.yml b/.github/workflows/reduced_finn_integration.yml index d663df12b..460951f61 100644 --- a/.github/workflows/reduced_finn_integration.yml +++ b/.github/workflows/reduced_finn_integration.yml @@ -18,7 +18,7 @@ jobs: matrix: python_version: ['3.9'] - pytorch_version: ['1.11.0', '1.13.0', '2.1.0'] + pytorch_version: ['1.11.0', '2.0.1', '2.3.1'] platform: ['ubuntu-latest'] diff --git a/.github/workflows/reduced_notebook.yml b/.github/workflows/reduced_notebook.yml index 3936be1bd..2460c12c1 100644 --- a/.github/workflows/reduced_notebook.yml +++ b/.github/workflows/reduced_notebook.yml @@ -18,7 +18,7 @@ jobs: matrix: python_version: ['3.9'] - pytorch_version: ['1.11.0', '1.13.0', '2.1.0'] + pytorch_version: ['1.11.0', '2.0.1', '2.3.1'] platform: ['ubuntu-latest'] diff --git a/.github/workflows/reduced_ort_integration.yml b/.github/workflows/reduced_ort_integration.yml index 5db1ad679..771f3fe79 100644 --- a/.github/workflows/reduced_ort_integration.yml +++ b/.github/workflows/reduced_ort_integration.yml @@ -18,7 +18,7 @@ jobs: matrix: python_version: ['3.9'] - pytorch_version: ['1.11.0', '1.13.0', '2.1.0'] + pytorch_version: ['1.11.0', '2.0.1', '2.3.1'] platform: ['ubuntu-latest'] diff --git a/.github/workflows/reduced_pytest.yml b/.github/workflows/reduced_pytest.yml index b5e6c2051..1423a1ccc 100644 --- a/.github/workflows/reduced_pytest.yml +++ b/.github/workflows/reduced_pytest.yml @@ -18,7 +18,7 @@ jobs: matrix: python_version: ['3.9'] - pytorch_version: ['1.11.0', '1.13.0', '2.1.0'] + pytorch_version: ['1.11.0', '2.0.1', '2.3.1'] platform: ['ubuntu-latest'] jit_status: ['jit_disabled'] diff --git a/noxfile.py b/noxfile.py index 77f4f5eb2..a4b1b64f9 100644 --- a/noxfile.py +++ b/noxfile.py @@ -14,6 +14,7 @@ from gen_github_actions import JIT_STATUSES from gen_github_actions import PYTHON_VERSIONS from gen_github_actions import PYTORCH_VERSIONS +from gen_github_actions import TORCHVISION_VERSION_DICT IS_OSX = system() == 'Darwin' PYTORCH_STABLE_WHEEL_SRC = 'https://download.pytorch.org/whl/cpu' @@ -23,16 +24,6 @@ f'pytorch_{i}' for i in EXAMPLES_LLM_PYTEST_PYTORCH_VERSIONS]) JIT_IDS = tuple([f'{i}'.lower() for i in JIT_STATUSES]) -TORCHVISION_VERSION_DICT = { - '1.11.0': '0.12.0', - '1.12.1': '0.13.1', - '1.13.0': '0.14.0', - '2.0.1': '0.15.2', - '2.1.0': '0.16.0', - '2.2.2': '0.17.2', - '2.3.1': '0.18.1', - '2.4.0': '0.19.0'} - PARSED_TORCHVISION_VERSION_DICT = {version.parse(k): v for k, v in TORCHVISION_VERSION_DICT.items()}