Revert "Bump timm from 0.6.13 to 0.9.2 (qubvel-org#768)"

This reverts commit e5d3db2.

Author: Telcrome

.github/workflows/tests.yml

@@ -11,9 +11,8 @@ on:
     branches: [ master ]
 
 jobs:
-  
-  lint:
-    runs-on: ubuntu-latest
+  test:
+    runs-on: ubuntu-18.04
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -24,27 +23,28 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install torch==1.9.0+cpu torchvision==0.10.0+cpu -f https://download.pytorch.org/whl/torch_stable.html
-        make install_dev
+        pip install .[test]
+    - name: Run Tests
+      run: python -m pytest -s tests
     - name: Run Flake8
-      run: make flake8
-    - name: Run Black
-      run: make black
+      run: flake8 --config=.flake8
 
-  test:
+  check_code_formatting:
+    name: Check code formatting with Black
     runs-on: ubuntu-latest
-    needs: [lint]
+    strategy:
+      matrix:
+        python-version: [3.8]
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.7
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install torch==1.9.0+cpu torchvision==0.10.0+cpu -f https://download.pytorch.org/whl/torch_stable.html
-        make install_dev
-    - name: Run Flake8
-      run: make flake8
-    - name: Run Tests
-      run: make test
+        python-version: ${{ matrix.python-version }}
+    - name: Update pip
+      run: python -m pip install --upgrade pip
+    - name: Install Black
+      run: pip install black==22.3.0
+    - name: Run Black
+      run: black --config=pyproject.toml --check .

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ repos:
     hooks:
       - id: black
         args: [ --config=pyproject.toml ]
-  - repo: https://github.com/pycqa/flake8.git
+  - repo: https://gitlab.com/pycqa/flake8
     rev: 4.0.1
     hooks:
     - id: flake8

Makefile

@@ -469,22 +469,25 @@ $ pip install git+https://github.com/qubvel/segmentation_models.pytorch
 
 ### 🤝 Contributing
 
-#### Install SMP  
-
+##### Install linting and formatting pre-commit hooks
 ```bash
-make install_dev  # create .venv, install SMP in dev mode
+pip install pre-commit black==22.3.0 flake8==4.0.1
+pre-commit install
 ```
 
-#### Run tests and code checks  
-
+##### Run tests
 ```bash
-make all          # run flake8, black, tests
+pytest -p no:cacheprovider
 ```
 
-#### Update table with encoders  
+##### Run tests in docker
+```bash
+$ docker build -f docker/Dockerfile.dev -t smp:dev . && docker run --rm smp:dev pytest -p no:cacheprovider
+```
 
+##### Generate table with encoders (in case you add a new encoder)
 ```bash
-make table        # generate table with encoders and print to stdout
+$ docker build -f docker/Dockerfile.dev -t smp:dev . && docker run --rm smp:dev python misc/generate_table.py
 ```
 
 ### 📝 Citing

README.md

@@ -18,24 +18,20 @@
 import re
 import sys
 import datetime
-
-sys.path.append("..")
+sys.path.append('..')
 
 # -- Project information -----------------------------------------------------
 
-project = "Segmentation Models"
-copyright = "{}, Pavel Iakubovskii".format(datetime.datetime.now().year)
-author = "Pavel Iakubovskii"
-
+project = 'Segmentation Models'
+copyright = '{}, Pavel Iakubovskii'.format(datetime.datetime.now().year)
+author = 'Pavel Iakubovskii'
 
 def get_version():
-    sys.path.append("../segmentation_models_pytorch")
+    sys.path.append('../segmentation_models_pytorch')
     from __version__ import __version__ as version
-
     sys.path.pop(-1)
     return version
 
-
 version = get_version()
 
 # -- General configuration ---------------------------------------------------
@@ -45,16 +41,16 @@ def get_version():
 # ones.
 
 extensions = [
-    "sphinx.ext.autodoc",
-    "sphinx.ext.coverage",
-    "sphinx.ext.napoleon",
-    "sphinx.ext.viewcode",
-    "sphinx.ext.mathjax",
-    "autodocsumm",
+    'sphinx.ext.autodoc',
+    'sphinx.ext.coverage',
+    'sphinx.ext.napoleon',
+    'sphinx.ext.viewcode',
+    'sphinx.ext.mathjax', 
+    'autodocsumm',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ["_templates"]
+templates_path = ['_templates']
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -69,14 +65,12 @@ def get_version():
 #
 
 import sphinx_rtd_theme
-
 html_theme = "sphinx_rtd_theme"
 html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # import karma_sphinx_theme
 # html_theme = "karma_sphinx_theme"
 import faculty_sphinx_theme
-
 html_theme = "faculty_sphinx_theme"
 
 # import catalyst_sphinx_theme
@@ -88,7 +82,7 @@ def get_version():
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ["_static"]
+html_static_path = ['_static']
 
 # -- Extension configuration -------------------------------------------------
 
@@ -98,40 +92,37 @@ def get_version():
 napoleon_numpy_docstring = False
 
 autodoc_mock_imports = [
-    "torch",
-    "tqdm",
-    "numpy",
-    "timm",
-    "cv2",
-    "PIL",
-    "pretrainedmodels",
-    "torchvision",
-    "efficientnet-pytorch",
-    "segmentation_models_pytorch.encoders",
-    "segmentation_models_pytorch.utils",
+    'torch',
+    'tqdm',
+    'numpy',
+    'timm',
+    'cv2',
+    'PIL',
+    'pretrainedmodels',
+    'torchvision',
+    'efficientnet-pytorch',
+    'segmentation_models_pytorch.encoders',
+    'segmentation_models_pytorch.utils',
     # 'segmentation_models_pytorch.base',
 ]
 
-autoclass_content = "both"
-autodoc_typehints = "description"
+autoclass_content = 'both'
+autodoc_typehints = 'description'
 
 # --- Work around to make autoclass signatures not (*args, **kwargs) ----------
 
-
-class FakeSignature:
+class FakeSignature():
     def __getattribute__(self, *args):
         raise ValueError
 
-
 def f(app, obj, bound_method):
     if "__new__" in obj.__name__:
         obj.__signature__ = FakeSignature()
 
-
 def setup(app):
-    app.connect("autodoc-before-process-signature", f)
+    app.connect('autodoc-before-process-signature', f)
 
 
 # Custom configuration --------------------------------------------------------
 
-autodoc_member_order = "bysource"
+autodoc_member_order = 'bysource'

docs/conf.py

@@ -249,7 +249,7 @@ EfficientNet
 +------------------------+--------------------------------------+-------------+
 | timm-efficientnet-b8   | imagenet / advprop                   | 84M         |
 +------------------------+--------------------------------------+-------------+
-| timm-efficientnet-l2   | noisy-student / noisy-student-475    | 474M        |
+| timm-efficientnet-l2   | noisy-student                        | 474M        |
 +------------------------+--------------------------------------+-------------+
 | timm-efficientnet-lite0| imagenet                             | 4M          |
 +------------------------+--------------------------------------+-------------+