Merge pull request #36 from hmorimitsu/new_models2

New models2

Author: hmorimitsu

.github/workflows/flake8.yml

@@ -16,12 +16,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6]
+        python-version: ['3.10']
 
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

.github/workflows/publish_pypi.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: '3.x'
     - name: Install dependencies

.github/workflows/pytest.yml

@@ -18,19 +18,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6]
+        python-version: ['3.8']
 
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           python -m pip install build==0.4.0
-          python -m pip install --upgrade setuptools wheel
+          python -m pip install --upgrade setuptools==59.5.0 wheel
           python -m pip install --upgrade pytest
       - name: Install package and remove local dir
         run: |

.github/workflows/pytest_pip.yml

@@ -0,0 +1,41 @@
+# This workflow will install Python dependencies, run tests with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: python
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ['3.8', '3.9', '3.10']
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Add conda to system path
+        run: |
+          # $CONDA is an environment variable pointing to the root of the miniconda directory
+          echo $CONDA/bin >> $GITHUB_PATH
+      - name: Replace python
+        uses: jacobtomlinson/gha-find-replace@v2
+        with:
+          find: "python>=3.8,<=3.10"
+          replace: "python==${{ matrix.python-version }}"
+          regex: false
+          include: "environment.yml"
+      - name: Install dependencies
+        run: |
+          conda env update --file environment.yml --name base
+          python -m pip install --upgrade pip setuptools==59.5.0 wheel
+          python -m pip install --upgrade pytest
+      - name: Test with pytest
+        run: |
+          python -m pytest

.github/workflows/python.yml

@@ -0,0 +1,41 @@
+# This workflow will install Python dependencies, run tests with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: pytorch-lightning
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        pytorch-lightning: [1.1.8, 1.2.10, 1.5.10, 1.6.5]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Add conda to system path
+        run: |
+          # $CONDA is an environment variable pointing to the root of the miniconda directory
+          echo $CONDA/bin >> $GITHUB_PATH
+      - name: Replace pytorch-lightning
+        uses: jacobtomlinson/gha-find-replace@v2
+        with:
+          find: "pytorch-lightning>=1.1.0,<=1.6"
+          replace: "pytorch-lightning==${{ matrix.pytorch-lightning }}"
+          regex: false
+          include: "environment.yml"
+      - name: Install dependencies
+        run: |
+          conda env update --file environment.yml --name base
+          python -m pip install --upgrade pip setuptools==59.5.0 wheel
+          python -m pip install --upgrade pytest
+      - name: Test with pytest
+        run: |
+          python -m pytest

.github/workflows/pytorch-lightning.yml

@@ -0,0 +1,41 @@
+# This workflow will install Python dependencies, run tests with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: pytorch
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        pytorch: [1.8.1, 1.9.1, 1.10.1, 1.11.0, 1.12.0]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Add conda to system path
+        run: |
+          # $CONDA is an environment variable pointing to the root of the miniconda directory
+          echo $CONDA/bin >> $GITHUB_PATH
+      - name: Replace pytorch
+        uses: jacobtomlinson/gha-find-replace@v2
+        with:
+          find: "pytorch>=1.8.1,<=1.12"
+          replace: "pytorch==${{ matrix.pytorch }}"
+          regex: false
+          include: "environment.yml"
+      - name: Install dependencies
+        run: |
+          conda env update --file environment.yml --name base
+          python -m pip install --upgrade pip setuptools==59.5.0 wheel
+          python -m pip install --upgrade pytest
+      - name: Test with pytest
+        run: |
+          python -m pytest

.github/workflows/pytorch.yml

@@ -1,7 +1,9 @@
 # PyTorch Lightning Optical Flow
 
 ![GitHub CI flake8 status](https://github.com/hmorimitsu/ptlflow/actions/workflows/flake8.yml/badge.svg)
-![GitHub CI pytest status](https://github.com/hmorimitsu/ptlflow/actions/workflows/pytest.yml/badge.svg)
+![GitHub CI python status](https://github.com/hmorimitsu/ptlflow/actions/workflows/python.yml/badge.svg)
+![GitHub CI pytorch status](https://github.com/hmorimitsu/ptlflow/actions/workflows/pytorch.yml/badge.svg)
+![GitHub CI pytorch-lightning status](https://github.com/hmorimitsu/ptlflow/actions/workflows/pytorch-lightning.yml/badge.svg)
 ![GitHub CI pytest pip status](https://github.com/hmorimitsu/ptlflow/actions/workflows/pytest_pip.yml/badge.svg)
 [![DOI](https://zenodo.org/badge/375416785.svg)](https://zenodo.org/badge/latestdoi/375416785)
 
@@ -13,6 +15,7 @@ The work and code from many others are present here. I tried to make sure everyt
 
 This is still under development, so some things may not work as intended. I plan to add more models in the future, as well keep improving the platform.
 
+- [What's new](#whats-new)
 - [Available models](#available-models)
 - [Results](#results)
 - [Getting started](#getting-started)
@@ -21,13 +24,31 @@ This is still under development, so some things may not work as intended. I plan
 - [Citing](#citing)
 - [Acknowledgements](#acknowledgements)
 
+## What's new
+
+### July 30, 2022 - v0.2.6
+
+- Added new models:
+  - CRAFT [https://arxiv.org/abs/2203.16896](https://arxiv.org/abs/2203.16896)
+  - CSFlow [https://arxiv.org/abs/2202.00909](https://arxiv.org/abs/2202.00909)
+  - FlowFormer [https://arxiv.org/abs/2203.16194](https://arxiv.org/abs/2203.16194)
+  - GMFlow [https://arxiv.org/abs/2111.13680](https://arxiv.org/abs/2111.13680)
+  - GMFlowNet [https://arxiv.org/abs/2203.11335](https://arxiv.org/abs/2203.11335)
+- Added support for AutoFlow dataset [https://arxiv.org/abs/2104.14544](https://arxiv.org/abs/2104.14544)
+- Fix Compatibility with Pytorch Lightning 1.6
+
 ## Available models
 
+- CRAFT [https://arxiv.org/abs/2203.16896](https://arxiv.org/abs/2203.16896)
+- CSFlow [https://arxiv.org/abs/2202.00909](https://arxiv.org/abs/2202.00909)
 - DICL-Flow [https://arxiv.org/abs/2010.14851](https://arxiv.org/abs/2010.14851)
 - FastFlowNet [https://arxiv.org/abs/2103.04524](https://arxiv.org/abs/2103.04524)
+- FlowFormer [https://arxiv.org/abs/2203.16194](https://arxiv.org/abs/2203.16194)
 - FlowNet - [https://arxiv.org/abs/1504.06852](https://arxiv.org/abs/1504.06852)
 - FlowNet2 - [https://arxiv.org/abs/1612.01925](https://arxiv.org/abs/1612.01925)
 - GMA - [https://arxiv.org/abs/2104.02409](https://arxiv.org/abs/2104.02409)
+- GMFlow [https://arxiv.org/abs/2111.13680](https://arxiv.org/abs/2111.13680)
+- GMFlowNet [https://arxiv.org/abs/2203.11335](https://arxiv.org/abs/2203.11335)
 - HD3 - [https://arxiv.org/abs/1812.06264](https://arxiv.org/abs/1812.06264)
 - IRR - [https://arxiv.org/abs/1904.05290](https://arxiv.org/abs/1904.05290)
 - LCV - [https://arxiv.org/abs/2007.11431](https://arxiv.org/abs/2007.11431)