Add clang-format to CircleCI (#2057)

* Add clang-format to CircleCI

* Fix for clang-format version

* Fix lint and remove Travis CI

* Seeing if lost commit comes back

* Fix lint

* Re-enable all tests

Author: fmassa

.circleci/config.yml

@@ -76,7 +76,6 @@ jobs:
             python .circleci/regenerate.py
             git diff --exit-code || (echo ".circleci/config.yml not in sync with config.yml.in! Run .circleci/regenerate.py to update config"; exit 1)
 
-
   python_lint:
     docker:
       - image: circleci/python:3.7
@@ -87,6 +86,17 @@ jobs:
             pip install --user --progress-bar off flake8 typing
             flake8 .
 
+  clang_format:
+    docker:
+      - image: circleci/python:3.7
+    steps:
+      - checkout
+      - run:
+          command: |
+            sudo apt-get update -y
+            sudo apt-get install -y clang-format
+            ./travis-scripts/run-clang-format/run-clang-format.py -r torchvision/csrc
+
   binary_linux_wheel:
     <<: *binary_common
     docker:
@@ -521,11 +531,13 @@ workflows:
           python_version: "3.6"
           cu_version: "cu101"
       - python_lint
-
+      - clang_format
 
   nightly:
     jobs:
       - circleci_consistency
+      - python_lint
+      - clang_format
       - binary_linux_wheel:
           cu_version: cpu
           filters:

.circleci/config.yml.in

@@ -76,7 +76,6 @@ jobs:
             python .circleci/regenerate.py
             git diff --exit-code || (echo ".circleci/config.yml not in sync with config.yml.in! Run .circleci/regenerate.py to update config"; exit 1)
 
-
   python_lint:
     docker:
       - image: circleci/python:3.7
@@ -87,6 +86,17 @@ jobs:
             pip install --user --progress-bar off flake8 typing
             flake8 .
 
+  clang_format:
+    docker:
+      - image: circleci/python:3.7
+    steps:
+      - checkout
+      - run:
+          command: |
+            sudo apt-get update -y
+            sudo apt-get install -y clang-format
+            ./travis-scripts/run-clang-format/run-clang-format.py -r torchvision/csrc
+
   binary_linux_wheel:
     <<: *binary_common
     docker:
@@ -323,10 +333,12 @@ workflows:
           python_version: "3.6"
           cu_version: "cu101"
       - python_lint
-
+      - clang_format
 
   nightly:
 {%- endif %}
     jobs:
       - circleci_consistency
+      - python_lint
+      - clang_format
       {{ workflows(prefix="nightly_", filter_branch="nightly", upload=True) }}

.travis.yml

@@ -3,18 +3,6 @@ language: python
 dist: xenial
 matrix:
   include:
-    - env: FORMAT_CHECK
-      language: cpp
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-xenial-7
-          packages:
-            - clang-7
-            - clang-format-7
-      before_install: skip
-      install: skip
-      script: ./travis-scripts/run-clang-format/run-clang-format.py -r torchvision/csrc
     - python: "3.6"
       env: IMAGE_BACKEND=Pillow-SIMD
     - python: "3.6"

torchvision/csrc/cpu/DeformConv_cpu.cpp

@@ -393,7 +393,7 @@ at::Tensor DeformConv2d_forward_cpu(
                           .view_as(out_buf[b][g]);
     }
     columns =
-      columns.view({columns.size(0) * columns.size(1), columns.size(2)});
+        columns.view({columns.size(0) * columns.size(1), columns.size(2)});
   }
 
   out_buf = out_buf.view({batch_sz / n_parallel_imgs,
@@ -733,12 +733,14 @@ static std::tuple<at::Tensor, at::Tensor> deform_conv2d_backward_input_cpu(
                            out_h,
                            out_w});
 
-  grad_out = grad_out.reshape({batch_sz / n_parallel_imgs,
-                               n_parallel_imgs,
-                               n_weight_grps,
-                               n_out_channels / n_weight_grps,
-                               out_h,
-                               out_w}).permute({0, 2, 3, 1, 4, 5});
+  grad_out = grad_out
+                 .reshape({batch_sz / n_parallel_imgs,
+                           n_parallel_imgs,
+                           n_weight_grps,
+                           n_out_channels / n_weight_grps,
+                           out_h,
+                           out_w})
+                 .permute({0, 2, 3, 1, 4, 5});
 
   weight = weight.reshape({n_weight_grps,
                            weight.size(0) / n_weight_grps,
@@ -838,14 +840,15 @@ static at::Tensor deform_conv2d_backward_parameters_cpu(
 
   auto grad_weight = at::zeros_like(weight);
 
-  at::Tensor grad_out_buf = grad_out.reshape(
-      {batch_sz / n_parallel_imgs,
-       n_parallel_imgs,
-       n_weight_grps,
-       n_out_channels / n_weight_grps,
-       out_h,
-       out_w}
-  ).permute({0, 2, 3, 1, 4, 5}).contiguous();
+  at::Tensor grad_out_buf = grad_out
+                                .reshape({batch_sz / n_parallel_imgs,
+                                          n_parallel_imgs,
+                                          n_weight_grps,
+                                          n_out_channels / n_weight_grps,
+                                          out_h,
+                                          out_w})
+                                .permute({0, 2, 3, 1, 4, 5})
+                                .contiguous();
 
   input = input.reshape(
       {batch_sz / n_parallel_imgs, n_parallel_imgs, n_in_channels, in_h, in_w});