Back out "Temporarily remove glow optin" (#4722)

Summary: Pull Request resolved: #4722

Reviewed By: hl475

Differential Revision: D22653444

fbshipit-source-id: 31557c523673c98f4fab80a9c90ed52edec33b1c

Author: Yinghai Lu

.clang-format

@@ -6,6 +6,7 @@ AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
 AlignEscapedNewlines: Right
+AlignEscapedNewlinesLeft: false
 AlignOperands:   true
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true

lib/Backends/OpenCL/OpenCLTensorLayout.cpp

@@ -90,7 +90,8 @@ getLayoutForTempEnumRep(size_t n, const Node *node) {
     switch (n) {
     case ConvolutionNode::InputIndices::BiasIdx:
       return &CanonicalTensorLayout::getInstance().getLayoutsForDims()[1];
-    default: { return getLayoutFromEnum(CN); }
+    default:
+      return getLayoutFromEnum(CN);
     }
   }
   return nullptr;

lib/Base/Tensor.cpp

@@ -845,7 +845,8 @@ bool Tensor::isTiled(unsigned_t axis, dim_t size, bool fractional) const {
   case ElemKind::BoolTy: {
     return isTiledImpl<bool>(this, axis, size, fractional);
   }
-  default: { llvm_unreachable("isTiled: Precision not supported!"); }
+  default:
+    llvm_unreachable("isTiled: Precision not supported!");
   }
 }
 

lib/Graph/TensorLayout.cpp

@@ -666,10 +666,10 @@ static bool acceptsAnyInputLayout(const glow::Node *node) {
   case Kinded::Kind::SliceNodeKind:
   case Kinded::Kind::TileNodeKind:
   case Kinded::Kind::InsertTensorNodeKind:
-  case Kinded::Kind::SGDNodeKind: {
+  case Kinded::Kind::SGDNodeKind:
     return true;
-  }
-  default: { return false; }
+  default:
+    return false;
   }
 }
 

tests/benchmark/BERTProxyLayerBench.cpp

@@ -179,7 +179,8 @@ class BERTProxyLayerBench : public Benchmark {
         (float)(1.0 / std::sqrt(((double)hiddenSize_) / ((double)numHeads_)));
 
     // Softmax expected output. Not needed for inference
-    Tensor expected_Tensor(ElemKind::Int64ITy, {maxSequenceLength_ * batchSize_, 1});
+    Tensor expected_Tensor(ElemKind::Int64ITy,
+                           {maxSequenceLength_ * batchSize_, 1});
     Constant *expected = mod->createConstant("expected", expected_Tensor);
 
     // Weights/bias constants for FC1

utils/format.sh

@@ -28,6 +28,7 @@ print_usage() {
 }
 
 fix_format() {
+  $CLANG_COMMAND -version
   find lib tests/unittests/ tools/ include examples torch_glow inference_engines externalbackends \
     -name \*.h -print0 \
     -o -name \*.hpp -print0 \