From efb6b65dab1d4ff83ec993b4adb173bf110a3155 Mon Sep 17 00:00:00 2001 From: Giuseppe Franco Date: Thu, 21 Nov 2024 12:59:05 +0000 Subject: [PATCH 1/5] Setup: bump python version --- .github/workflows/develop_install.yml | 2 +- .github/workflows/end_to_end.yml | 2 +- .github/workflows/examples_llm_pytest.yml | 2 +- .github/workflows/examples_pytest.yml | 2 +- .github/workflows/finn_integration.yml | 2 +- .github/workflows/gen_github_actions.py | 4 ++-- .github/workflows/notebook.yml | 2 +- .github/workflows/ort_integration.yml | 2 +- .github/workflows/pytest.yml | 2 +- .github/workflows/reduced_develop_install.yml | 2 +- .github/workflows/reduced_end_to_end.yml | 2 +- .github/workflows/reduced_examples_llm_pytest.yml | 2 +- .github/workflows/reduced_examples_pytest.yml | 2 +- .github/workflows/reduced_finn_integration.yml | 2 +- .github/workflows/reduced_notebook.yml | 2 +- .github/workflows/reduced_ort_integration.yml | 2 +- .github/workflows/reduced_pytest.yml | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/develop_install.yml b/.github/workflows/develop_install.yml index bdc0df76b..4f9da7545 100644 --- a/.github/workflows/develop_install.yml +++ b/.github/workflows/develop_install.yml @@ -15,7 +15,7 @@ jobs: matrix: - python_version: ['3.8', '3.9'] + python_version: ['3.9', '3.10'] pytorch_version: ['1.9.1', '1.10.1', '1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0'] platform: ['windows-latest', 'ubuntu-latest', 'macos-latest'] diff --git a/.github/workflows/end_to_end.yml b/.github/workflows/end_to_end.yml index a83ba8899..276010e58 100644 --- a/.github/workflows/end_to_end.yml +++ b/.github/workflows/end_to_end.yml @@ -15,7 +15,7 @@ jobs: matrix: - python_version: ['3.8', '3.9'] + python_version: ['3.9', '3.10'] pytorch_version: ['1.9.1', '1.10.1', '1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0'] platform: ['windows-latest', 'ubuntu-latest', 'macos-latest'] diff --git a/.github/workflows/examples_llm_pytest.yml b/.github/workflows/examples_llm_pytest.yml index 065a06738..73bc44bde 100644 --- a/.github/workflows/examples_llm_pytest.yml +++ b/.github/workflows/examples_llm_pytest.yml @@ -15,7 +15,7 @@ jobs: matrix: - python_version: ['3.8', '3.9'] + python_version: ['3.9', '3.10'] pytorch_version: ['2.2.2', '2.3.1', '2.4.0'] platform: ['windows-latest', 'ubuntu-latest', 'macos-latest'] jit_status: ['jit_disabled', 'jit_enabled'] diff --git a/.github/workflows/examples_pytest.yml b/.github/workflows/examples_pytest.yml index 262625e01..4bd7153d7 100644 --- a/.github/workflows/examples_pytest.yml +++ b/.github/workflows/examples_pytest.yml @@ -15,7 +15,7 @@ jobs: matrix: - python_version: ['3.8', '3.9'] + python_version: ['3.9', '3.10'] pytorch_version: ['1.9.1', '1.10.1', '1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0'] 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 f62876a45..44d07e27e 100644 --- a/.github/workflows/finn_integration.yml +++ b/.github/workflows/finn_integration.yml @@ -15,7 +15,7 @@ jobs: matrix: - python_version: ['3.8', '3.9'] + python_version: ['3.9', '3.10'] pytorch_version: ['1.9.1', '1.10.1', '1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0'] platform: ['windows-latest', 'ubuntu-latest'] diff --git a/.github/workflows/gen_github_actions.py b/.github/workflows/gen_github_actions.py index 2c4908a6c..b252039d2 100644 --- a/.github/workflows/gen_github_actions.py +++ b/.github/workflows/gen_github_actions.py @@ -16,7 +16,7 @@ ENDTOEND_YML = 'end_to_end.yml' # Reduced Test for PRs, except when a review is requested -PYTHON_VERSIONS_REDUCED = ('3.8',) +PYTHON_VERSIONS_REDUCED = ('3.9',) PYTORCH_LIST_REDUCED = ["1.9.1", "1.13.0", "2.1.0"] @@ -38,7 +38,7 @@ 'jit_disabled',])]) # Data shared betwen Nox sessions and Github Actions, formatted as tuples -PYTHON_VERSIONS = ('3.8', '3.9') +PYTHON_VERSIONS = ('3.9', '3.10') PYTORCH_VERSIONS = ('1.9.1', '1.10.1', '1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0') JIT_STATUSES = ('jit_disabled', 'jit_enabled') diff --git a/.github/workflows/notebook.yml b/.github/workflows/notebook.yml index 4e8c06e78..c4be23375 100644 --- a/.github/workflows/notebook.yml +++ b/.github/workflows/notebook.yml @@ -15,7 +15,7 @@ jobs: matrix: - python_version: ['3.8', '3.9'] + python_version: ['3.9', '3.10'] pytorch_version: ['1.9.1', '1.10.1', '1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0'] platform: ['windows-latest', 'ubuntu-latest', 'macos-latest'] diff --git a/.github/workflows/ort_integration.yml b/.github/workflows/ort_integration.yml index 02c75fcf2..0a115b23f 100644 --- a/.github/workflows/ort_integration.yml +++ b/.github/workflows/ort_integration.yml @@ -15,7 +15,7 @@ jobs: matrix: - python_version: ['3.8', '3.9'] + python_version: ['3.9', '3.10'] pytorch_version: ['1.9.1', '1.10.1', '1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0'] platform: ['windows-latest', 'ubuntu-latest', 'macos-latest'] diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 4505d8df0..b6120a46e 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -15,7 +15,7 @@ jobs: matrix: - python_version: ['3.8', '3.9'] + python_version: ['3.9', '3.10'] pytorch_version: ['1.9.1', '1.10.1', '1.11.0', '1.12.1', '1.13.0', '2.0.1', '2.1.0'] 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 b5ead15ee..6e38249ff 100644 --- a/.github/workflows/reduced_develop_install.yml +++ b/.github/workflows/reduced_develop_install.yml @@ -17,7 +17,7 @@ jobs: matrix: - python_version: ['3.8'] + python_version: ['3.9'] pytorch_version: ['1.9.1', '1.13.0', '2.1.0'] platform: ['ubuntu-latest'] diff --git a/.github/workflows/reduced_end_to_end.yml b/.github/workflows/reduced_end_to_end.yml index c52fb0ceb..b2aa87063 100644 --- a/.github/workflows/reduced_end_to_end.yml +++ b/.github/workflows/reduced_end_to_end.yml @@ -17,7 +17,7 @@ jobs: matrix: - python_version: ['3.8'] + python_version: ['3.9'] pytorch_version: ['1.9.1', '1.13.0', '2.1.0'] platform: ['ubuntu-latest'] diff --git a/.github/workflows/reduced_examples_llm_pytest.yml b/.github/workflows/reduced_examples_llm_pytest.yml index 44b0de612..d777b0102 100644 --- a/.github/workflows/reduced_examples_llm_pytest.yml +++ b/.github/workflows/reduced_examples_llm_pytest.yml @@ -17,7 +17,7 @@ jobs: matrix: - python_version: ['3.8'] + python_version: ['3.9'] pytorch_version: ['2.4.0'] platform: ['ubuntu-latest'] jit_status: ['jit_disabled'] diff --git a/.github/workflows/reduced_examples_pytest.yml b/.github/workflows/reduced_examples_pytest.yml index b4d42540c..14008dc68 100644 --- a/.github/workflows/reduced_examples_pytest.yml +++ b/.github/workflows/reduced_examples_pytest.yml @@ -17,7 +17,7 @@ jobs: matrix: - python_version: ['3.8'] + python_version: ['3.9'] pytorch_version: ['1.9.1', '1.13.0', '2.1.0'] platform: ['ubuntu-latest'] jit_status: ['jit_disabled'] diff --git a/.github/workflows/reduced_finn_integration.yml b/.github/workflows/reduced_finn_integration.yml index 342a01c34..b53bfb107 100644 --- a/.github/workflows/reduced_finn_integration.yml +++ b/.github/workflows/reduced_finn_integration.yml @@ -17,7 +17,7 @@ jobs: matrix: - python_version: ['3.8'] + python_version: ['3.9'] pytorch_version: ['1.9.1', '1.13.0', '2.1.0'] platform: ['ubuntu-latest'] diff --git a/.github/workflows/reduced_notebook.yml b/.github/workflows/reduced_notebook.yml index 5d2dc1b6f..f0a81fc4a 100644 --- a/.github/workflows/reduced_notebook.yml +++ b/.github/workflows/reduced_notebook.yml @@ -17,7 +17,7 @@ jobs: matrix: - python_version: ['3.8'] + python_version: ['3.9'] pytorch_version: ['1.9.1', '1.13.0', '2.1.0'] platform: ['ubuntu-latest'] diff --git a/.github/workflows/reduced_ort_integration.yml b/.github/workflows/reduced_ort_integration.yml index 9fcb678d2..5bae53b38 100644 --- a/.github/workflows/reduced_ort_integration.yml +++ b/.github/workflows/reduced_ort_integration.yml @@ -17,7 +17,7 @@ jobs: matrix: - python_version: ['3.8'] + python_version: ['3.9'] pytorch_version: ['1.9.1', '1.13.0', '2.1.0'] platform: ['ubuntu-latest'] diff --git a/.github/workflows/reduced_pytest.yml b/.github/workflows/reduced_pytest.yml index f3d0763e3..821654c52 100644 --- a/.github/workflows/reduced_pytest.yml +++ b/.github/workflows/reduced_pytest.yml @@ -17,7 +17,7 @@ jobs: matrix: - python_version: ['3.8'] + python_version: ['3.9'] pytorch_version: ['1.9.1', '1.13.0', '2.1.0'] platform: ['ubuntu-latest'] jit_status: ['jit_disabled'] From 1f14e4c21cf5bfdd2ed1fa762b00ae1e88a735f0 Mon Sep 17 00:00:00 2001 From: Giuseppe Franco Date: Thu, 21 Nov 2024 13:29:24 +0000 Subject: [PATCH 2/5] Setup: bump torch version --- .github/workflows/develop_install.yml | 6 +---- .github/workflows/end_to_end.yml | 5 +--- .github/workflows/examples_llm_pytest.yml | 7 ----- .github/workflows/examples_pytest.yml | 9 +------ .github/workflows/finn_integration.yml | 6 +---- .github/workflows/gen_github_actions.py | 12 +++------ .github/workflows/notebook.yml | 5 +--- .github/workflows/ort_integration.yml | 6 +---- .github/workflows/pytest.yml | 9 +------ .github/workflows/reduced_develop_install.yml | 6 +---- .github/workflows/reduced_end_to_end.yml | 5 +--- .../workflows/reduced_examples_llm_pytest.yml | 4 --- .github/workflows/reduced_examples_pytest.yml | 6 +---- .../workflows/reduced_finn_integration.yml | 6 +---- .github/workflows/reduced_notebook.yml | 5 +--- .github/workflows/reduced_ort_integration.yml | 6 +---- .github/workflows/reduced_pytest.yml | 6 +---- noxfile.py | 27 +++++++------------ 18 files changed, 28 insertions(+), 108 deletions(-) diff --git a/.github/workflows/develop_install.yml b/.github/workflows/develop_install.yml index 4f9da7545..a640d3b74 100644 --- a/.github/workflows/develop_install.yml +++ b/.github/workflows/develop_install.yml @@ -16,14 +16,10 @@ jobs: matrix: python_version: ['3.9', '3.10'] - pytorch_version: ['1.9.1', '1.10.1', '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'] platform: ['windows-latest', 'ubuntu-latest', 'macos-latest'] - exclude: - - pytorch_version: '1.9.1' - platform: 'macos-latest' - if: ${{ !github.event.pull_request.draft }} diff --git a/.github/workflows/end_to_end.yml b/.github/workflows/end_to_end.yml index 276010e58..666d036de 100644 --- a/.github/workflows/end_to_end.yml +++ b/.github/workflows/end_to_end.yml @@ -16,14 +16,11 @@ jobs: matrix: python_version: ['3.9', '3.10'] - pytorch_version: ['1.9.1', '1.10.1', '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'] platform: ['windows-latest', 'ubuntu-latest', 'macos-latest'] exclude: - - pytorch_version: '1.9.1' - platform: 'macos-latest' - - platform: 'windows-latest' diff --git a/.github/workflows/examples_llm_pytest.yml b/.github/workflows/examples_llm_pytest.yml index 73bc44bde..f0bd1c9eb 100644 --- a/.github/workflows/examples_llm_pytest.yml +++ b/.github/workflows/examples_llm_pytest.yml @@ -21,13 +21,6 @@ jobs: jit_status: ['jit_disabled', 'jit_enabled'] - exclude: - - pytorch_version: '1.9.1' - platform: 'macos-latest' - - - pytorch_version: '1.9.1' - jit_status: 'jit_enabled' - if: ${{ !github.event.pull_request.draft }} diff --git a/.github/workflows/examples_pytest.yml b/.github/workflows/examples_pytest.yml index 4bd7153d7..8dda65bc9 100644 --- a/.github/workflows/examples_pytest.yml +++ b/.github/workflows/examples_pytest.yml @@ -16,18 +16,11 @@ jobs: matrix: python_version: ['3.9', '3.10'] - pytorch_version: ['1.9.1', '1.10.1', '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'] platform: ['windows-latest', 'ubuntu-latest', 'macos-latest'] jit_status: ['jit_disabled', 'jit_enabled'] - exclude: - - pytorch_version: '1.9.1' - platform: 'macos-latest' - - - pytorch_version: '1.9.1' - jit_status: 'jit_enabled' - if: ${{ !github.event.pull_request.draft }} diff --git a/.github/workflows/finn_integration.yml b/.github/workflows/finn_integration.yml index 44d07e27e..c676549f7 100644 --- a/.github/workflows/finn_integration.yml +++ b/.github/workflows/finn_integration.yml @@ -16,14 +16,10 @@ jobs: matrix: python_version: ['3.9', '3.10'] - pytorch_version: ['1.9.1', '1.10.1', '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'] platform: ['windows-latest', 'ubuntu-latest'] - exclude: - - pytorch_version: '1.9.1' - platform: 'macos-latest' - if: ${{ !github.event.pull_request.draft }} diff --git a/.github/workflows/gen_github_actions.py b/.github/workflows/gen_github_actions.py index b252039d2..726446bbf 100644 --- a/.github/workflows/gen_github_actions.py +++ b/.github/workflows/gen_github_actions.py @@ -18,7 +18,7 @@ # Reduced Test for PRs, except when a review is requested PYTHON_VERSIONS_REDUCED = ('3.9',) -PYTORCH_LIST_REDUCED = ["1.9.1", "1.13.0", "2.1.0"] +PYTORCH_LIST_REDUCED = ["1.11.0", "1.13.0", "2.1.0"] PLATFORM_LIST_REDUCED = ['ubuntu-latest'] @@ -40,7 +40,7 @@ # Data shared betwen Nox sessions and Github Actions, formatted as tuples PYTHON_VERSIONS = ('3.9', '3.10') -PYTORCH_VERSIONS = ('1.9.1', '1.10.1', '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') JIT_STATUSES = ('jit_disabled', 'jit_enabled') # Data used only by Github Actions, formatted as lists or lists of ordered dicts @@ -49,13 +49,9 @@ STRATEGY = od([('fail-fast', 'false')]) -EXCLUDE_LIST = generate_exclusion_list([[ - ['pytorch_version', ['1.9.1']], - ['platform', ['macos-latest']],]]) +EXCLUDE_LIST = [] -JIT_EXCLUDE_LIST = generate_exclusion_list([[['pytorch_version', ['1.9.1']], - ['jit_status', [ - 'jit_enabled',]]]]) +JIT_EXCLUDE_LIST = [] NOTEBOOK_EXCLUDE_LIST = generate_exclusion_list([[['platform', [ 'macos-latest',]]]]) diff --git a/.github/workflows/notebook.yml b/.github/workflows/notebook.yml index c4be23375..ef1e8270f 100644 --- a/.github/workflows/notebook.yml +++ b/.github/workflows/notebook.yml @@ -16,14 +16,11 @@ jobs: matrix: python_version: ['3.9', '3.10'] - pytorch_version: ['1.9.1', '1.10.1', '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'] platform: ['windows-latest', 'ubuntu-latest', 'macos-latest'] exclude: - - pytorch_version: '1.9.1' - platform: 'macos-latest' - - platform: 'macos-latest' diff --git a/.github/workflows/ort_integration.yml b/.github/workflows/ort_integration.yml index 0a115b23f..1abcb32de 100644 --- a/.github/workflows/ort_integration.yml +++ b/.github/workflows/ort_integration.yml @@ -16,14 +16,10 @@ jobs: matrix: python_version: ['3.9', '3.10'] - pytorch_version: ['1.9.1', '1.10.1', '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'] platform: ['windows-latest', 'ubuntu-latest', 'macos-latest'] - exclude: - - pytorch_version: '1.9.1' - platform: 'macos-latest' - if: ${{ !github.event.pull_request.draft }} diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index b6120a46e..0be1cbc54 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -16,18 +16,11 @@ jobs: matrix: python_version: ['3.9', '3.10'] - pytorch_version: ['1.9.1', '1.10.1', '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'] platform: ['windows-latest', 'ubuntu-latest', 'macos-latest'] jit_status: ['jit_disabled', 'jit_enabled'] - exclude: - - pytorch_version: '1.9.1' - platform: 'macos-latest' - - - pytorch_version: '1.9.1' - jit_status: 'jit_enabled' - if: ${{ !github.event.pull_request.draft }} diff --git a/.github/workflows/reduced_develop_install.yml b/.github/workflows/reduced_develop_install.yml index 6e38249ff..e9fa9ed6a 100644 --- a/.github/workflows/reduced_develop_install.yml +++ b/.github/workflows/reduced_develop_install.yml @@ -18,14 +18,10 @@ jobs: matrix: python_version: ['3.9'] - pytorch_version: ['1.9.1', '1.13.0', '2.1.0'] + pytorch_version: ['1.11.0', '1.13.0', '2.1.0'] platform: ['ubuntu-latest'] - exclude: - - pytorch_version: '1.9.1' - platform: 'macos-latest' - if: ${{ !github.event.pull_request.draft }} diff --git a/.github/workflows/reduced_end_to_end.yml b/.github/workflows/reduced_end_to_end.yml index b2aa87063..d4dfd3f2e 100644 --- a/.github/workflows/reduced_end_to_end.yml +++ b/.github/workflows/reduced_end_to_end.yml @@ -18,14 +18,11 @@ jobs: matrix: python_version: ['3.9'] - pytorch_version: ['1.9.1', '1.13.0', '2.1.0'] + pytorch_version: ['1.11.0', '1.13.0', '2.1.0'] platform: ['ubuntu-latest'] exclude: - - pytorch_version: '1.9.1' - platform: 'macos-latest' - - platform: 'windows-latest' diff --git a/.github/workflows/reduced_examples_llm_pytest.yml b/.github/workflows/reduced_examples_llm_pytest.yml index d777b0102..dfb9296fd 100644 --- a/.github/workflows/reduced_examples_llm_pytest.yml +++ b/.github/workflows/reduced_examples_llm_pytest.yml @@ -23,10 +23,6 @@ jobs: jit_status: ['jit_disabled'] - exclude: - - pytorch_version: '1.9.1' - platform: 'macos-latest' - if: ${{ !github.event.pull_request.draft }} diff --git a/.github/workflows/reduced_examples_pytest.yml b/.github/workflows/reduced_examples_pytest.yml index 14008dc68..ba8fd34ba 100644 --- a/.github/workflows/reduced_examples_pytest.yml +++ b/.github/workflows/reduced_examples_pytest.yml @@ -18,15 +18,11 @@ jobs: matrix: python_version: ['3.9'] - pytorch_version: ['1.9.1', '1.13.0', '2.1.0'] + pytorch_version: ['1.11.0', '1.13.0', '2.1.0'] platform: ['ubuntu-latest'] jit_status: ['jit_disabled'] - exclude: - - pytorch_version: '1.9.1' - platform: 'macos-latest' - if: ${{ !github.event.pull_request.draft }} diff --git a/.github/workflows/reduced_finn_integration.yml b/.github/workflows/reduced_finn_integration.yml index b53bfb107..d663df12b 100644 --- a/.github/workflows/reduced_finn_integration.yml +++ b/.github/workflows/reduced_finn_integration.yml @@ -18,14 +18,10 @@ jobs: matrix: python_version: ['3.9'] - pytorch_version: ['1.9.1', '1.13.0', '2.1.0'] + pytorch_version: ['1.11.0', '1.13.0', '2.1.0'] platform: ['ubuntu-latest'] - exclude: - - pytorch_version: '1.9.1' - platform: 'macos-latest' - if: ${{ !github.event.pull_request.draft }} diff --git a/.github/workflows/reduced_notebook.yml b/.github/workflows/reduced_notebook.yml index f0a81fc4a..3936be1bd 100644 --- a/.github/workflows/reduced_notebook.yml +++ b/.github/workflows/reduced_notebook.yml @@ -18,14 +18,11 @@ jobs: matrix: python_version: ['3.9'] - pytorch_version: ['1.9.1', '1.13.0', '2.1.0'] + pytorch_version: ['1.11.0', '1.13.0', '2.1.0'] platform: ['ubuntu-latest'] exclude: - - pytorch_version: '1.9.1' - platform: 'macos-latest' - - platform: 'macos-latest' diff --git a/.github/workflows/reduced_ort_integration.yml b/.github/workflows/reduced_ort_integration.yml index 5bae53b38..5db1ad679 100644 --- a/.github/workflows/reduced_ort_integration.yml +++ b/.github/workflows/reduced_ort_integration.yml @@ -18,14 +18,10 @@ jobs: matrix: python_version: ['3.9'] - pytorch_version: ['1.9.1', '1.13.0', '2.1.0'] + pytorch_version: ['1.11.0', '1.13.0', '2.1.0'] platform: ['ubuntu-latest'] - exclude: - - pytorch_version: '1.9.1' - platform: 'macos-latest' - if: ${{ !github.event.pull_request.draft }} diff --git a/.github/workflows/reduced_pytest.yml b/.github/workflows/reduced_pytest.yml index 821654c52..b5e6c2051 100644 --- a/.github/workflows/reduced_pytest.yml +++ b/.github/workflows/reduced_pytest.yml @@ -18,15 +18,11 @@ jobs: matrix: python_version: ['3.9'] - pytorch_version: ['1.9.1', '1.13.0', '2.1.0'] + pytorch_version: ['1.11.0', '1.13.0', '2.1.0'] platform: ['ubuntu-latest'] jit_status: ['jit_disabled'] - exclude: - - pytorch_version: '1.9.1' - platform: 'macos-latest' - if: ${{ !github.event.pull_request.draft }} diff --git a/noxfile.py b/noxfile.py index f71510979..77f4f5eb2 100644 --- a/noxfile.py +++ b/noxfile.py @@ -22,11 +22,8 @@ EXAMPLES_LLM_PYTEST_PYTORCH_IDS = tuple([ f'pytorch_{i}' for i in EXAMPLES_LLM_PYTEST_PYTORCH_VERSIONS]) JIT_IDS = tuple([f'{i}'.lower() for i in JIT_STATUSES]) -LSTM_EXPORT_MIN_PYTORCH = '1.10.1' TORCHVISION_VERSION_DICT = { - '1.9.1': '0.10.1', - '1.10.1': '0.11.2', '1.11.0': '0.12.0', '1.12.1': '0.13.1', '1.13.0': '0.14.0', @@ -191,20 +188,16 @@ def tests_brevitas_notebook(session, pytorch): install_pytorch(pytorch, session) install_torchvision(pytorch, session) session.install('--upgrade', '-e', '.[test, ort_integration, notebook]') - if version.parse(pytorch) >= version.parse(LSTM_EXPORT_MIN_PYTORCH): - session.run( - 'pytest', '-n', 'logical', '-v', '--nbmake', '--nbmake-kernel=python3', 'notebooks') - else: - session.run( - 'pytest', - '-n', - 'logical', - '-v', - '--nbmake', - '--nbmake-kernel=python3', - 'notebooks', - '--ignore', - 'notebooks/quantized_recurrent.ipynb') + session.run( + 'pytest', + '-n', + 'logical', + '-v', + '--nbmake', + '--nbmake-kernel=python3', + 'notebooks', + '--ignore', + 'notebooks/quantized_recurrent.ipynb') @nox.session(python=PYTHON_VERSIONS) From 9f736cb8809e7a581cf9979c7ae5e193f5d4b972 Mon Sep 17 00:00:00 2001 From: Giuseppe Franco Date: Thu, 21 Nov 2024 15:03:30 +0000 Subject: [PATCH 3/5] new torch version --- .github/workflows/develop_install.yml | 2 +- .github/workflows/end_to_end.yml | 2 +- .github/workflows/examples_pytest.yml | 2 +- .github/workflows/finn_integration.yml | 2 +- .github/workflows/gen_github_actions.py | 14 ++++++++++++-- .github/workflows/notebook.yml | 2 +- .github/workflows/ort_integration.yml | 2 +- .github/workflows/pytest.yml | 2 +- .github/workflows/reduced_develop_install.yml | 2 +- .github/workflows/reduced_end_to_end.yml | 2 +- .github/workflows/reduced_examples_pytest.yml | 2 +- .github/workflows/reduced_finn_integration.yml | 2 +- .github/workflows/reduced_notebook.yml | 2 +- .github/workflows/reduced_ort_integration.yml | 2 +- .github/workflows/reduced_pytest.yml | 2 +- noxfile.py | 11 +---------- 16 files changed, 27 insertions(+), 26 deletions(-) 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()} From 81b6f4738235a29713aa01419fccc45ce8307907 Mon Sep 17 00:00:00 2001 From: Giuseppe Franco Date: Sat, 23 Nov 2024 20:48:39 +0000 Subject: [PATCH 4/5] Bump value tracer compatibility --- src/brevitas/fx/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/brevitas/fx/__init__.py b/src/brevitas/fx/__init__.py index 50e66a159..325f2dea4 100644 --- a/src/brevitas/fx/__init__.py +++ b/src/brevitas/fx/__init__.py @@ -7,7 +7,7 @@ from brevitas import torch_version # This needs to be bumped until https://github.com/pytorch/pytorch/pull/94461 gets merged -if torch_version < version.parse('2.2'): +if torch_version < version.parse('2.5'): import brevitas.backport.fx as fx from brevitas.backport.fx._compatibility import compatibility from brevitas.backport.fx._symbolic_trace import _assert_is_none From 55e366656d69dd3b1e4a5b2fe81099051ce34e75 Mon Sep 17 00:00:00 2001 From: Giuseppe Franco Date: Mon, 25 Nov 2024 14:53:23 +0000 Subject: [PATCH 5/5] Skip compile tests --- tests/brevitas_end_to_end/test_torchvision_models.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/brevitas_end_to_end/test_torchvision_models.py b/tests/brevitas_end_to_end/test_torchvision_models.py index 09f0b9253..7ff7a14f9 100644 --- a/tests/brevitas_end_to_end/test_torchvision_models.py +++ b/tests/brevitas_end_to_end/test_torchvision_models.py @@ -132,6 +132,8 @@ def test_torchvision_compile(torchvision_model_compile): torch._dynamo.config.capture_scalar_outputs = True if torchvision_model_compile is None: pytest.skip('Model not instantiated') + if version.parse('2.2.0') <= torch_version <= version.parse('2.3.1'): + pytest.skip('torch.compile not compatible with torch versions between 2.2 and 2.3.1') inp = torch.randn(BATCH, IN_CH, HEIGHT, WIDTH)