Merge branch 'plyfager/fix-metafile' of github.com:plyfager/mmgeneration into fix-metafile-patch

LeoXing1996 · LeoXing1996 · commit 6825bd30e524 · 2022-06-29T21:49:24.000+08:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -123,7 +123,6 @@ jobs:
           coverage xml
           coverage report -m
       - name: Upload coverage to Codecov
-        if: ${{matrix.torch == '1.9.0+cu102' && matrix.python-version == '3.7'}}
         uses: codecov/codecov-action@v2
         with:
           file: ./coverage.xml
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -15,6 +15,11 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: 3.7
+      - name: Install ruby
+        run: |
+          # markdownlint requires ruby >= 2.7
+          sudo apt-get update
+          sudo apt install ruby
       - name: Install pre-commit hook
         run: |
           # markdownlint requires ruby >= 2.7
diff --git a/.github/workflows/test_mim.yml b/.github/workflows/test_mim.yml
@@ -0,0 +1,47 @@
+name: test-mim
+
+on:
+  push:
+    paths:
+      - 'model-index.yml'
+      - 'configs/**'
+
+  pull_request:
+    paths:
+      - 'model-index.yml'
+      - 'configs/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build_cpu:
+    runs-on: ubuntu-18.04
+    strategy:
+      matrix:
+        python-version: [3.7]
+        torch: [1.8.0]
+        include:
+          - torch: 1.8.0
+            torch_version: torch1.8
+            torchvision: 0.9.0
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Upgrade pip
+        run: pip install pip --upgrade
+      - name: Install Pillow
+        run: pip install Pillow==6.2.2
+        if: ${{matrix.torchvision == '0.4.2'}}
+      - name: Install PyTorch
+        run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/torch_stable.html
+      - name: Install openmim
+        run: pip install openmim
+      - name: Build and install
+        run: rm -rf .eggs && mim install -e .
+      - name: test commands of mim
+        run: mim search mmgeneration
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -30,12 +30,12 @@ repos:
       - id: docformatter
         args: ["--in-place", "--wrap-descriptions", "79"]
   - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.14
+    rev: 0.7.9
     hooks:
       - id: mdformat
         args: ["--number"]
         additional_dependencies:
-          - mdformat-gfm
+          - mdformat-openmmlab
           - mdformat_frontmatter
           - linkify-it-py
   - repo: https://github.com/codespell-project/codespell
diff --git a/README.md b/README.md
@@ -19,12 +19,25 @@
    <div>&nbsp;</div>
 </div>
 
-Documentation: https://mmgeneration.readthedocs.io/
-
-## Introduction
+[![PyPI](https://img.shields.io/pypi/v/mmgen)](https://pypi.org/project/mmgen)
+[![docs](https://img.shields.io/badge/docs-latest-blue)](https://mmgeneration.readthedocs.io/en/latest/)
+[![badge](https://github.com/open-mmlab/mmgeneration/workflows/build/badge.svg)](https://github.com/open-mmlab/mmgeneration/actions)
+[![codecov](https://codecov.io/gh/open-mmlab/mmgeneration/branch/master/graph/badge.svg)](https://codecov.io/gh/open-mmlab/mmgeneration)
+[![license](https://img.shields.io/github/license/open-mmlab/mmgeneration.svg)](https://github.com/open-mmlab/mmgeneration/blob/master/LICENSE)
+[![open issues](https://isitmaintained.com/badge/open/open-mmlab/mmgeneration.svg)](https://github.com/open-mmlab/mmgeneration/issues)
+[![issue resolution](https://isitmaintained.com/badge/resolution/open-mmlab/mmgeneration.svg)](https://github.com/open-mmlab/mmgeneration/issues)
+
+[📘Documentation](https://mmgeneration.readthedocs.io/en/latest/) |
+[🛠️Installation](https://mmgeneration.readthedocs.io/en/latest/get_started.html#installation) |
+[👀Model Zoo](https://mmgeneration.readthedocs.io/en/latest/modelzoo_statistics.html) |
+[🆕Update News](https://github.com/open-mmlab/mmgeneration/blob/master/docs/en/changelog.md) |
+[🚀Ongoing Projects](https://github.com/open-mmlab/mmgeneration/projects) |
+[🤔Reporting Issues](https://github.com/open-mmlab/mmgeneration/issues)
 
 English | [简体中文](README_zh-CN.md)
 
+## Introduction
+
 MMGeneration is a powerful toolkit for generative models, especially for GANs now. It is based on PyTorch and [MMCV](https://github.com/open-mmlab/mmcv). The master branch works with **PyTorch 1.5+**.
 
 <div align="center">
@@ -79,6 +92,42 @@ MMGeneration is a powerful toolkit for generative models, especially for GANs no
 
 v0.7.1 was released on 30/04/2022. Please refer to [changelog.md](docs/en/changelog.md) for details and release history.
 
+## Installation
+
+MMGeneration depends on [PyTorch](https://pytorch.org/) and [MMCV](https://github.com/open-mmlab/mmcv).
+Below are quick steps for installation.
+
+**Step 1.**
+Install PyTorch following [official instructions](https://pytorch.org/get-started/locally/), e.g.
+
+```python
+pip3 install torch torchvision
+
+```
+
+**Step 2.**
+Install MMCV with [MIM](https://github.com/open-mmlab/mim).
+
+```
+pip3 install openmim
+mim install mmcv-full
+```
+
+**Step 3.**
+Install MMGeneration from source.
+
+```
+git clone https://github.com/open-mmlab/mmgeneration.git
+cd mmgeneration
+pip3 install -e .[all]
+```
+
+Please refer to [get_started.md](docs/en/get_started.md) for more detailed instruction.
+
+## Getting Started
+
+Please see [get_started.md](docs/en/get_started.md) for the basic usage of MMGeneration. [docs/en/quick_run.md](docs/en/quick_run.md) can offer full guidance for quick run. For other details and tutorials, please go to our [documentation](https://mmgeneration.readthedocs.io/).
+
 ## ModelZoo
 
 These methods have been carefully studied and supported in our frameworks:
@@ -134,46 +183,6 @@ These methods have been carefully studied and supported in our frameworks:
 
 - ✅ [MMGEN-FaceStylor](https://github.com/open-mmlab/MMGEN-FaceStylor)
 
-## License
-
-This project is released under the [Apache 2.0 license](LICENSE). Some operations in `MMGeneration` are with other licenses instead of Apache2.0. Please refer to [LICENSES.md](LICENSES.md) for the careful check, if you are using our code for commercial matters.
-
-## Installation
-
-MMGeneration depends on [PyTorch](https://pytorch.org/) and [MMCV](https://github.com/open-mmlab/mmcv).
-Below are quick steps for installation.
-
-**Step 1.**
-Install PyTorch following [official instructions](https://pytorch.org/get-started/locally/), e.g.
-
-```python
-pip3 install torch torchvision
-
-```
-
-**Step 2.**
-Install MMCV with [MIM](https://github.com/open-mmlab/mim).
-
-```
-pip3 install openmim
-mim install mmcv-full
-```
-
-**Step 3.**
-Install MMGeneration from source.
-
-```
-git clone https://github.com/open-mmlab/mmgeneration.git
-cd mmgeneration
-pip3 install -e .[all]
-```
-
-Please refer to [get_started.md](docs/en/get_started.md) for more detailed instruction.
-
-## Getting Started
-
-Please see [get_started.md](docs/en/get_started.md) for the basic usage of MMGeneration. [docs/en/quick_run.md](docs/en/quick_run.md) can offer full guidance for quick run. For other details and tutorials, please go to our [documentation](https://mmgeneration.readthedocs.io/).
-
 ## Contributing
 
 We appreciate all contributions to improve MMGeneration. Please refer to [CONTRIBUTING.md](https://github.com/open-mmlab/mmcv/blob/master/CONTRIBUTING.md) in MMCV for more details about the contributing guideline.
@@ -191,6 +200,10 @@ If you find this project useful in your research, please consider cite:
 }
 ```
 
+## License
+
+This project is released under the [Apache 2.0 license](LICENSE). Some operations in `MMGeneration` are with other licenses instead of Apache2.0. Please refer to [LICENSES.md](LICENSES.md) for the careful check, if you are using our code for commercial matters.
+
 ## Projects in OpenMMLab
 
 - [MMCV](https://github.com/open-mmlab/mmcv): OpenMMLab foundational library for computer vision.
diff --git a/README_zh-CN.md b/README_zh-CN.md
@@ -1,13 +1,43 @@
 <div align="center">
     <img src="https://user-images.githubusercontent.com/12726765/114528756-de55af80-9c7b-11eb-94d7-d3224ada1585.png" width="400"/>
+      <div>&nbsp;</div>
+   <div align="center">
+     <b><font size="5">OpenMMLab 官网</font></b>
+     <sup>
+       <a href="https://openmmlab.com">
+         <i><font size="4">HOT</font></i>
+       </a>
+     </sup>
+     &nbsp;&nbsp;&nbsp;&nbsp;
+     <b><font size="5">OpenMMLab 开放平台</font></b>
+     <sup>
+       <a href="https://platform.openmmlab.com">
+         <i><font size="4">TRY IT OUT</font></i>
+       </a>
+     </sup>
+   </div>
+   <div>&nbsp;</div>
 </div>
 
-文档: https://mmgeneration.readthedocs.io/
-
-## 简介
+[![PyPI](https://img.shields.io/pypi/v/mmgen)](https://pypi.org/project/mmgen)
+[![docs](https://img.shields.io/badge/docs-latest-blue)](https://mmgeneration.readthedocs.io/en/latest/)
+[![badge](https://github.com/open-mmlab/mmgeneration/workflows/build/badge.svg)](https://github.com/open-mmlab/mmgeneration/actions)
+[![codecov](https://codecov.io/gh/open-mmlab/mmgeneration/branch/master/graph/badge.svg)](https://codecov.io/gh/open-mmlab/mmgeneration)
+[![license](https://img.shields.io/github/license/open-mmlab/mmgeneration.svg)](https://github.com/open-mmlab/mmgeneration/blob/master/LICENSE)
+[![open issues](https://isitmaintained.com/badge/open/open-mmlab/mmgeneration.svg)](https://github.com/open-mmlab/mmgeneration/issues)
+[![issue resolution](https://isitmaintained.com/badge/resolution/open-mmlab/mmgeneration.svg)](https://github.com/open-mmlab/mmgeneration/issues)
+
+[📘使用文档](https://mmgeneration.readthedocs.io/en/latest/) |
+[🛠️安装教程](https://mmgeneration.readthedocs.io/en/latest/get_started.html#installation) |
+[👀模型库](https://mmgeneration.readthedocs.io/en/latest/modelzoo_statistics.html) |
+[🆕更新记录](https://github.com/open-mmlab/mmgeneration/blob/master/docs/en/changelog.md) |
+[🚀进行中的项目](https://github.com/open-mmlab/mmgeneration/projects) |
+[🤔提出问题](https://github.com/open-mmlab/mmgeneration/issues)
 
 [English](README.md) | 简体中文
 
+## 简介
+
 MMGeneration 是一个基于 PyTorch 和[MMCV](https://github.com/open-mmlab/mmcv)的强有力的生成模型工具箱，尤其专注于 GAN 模型。
 主分支目前支持 **PyTorch 1.5** 以上的版本。
 
@@ -63,6 +93,40 @@ MMGeneration 是一个基于 PyTorch 和[MMCV](https://github.com/open-mmlab/mmc
 
 v0.7.1 在 30/04/2022 发布。 关于细节和发布历史，请参考 [changelog.md](docs/zh_cn/changelog.md)。
 
+## 安装
+
+MMGeneration 依赖 [PyTorch](https://pytorch.org/) 和 [MMCV](https://github.com/open-mmlab/mmcv)，以下是安装的简要步骤。
+
+**步骤 1.**
+依照[官方教程](https://pytorch.org/get-started/locally/)安装PyTorch，例如
+
+```python
+pip3 install torch torchvision
+```
+
+**步骤 2.**
+使用 [MIM](https://github.com/open-mmlab/mim) 安装 MMCV
+
+```
+pip3 install openmim
+mim install mmcv-full
+```
+
+**步骤 3.**
+从源码安装 MMGeneration
+
+```
+git clone https://github.com/open-mmlab/mmgeneration.git
+cd mmgeneration
+pip3 install -e .[all]
+```
+
+更详细的安装指南请参考 [get_started.md](docs/zh/get_started.md) .
+
+## 快速入门
+
+对于 `MMGeneration` 的基本使用请参考 [快速入门](docs/zh_cn/get_started.md)。其他细节和教程，请参考我们的[文档](https://mmgeneration.readthedocs.io/)。
+
 ## 模型库
 
 这些算法在我们的框架中得到了认真研究和支持。
@@ -114,52 +178,10 @@ v0.7.1 在 30/04/2022 发布。 关于细节和发布历史，请参考 [changel
 
 </details>
 
-## 安装
-
-MMGeneration 依赖 [PyTorch](https://pytorch.org/) 和 [MMCV](https://github.com/open-mmlab/mmcv)，以下是安装的简要步骤。
-
-**步骤 1.**
-依照[官方教程](https://pytorch.org/get-started/locally/)安装PyTorch，例如
-
-```python
-pip3 install torch torchvision
-```
-
-**步骤 2.**
-使用 [MIM](https://github.com/open-mmlab/mim) 安装 MMCV
-
-```
-pip3 install openmim
-mim install mmcv-full
-```
-
-**步骤 3.**
-从源码安装 MMGeneration
-
-```
-git clone https://github.com/open-mmlab/mmgeneration.git
-cd mmgeneration
-pip3 install -e .[all]
-```
-
-更详细的安装指南请参考 [get_started.md](docs/zh/get_started.md) .
-
 ## 相关应用
 
 - ✅ [MMGEN-FaceStylor](https://github.com/open-mmlab/MMGEN-FaceStylor)
 
-## 开源许可证
-
-该项目采用 [Apache 2.0 license](LICENSE) 开源许可证。`MMGeneration` 中的一些操作使用了其他许可证。如果您使用我们的代码进行商业事务，请参考 [许可证](LICENSES.md) 并仔细检查。
-
-## 安装
-
-请参考[快速入门](docs/zh_cn/get_started.md)进行安装。
-
-## 快速入门
-
-对于 `MMGeneration` 的基本使用请参考 [快速入门](docs/zh_cn/get_started.md)。其他细节和教程，请参考我们的[文档](https://mmgeneration.readthedocs.io/)。
-
 ## 贡献指南
 
 我们感谢所有的贡献者为改进和提升 MMGeneration 所作出的努力。请参考[贡献指南](https://github.com/open-mmlab/mmcv/blob/master/CONTRIBUTING.md)来了解参与项目贡献的相关指引。
@@ -177,6 +199,10 @@ pip3 install -e .[all]
 }
 ```
 
+## 开源许可证
+
+该项目采用 [Apache 2.0 license](LICENSE) 开源许可证。`MMGeneration` 中的一些操作使用了其他许可证。如果您使用我们的代码进行商业事务，请参考 [许可证](LICENSES.md) 并仔细检查。
+
 ## OpenMMLab 的其他项目
 
 - [MMCV](https://github.com/open-mmlab/mmcv): OpenMMLab 计算机视觉基础库
diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -3,7 +3,13 @@ docutils==0.16.0
 m2r
 mmcls==0.18.0
 myst-parser
-opencv-python
+opencv-python!=4.5.5.62,!=4.5.5.64
+# Skip problematic opencv-python versions
+# MMCV depends opencv-python instead of headless, thus we install opencv-python
+# Due to a bug from upstream, we skip this two version
+# https://github.com/opencv/opencv-python/issues/602
+# https://github.com/opencv/opencv/issues/21366
+# It seems to be fixed in https://github.com/opencv/opencv/pull/21382opencv-python
 prettytable
 -e git+https://github.com/open-mmlab/pytorch_sphinx_theme.git#egg=pytorch_sphinx_theme
 scipy
diff --git a/requirements/miminstall.txt b/requirements/miminstall.txt
@@ -0,0 +1 @@
+mmcv-full>=1.3.17
diff --git a/setup.py b/setup.py
@@ -194,7 +194,12 @@ def add_mim_extension():
         author_email='openmmlab@gmail.com',
         license='Apache License 2.0',
         include_package_data=True,
-        install_requires=parse_requirements('requirements.txt'),
+        install_requires=parse_requirements('requirements/runtime.txt'),
+        extras_require={
+            'all': parse_requirements('requirements.txt'),
+            'tests': parse_requirements('requirements/tests.txt'),
+            'mim': parse_requirements('requirements/miminstall.txt'),
+        },
         cmdclass={'build_ext': BuildExtension},
         extras_require={
             'all': parse_requirements('requirements.txt'),
diff --git a/tests/test_modules/test_mspie_archs.py b/tests/test_modules/test_mspie_archs.py
diff --git a/tests/test_modules/test_stylev1_archs.py b/tests/test_modules/test_stylev1_archs.py
diff --git a/tests/test_modules/test_stylev2_archs.py b/tests/test_modules/test_stylev2_archs.py
