Setup: bump torch version

Xilinx · Nov 21, 2024 · 1f14e4c · 1f14e4c
1 parent efb6b65
commit 1f14e4c
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 108 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)