From 2b0de914ec57674056a2a6eb3390b6816075c82f Mon Sep 17 00:00:00 2001
From: Alex Tong <alexandertongdev@gmail.com>
Date: Mon, 21 Aug 2023 21:45:22 -0400
Subject: [PATCH] Add torch version testing

Fix typo

Fix typo

Fix typo

Fix typo

Add update version in torchdyn.__version__

Ignore incompatible versions

Ignore incompatible versions

Fix versioning

temp remove fail fast, remove torch vision

Exclude torch=1.13 python=3.11

Exclude 1.8.1 as hangs tests

Test all pytorch versions

skip complex test for pytorch < 1.11.0

Skip incompatible pytorch versions

remove swp

OS coverage update

OS coverage update 2

Cleanup PR

Bump required torch version to 1.8.1

Bump allowable torch version requirement
---
 .github/workflows/os-coverage.yml | 33 ++++++++++++++++++++++++++++---
 pyproject.toml                    |  2 +-
 setup.py                          |  2 +-
 test/models/test_ode.py           |  5 ++++-
 torchdyn/__init__.py              |  3 +--
 5 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/os-coverage.yml b/.github/workflows/os-coverage.yml
index d103b32c..84ecdce6 100644
--- a/.github/workflows/os-coverage.yml
+++ b/.github/workflows/os-coverage.yml
@@ -9,7 +9,30 @@ jobs:
       max-parallel: 15
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        torch-version: ["1.8.1", "1.9.1", "1.10.0", "1.11.0", "1.12.0", "1.13.1", "2.0.0"]
+        exclude:
+          # python >= 3.10 does not support pytorch < 1.11.0
+          - torch-version: "1.8.1"
+            python-version: "3.10"
+          - torch-version: "1.9.1"
+            python-version: "3.10"
+          - torch-version: "1.10.0"
+            python-version: "3.10"
+          # python >= 3.11 does not support pytorch < 1.13.0
+          - torch-version: "1.8.1"
+            python-version: "3.11"
+          - torch-version: "1.9.1"
+            python-version: "3.11"
+          - torch-version: "1.10.0"
+            python-version: "3.11"
+          - torch-version: "1.11.0"
+            python-version: "3.11"
+          - torch-version: "1.12.0"
+            python-version: "3.11"
+          - torch-version: "1.13.1"
+            python-version: "3.11"
+
     defaults:
       run:
         shell: bash
@@ -33,14 +56,18 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ~/.cache
-        key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
+        key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.torch-version }}-${{ hashFiles('**/poetry.lock') }}
     
     - name: Install dependencies # hack for 🐛: don't let poetry try installing Torch https://github.com/pytorch/pytorch/issues/88049
       run: |
         pip install pytest pytest-cov papermill poethepoet>=0.10.0
-        pip install torch>=1.8.1 torchvision pytorch-lightning scikit-learn torchsde torchcde>=0.2.3 scipy matplotlib ipykernel ipywidgets 
+        pip install torch==${{ matrix.torch-version }} pytorch-lightning scikit-learn torchsde torchcde>=0.2.3 scipy matplotlib ipykernel ipywidgets 
         poetry install --only-root
         poetry run pip install setuptools
+
+    - name: List dependencies
+      run: | 
+        pip list
     
     - name: Run pytest checks
       run: |
diff --git a/pyproject.toml b/pyproject.toml
index 54a6ba38..cb3b673e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,7 +10,7 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-torch = "^1.8.1"
+torch = ">=1.8.1"
 torchsde="*"
 torchcde="^0.2.3"
 scikit-learn = "*"
diff --git a/setup.py b/setup.py
index 3c218069..0cf51e73 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@
     description="PyTorch package for all things neural differential equations.",
     url="https://github.com/DiffEqML/torchdyn",
     install_requires=[
-        "torch>=1.6.0",
+        "torch>=1.8.1",
         "pytorch-lightning>=0.8.4",
         "matplotlib",
         "scikit-learn",
diff --git a/test/models/test_ode.py b/test/models/test_ode.py
index e7f1c6b0..b5eaa4e5 100644
--- a/test/models/test_ode.py
+++ b/test/models/test_ode.py
@@ -10,6 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from packaging.version import parse
 import pytest
 import torch
 import torch.nn as nn
@@ -261,6 +262,8 @@ def forward(self, t, x, u, v, z, args={}):
     grad(sol2.sum(), x0)
 
 
+@pytest.mark.skipif(parse(torch.__version__) < parse("1.11.0"),
+        reason="adjoint support added in torch 1.11.0")
 def test_complex_ode():
     """Test odeint for complex numbers with a simple complex-valued ODE, corresponding
     to Rabi oscillations of quantum two-level system."""
@@ -312,4 +315,4 @@ def test_odeint(solver):
     t_span = torch.linspace(0., 2., 10)
     sys = Lorenz()
 
-    odeint(sys, x0, t_span, solver=solver)
\ No newline at end of file
+    odeint(sys, x0, t_span, solver=solver)
diff --git a/torchdyn/__init__.py b/torchdyn/__init__.py
index 5e4d254c..3e1c2e33 100644
--- a/torchdyn/__init__.py
+++ b/torchdyn/__init__.py
@@ -10,11 +10,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = '1.0'
+__version__ = '1.0.5'
 __author__  = 'Michael Poli, Stefano Massaroli et al.'
 
 from torch import Tensor
 from typing import Tuple
 
 TTuple = Tuple[Tensor, Tensor]
-