Fix and ignore some warnings (#8081)

bddppq · web-flow · commit db5bc715623e · 2018-06-04T01:01:59.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -213,6 +213,9 @@ if(NOT MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option")
   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-variable")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function")
   if ($ENV{WERROR})
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
   endif($ENV{WERROR})
diff --git a/caffe2/core/graph.h b/caffe2/core/graph.h
@@ -102,7 +102,7 @@ struct Graph {
    */
   void DeactivateSubgraph(std::vector<int> subgraph);
 
-  const size_t size() const {
+  size_t size() const {
     return nodes_.size();
   }
 
diff --git a/caffe2/core/nomnigraph/include/nomnigraph/Representations/ControlFlow.h b/caffe2/core/nomnigraph/include/nomnigraph/Representations/ControlFlow.h
@@ -49,7 +49,7 @@ class BasicBlock {
     return Instructions;
   }
 
-  const bool hasInstruction(NodeRef instr) const {
+  bool hasInstruction(NodeRef instr) const {
     return Nodes.hasNode(instr);
   }
 
diff --git a/caffe2/share/contrib/nnpack/conv_op.cc b/caffe2/share/contrib/nnpack/conv_op.cc
@@ -35,8 +35,8 @@ class NNPACKConvOp final : public ConvPoolOpBase<CPUContext> {
   NNPACKConvOp(const OperatorDef& operator_def, Workspace* ws)
       : ConvPoolOpBase<CPUContext>(operator_def, ws),
         algorithm_(getConvolutionAlgorithm()),
-        transformStrategy_(getConvolutionTransformStrategy()),
         activation_(getActivationType()),
+        transformStrategy_(getConvolutionTransformStrategy()),
         ws_(ws) {
     OPERATOR_NEEDS_FEATURE(
         this->order_ == StorageOrder::NCHW,

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ struct Graph {`
`102`	`102`	`*/`
`103`	`103`	`void DeactivateSubgraph(std::vector<int> subgraph);`
`104`	`104`
`105`		`- const size_t size() const {`
	`105`	`+ size_t size() const {`
`106`	`106`	`return nodes_.size();`
`107`	`107`	`}`
`108`	`108`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class BasicBlock {`
`49`	`49`	`return Instructions;`
`50`	`50`	`}`
`51`	`51`
`52`		`- const bool hasInstruction(NodeRef instr) const {`
	`52`	`+ bool hasInstruction(NodeRef instr) const {`
`53`	`53`	`return Nodes.hasNode(instr);`
`54`	`54`	`}`
`55`	`55`