Merge branch 'main' into forest_flow

Author: kilianFatras

.github/workflows/test.yaml

@@ -1,4 +1,4 @@
-name: Tests
+name: TorchCFM Tests
 
 on:
   push:
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, ubuntu-20.04, macos-latest, windows-latest]
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - name: Checkout
@@ -28,7 +28,6 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r runner-requirements.txt
           pip install pytest
           pip install sh
           pip install -e .
@@ -39,10 +38,10 @@ jobs:
 
       - name: Run pytest
         run: |
-          pytest -v runner
+          pytest -v --ignore=examples --ignore=runner
 
   # upload code coverage report
-  code-coverage:
+  code-coverage-torchcfm:
     runs-on: ubuntu-latest
 
     steps:
@@ -57,14 +56,17 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r runner-requirements.txt
           pip install pytest
           pip install pytest-cov[toml]
           pip install sh
           pip install -e .
 
       - name: Run tests and collect coverage
-        run: pytest runner --cov runner # NEEDS TO BE UPDATED WHEN CHANGING THE NAME OF "src" FOLDER
+        run: pytest . --cov torchcfm --ignore=runner --ignore=examples --ignore=torchcfm/models/
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
+        with:
+          name: codecov-torchcfm
+          verbose: true
+          fail_ci_if_error: true

.github/workflows/test_runner.yaml

@@ -0,0 +1,74 @@
+name: Runner Tests
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main, "release/*"]
+
+jobs:
+  run_tests_ubuntu:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, ubuntu-20.04, macos-latest, windows-latest]
+        python-version: ["3.8", "3.9", "3.10"]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r runner-requirements.txt
+          pip install pytest
+          pip install sh
+          pip install -e .
+
+      - name: List dependencies
+        run: |
+          python -m pip list
+
+      - name: Run pytest
+        run: |
+          pytest -v runner
+
+  # upload code coverage report
+  code-coverage-runner:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r runner-requirements.txt
+          pip install pytest
+          pip install pytest-cov[toml]
+          pip install sh
+          pip install -e .
+
+      - name: Run tests and collect coverage
+        run: pytest runner --cov runner # NEEDS TO BE UPDATED WHEN CHANGING THE NAME OF "src" FOLDER
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          name: codecov-runner
+          verbose: true
+          fail_ci_if_error: true

pyproject.toml

@@ -35,3 +35,6 @@ count = true
 
 [tool.bandit]
 skips = ["B101", "B311"]
+
+[tool.isort]
+known_first_party = ["tests", "src"]

runner/src/datamodules/distribution_datamodule.py

@@ -7,10 +7,11 @@
 from pytorch_lightning import LightningDataModule
 from pytorch_lightning.trainer.supporters import CombinedLoader
 from sklearn.preprocessing import StandardScaler
-from src import utils
 from torch.utils.data import DataLoader, Sampler, TensorDataset, random_split
 from torchdyn.datasets import ToyDataset
 
+from src import utils
+
 from .components.base import BaseLightningDataModule
 from .components.time_dataset import load_dataset
 from .components.tnet_dataset import SCData

runner/src/eval.py

@@ -38,6 +38,7 @@
 from omegaconf import DictConfig
 from pytorch_lightning import LightningDataModule, LightningModule, Trainer
 from pytorch_lightning.loggers import LightningLoggerBase
+
 from src import utils
 
 log = utils.get_pylogger(__name__)

runner/src/train.py

@@ -39,6 +39,7 @@
 from omegaconf import DictConfig
 from pytorch_lightning import Callback, LightningDataModule, LightningModule, Trainer
 from pytorch_lightning.loggers import LightningLoggerBase
+
 from src import utils
 
 log = utils.get_pylogger(__name__)

runner/src/utils/rich_utils.py

@@ -8,6 +8,7 @@
 from omegaconf import DictConfig, OmegaConf, open_dict
 from pytorch_lightning.utilities import rank_zero_only
 from rich.prompt import Prompt
+
 from src.utils import pylogger
 
 log = pylogger.get_pylogger(__name__)

runner/src/utils/utils.py

@@ -9,6 +9,7 @@
 from pytorch_lightning import Callback
 from pytorch_lightning.loggers import LightningLoggerBase
 from pytorch_lightning.utilities import rank_zero_only
+
 from src.utils import pylogger, rich_utils
 
 log = pylogger.get_pylogger(__name__)

runner/tests/helpers/run_if.py

@@ -10,6 +10,7 @@
 import torch
 from packaging.version import Version
 from pkg_resources import get_distribution
+
 from tests.helpers.package_available import (
     _COMET_AVAILABLE,
     _DEEPSPEED_AVAILABLE,

runner/tests/helpers/run_sh_command.py

@@ -1,6 +1,7 @@
 from typing import List
 
 import pytest
+
 from tests.helpers.package_available import _SH_AVAILABLE
 
 if _SH_AVAILABLE: