From a70a90b28f0176dda18486ddfac64997dedaa92e Mon Sep 17 00:00:00 2001
From: Mingzhe Li <mingzhe0908@fb.com>
Date: Mon, 9 Jul 2018 14:37:05 -0700
Subject: [PATCH] Fix pytorch linux build issues (#9273)

Summary:
Breaking out of #8338

This fixes the build issues with pytorch on linux machines after BUILD_CAFFE2 and BUILD_ATEN are removed.

cc orionr
Pull Request resolved: https://github.com/pytorch/pytorch/pull/9273

Reviewed By: orionr

Differential Revision: D8768869

Pulled By: mingzhe09088

fbshipit-source-id: 2730426ed1bed398eb5dc804c7348aeeb27c93d3
---
 CMakeLists.txt                                 | 2 ++
 aten/src/THNN/generic/SpatialMaxUnpooling.c    | 2 +-
 aten/src/THNN/generic/VolumetricMaxUnpooling.c | 2 +-
 caffe2/operators/abs_op.cc                     | 2 +-
 caffe2/operators/pack_segments.cc              | 2 +-
 caffe2/operators/sequence_ops.cc               | 4 ++--
 cmake/Utils.cmake                              | 6 +++++-
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 721b1412d52..d51529dcfe8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,12 +201,14 @@ if(NOT MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-type-limits")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-array-bounds")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-result")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-strict-aliasing")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=deprecated-declarations")
   # These flags are not available in GCC-4.8.5. Set only when using clang.
   # Compared against https://gcc.gnu.org/onlinedocs/gcc-4.8.5/gcc/Option-Summary.html
diff --git a/aten/src/THNN/generic/SpatialMaxUnpooling.c b/aten/src/THNN/generic/SpatialMaxUnpooling.c
index b2de1a677d4..64179b52779 100644
--- a/aten/src/THNN/generic/SpatialMaxUnpooling.c
+++ b/aten/src/THNN/generic/SpatialMaxUnpooling.c
@@ -10,7 +10,7 @@ static void THNN_(SpatialMaxUnpooling_updateOutput_frame)(real *input_p, real *o
 {
   int k;
   int has_error = 0;
-  THIndex_t error_index;
+  THIndex_t error_index = 0;
 #pragma omp parallel for private(k)
   for (k = 0; k < nslices; k++)
   {
diff --git a/aten/src/THNN/generic/VolumetricMaxUnpooling.c b/aten/src/THNN/generic/VolumetricMaxUnpooling.c
index d1a11f8af97..b8e649cc39d 100644
--- a/aten/src/THNN/generic/VolumetricMaxUnpooling.c
+++ b/aten/src/THNN/generic/VolumetricMaxUnpooling.c
@@ -67,7 +67,7 @@ static void THNN_(VolumetricMaxUnpooling_updateOutput_frame)(
 {
   int k;
   int has_error = 0;
-  THIndex_t error_index;
+  THIndex_t error_index = 0;
 #pragma omp parallel for private(k)
   for (k = 0; k < nslices; k++)
   {
diff --git a/caffe2/operators/abs_op.cc b/caffe2/operators/abs_op.cc
index 11dd8d9979f..81881c71c38 100644
--- a/caffe2/operators/abs_op.cc
+++ b/caffe2/operators/abs_op.cc
@@ -78,7 +78,7 @@ Y: [0.3005476  1.551666   1.3591481  0.39191285 0.21866608]
 </details>
 
 )DOC")
-    .Input(0, "X", "*(type: Tensor<float\\>)* Input tensor.")
+    .Input(0, "X", "*(type: Tensor<float>)* Input tensor.")
     .Output(
         0,
         "Y",
diff --git a/caffe2/operators/pack_segments.cc b/caffe2/operators/pack_segments.cc
index d0064db7251..7fcbf917e28 100644
--- a/caffe2/operators/pack_segments.cc
+++ b/caffe2/operators/pack_segments.cc
@@ -132,7 +132,7 @@ bool UnpackSegmentsOp<CPUContext>::DoRunWithType2() {
   output->Resize(shape);
   // create output tensor
   auto* out = static_cast<char*>(output->raw_mutable_data(data.meta()));
-  if (!(data.dim(0) * data.dim(1))) {
+  if (!(data.dim(0) && data.dim(1))) {
     return true;
   }
   auto block_size = data.size_from_dim(2);
diff --git a/caffe2/operators/sequence_ops.cc b/caffe2/operators/sequence_ops.cc
index 271f39fd96e..4dd8e65aa38 100644
--- a/caffe2/operators/sequence_ops.cc
+++ b/caffe2/operators/sequence_ops.cc
@@ -385,7 +385,7 @@ lengths_out: [5]
     .Output(
         0,
         "data_out",
-        "*(type: Tensor)* Padded data tensor ($T<N + 2*padding\\_width, "
+        "*(type: Tensor)* Padded data tensor ($T<N + 2*padding_width, "
         "D_1, ..., D_n>$).")
     .Output(
         1,
@@ -483,7 +483,7 @@ lengths_out_rm: [3]
         0,
         "data_out",
         "*(type: Tensor)* Padded data tensor "
-        "($T<N + 2*padding\\_width, D_1, ..., D_n>$).")
+        "($T<N + 2*padding_width, D_1, ..., D_n>$).")
     .Output(
         1,
         "lengths_out",
diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
index ae012a04bf0..959a22d1a89 100644
--- a/cmake/Utils.cmake
+++ b/cmake/Utils.cmake
@@ -276,10 +276,11 @@ function(target_enable_style_warnings TARGET)
             -Wmissing-include-dirs
             -Woverloaded-virtual
             -Wredundant-decls
+            -Wno-shadow
             -Wsign-promo
             -Wstrict-overflow=5
             -fdiagnostics-show-option
-            -Wconversion
+            -Wno-conversion
             -Wpedantic
             -Wundef
             )
@@ -301,5 +302,8 @@ function(target_enable_style_warnings TARGET)
       list(APPEND WARNING_OPTIONS "-Werror")
     endif()
   endif()
+  if(APPLE)
+    set(WARNING_OPTIONS -Wno-gnu-zero-variadic-macro-arguments)
+  endif()
   target_compile_options(${TARGET} PRIVATE ${WARNING_OPTIONS})
 endfunction()