Changes done internally at Facebook (onnx#2035)

Author: houseroad

.gitignore

@@ -97,4 +97,3 @@ test_report
 .mypy_cache
 virtualenv
 venv
-

onnx/defs/nn/defs.cc

@@ -1280,7 +1280,7 @@ void convTransposeShapeInference(InferenceContext& ctx) {
         }
         int64_t total_pad = residual == 0 ? kernel_shape[i] - stride : kernel_shape[i] - residual;
         if (total_pad < 0)
-          total_pad = 0;         
+          total_pad = 0;
         int64_t half_pad_small = total_pad >> 1;
         int64_t half_pad_big = total_pad - half_pad_small;
         if (auto_pad_attr->s() == "SAME_UPPER") {

onnx/version_converter/adapters/batch_normalization_8_9.h

@@ -7,12 +7,12 @@
 namespace ONNX_NAMESPACE { namespace version_conversion {
 
 struct BatchNormalization_8_9 final : public Adapter {
-  explicit BatchNormalization_8_9() 
+  explicit BatchNormalization_8_9()
     : Adapter("BatchNormalization", OpSetID(8), OpSetID(9)) {
     }
-    
+
   void adapt_batch_normalization_8_9(std::shared_ptr<Graph>, Node* node) const {
-    
+
     Symbol spatial = Symbol("spatial");
       if (node->hasAttribute(spatial)) {
         if (node->i(spatial) == 1) {
@@ -28,4 +28,4 @@ struct BatchNormalization_8_9 final : public Adapter {
   }
 };
 
-}} // namespace ONNX_NAMESPACE::version_conversion
+}} // namespace ONNX_NAMESPACE::version_conversion

onnx/version_converter/adapters/scan_8_9.h

@@ -11,7 +11,7 @@ struct Scan_8_9 final : public Adapter {
     }
 
   void adapt_scan_8_9(std::shared_ptr<Graph>, Node* node) const {
-    
+
     const std::vector<Value*> inputs(node->inputs().vec());
     const std::vector<Value*> outputs(node->outputs().vec());
 
@@ -31,7 +31,7 @@ struct Scan_8_9 final : public Adapter {
     if (inputs[0]->uniqueName() != "") {
           ONNX_ASSERT("Unsupported conversion to opset 9");
     }
-    
+
     for (Value* input : inputs) {
       if (!input->sizes().empty()) {
         std::vector<Dimension> new_sizes(input->sizes().begin()+1, input->sizes().end());
@@ -45,7 +45,7 @@ struct Scan_8_9 final : public Adapter {
         std::vector<Dimension> new_sizes(output->sizes().begin()+1, output->sizes().end());
         output->setSizes(new_sizes);
       }
-    }            
+    }
   }
 
   void adapt(std::shared_ptr<Graph> graph, Node* node) const override {
@@ -54,4 +54,4 @@ struct Scan_8_9 final : public Adapter {
 
 };
 
-}} // namespace ONNX_NAMESPACE::version_conversion
+}} // namespace ONNX_NAMESPACE::version_conversion

onnx/version_converter/adapters/upsample_8_9.h

@@ -10,7 +10,7 @@ struct Upsample_8_9 final: public Adapter {
   explicit Upsample_8_9() : Adapter("Upsample", OpSetID(8), OpSetID(9)) {}
 
   void adapt_upsample_8_9(std::shared_ptr<Graph> graph, Node* node) const {
-    
+
     Symbol input_dirs = Symbol("scales");
     int dim = (int)(node->fs(kscales).size());
     Tensor t;
@@ -22,7 +22,7 @@ struct Upsample_8_9 final: public Adapter {
       for(double scale : node->fs(kscales)) {
         data.emplace_back((float)scale);
       }
-      
+
       Value* v = graph->addInitializerAndInput(t, "scales");
       std::vector<Dimension> new_sizes {Dimension(dim)};
       v->setSizes(new_sizes);
@@ -36,4 +36,4 @@ struct Upsample_8_9 final: public Adapter {
   }
 };
 
-}} // namespace ONNX_NAMESPACE::version_conversion
+}} // namespace ONNX_NAMESPACE::version_conversion