Add pytorch 1.6 to CI (#476)

* add pytorch 1.6 to CI

* fix typo

* fix ci error

Co-authored-by: Cao Yuhang <yhcao6@gmail.com>

.github/workflows/build.yml

@@ -31,6 +31,30 @@ jobs:
           extensions: h,c,cpp,hpp,cu,cuh
           style: google
 
+  build_without_torch:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.7]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install system dependencies
+        run: sudo apt-get update && sudo apt-get install -y ffmpeg libturbojpeg
+      - name: Install unittest dependencies
+        run: pip install pytest coverage lmdb PyTurboJPEG
+      - name: Build and install
+        run: rm -rf .eggs && pip install -e .
+      - name: Install Pillow
+        run: pip install Pillow
+      - name: Run unittests and generate coverage report
+        run: |
+          pytest tests/ --ignore=tests/test_runner --ignore=tests/test_optimizer.py --ignore=tests/test_cnn --ignore=tests/test_parallel.py --ignore=tests/test_ops --ignore=tests/test_load_model_zoo.py --ignore=tests/test_logging.py --ignore=tests/test_image/test_io.py --ignore=tests/test_registry.py --ignore=tests/test_fp16.py
+
   build_without_ops:
     runs-on: ubuntu-latest
     env:
@@ -38,10 +62,10 @@ jobs:
     strategy:
       matrix:
         python-version: [3.7]
-        torch: [1.5.1]
+        torch: [1.6.0]
         include:
-          - torch: 1.5.1
-            torchvision: 0.6.1
+          - torch: 1.6.0
+            torchvision: 0.7.0
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
@@ -67,10 +91,16 @@ jobs:
     strategy:
       matrix:
         python-version: [3.7]
-        torch: [1.4.0]
+        torch: [1.3.1, 1.4.0, 1.5.1, 1.6.0]
         include:
-          - torch: 1.4.0
+          - torch: 1.3.1
             torchvision: 0.4.2
+          - torch: 1.4.0
+            torchvision: 0.5.0
+          - torch: 1.5.1
+            torchvision: 0.6.1
+          - torch: 1.6.0
+            torchvision: 0.7.0
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
@@ -104,16 +134,21 @@ jobs:
       MMCV_CUDA_ARGS: -gencode=arch=compute_61,code=sm_61
     strategy:
       matrix:
-        python-version: [3.6, 3.7]
-        torch: [1.3.1, 1.5.1+cu101]
+        python-version: [3.7]
+        torch: [1.3.1, 1.5.1+cu101, 1.6.0+cu101]
         include:
           - torch: 1.3.1
             torchvision: 0.4.2
           - torch: 1.5.1+cu101
             torchvision: 0.6.1+cu101
+          - torch: 1.6.0+cu101
+            torchvision: 0.7.0+cu101
+          - python-version: 3.6
+            torch: 1.6.0+cu101
+            torchvision: 0.7.0+cu101
           - python-version: 3.8
-            torch: 1.5.1+cu101
-            torchvision: 0.6.1+cu101
+            torch: 1.6.0+cu101
+            torchvision: 0.7.0+cu101
 
     steps:
       - uses: actions/checkout@v2
@@ -162,40 +197,18 @@ jobs:
           name: codecov-umbrella
           fail_ci_if_error: false
 
-  build_no_torch:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.7]
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install system dependencies
-        run: sudo apt-get update && sudo apt-get install -y ffmpeg libturbojpeg
-      - name: Install unittest dependencies
-        run: pip install pytest coverage lmdb PyTurboJPEG
-      - name: Build and install
-        run: rm -rf .eggs && pip install -e .
-      - name: Install Pillow
-        run: pip install Pillow
-      - name: Run unittests and generate coverage report
-        run: |
-          pytest tests/ --ignore=tests/test_runner --ignore=tests/test_optimizer.py --ignore=tests/test_cnn --ignore=tests/test_parallel.py --ignore=tests/test_ops --ignore=tests/test_load_model_zoo.py --ignore=tests/test_logging.py --ignore=tests/test_image/test_io.py --ignore=tests/test_registry.py --ignore=tests/test_fp16.py
-
   build_macos:
     runs-on: macos-latest
     strategy:
       matrix:
-        torch: [1.5.1, 1.3.1]
+        torch: [1.3.1, 1.5.1, 1.6.0]
         include:
           - torch: 1.3.1
             torchvision: 0.4.2
           - torch: 1.5.1
             torchvision: 0.6.1
+          - torch: 1.6.0
+            torchvision: 0.7.0
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3.7

README.md

@@ -122,13 +122,13 @@ You can either
 If you are on macOS, add the following environment variables before the installing command.
 
 ```bash
-CC=lang CXX=clang++ CFLAGS='-stdlib=libc++'
+CC=clang CXX=clang++ CFLAGS='-stdlib=libc++'
 ```
 
 e.g.,
 
 ```bash
-CC=lang CXX=clang++ CFLAGS='-stdlib=libc++' MMCV_WITH_OPS=1 pip install -e .
+CC=clang CXX=clang++ CFLAGS='-stdlib=libc++' MMCV_WITH_OPS=1 pip install -e .
 ```
 
 Note: If you would like to use `opencv-python-headless` instead of `opencv-python`,

tests/test_parallel.py

@@ -9,8 +9,12 @@ from mmcv.parallel.distributed_deprecated import \
     MMDistributedDataParallel as DeprecatedMMDDP
 
 
-@patch('torch.distributed._broadcast_coalesced', MagicMock)
-@patch('torch.distributed.broadcast', MagicMock)
+def mock(*args, **kwargs):
+    pass
+
+
+@patch('torch.distributed._broadcast_coalesced', mock)
+@patch('torch.distributed.broadcast', mock)
 @patch('torch.nn.parallel.DistributedDataParallel._ddp_init_helper', MagicMock)
 def test_is_module_wrapper():