Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion caffe2/core/graph.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ struct Graph {
*/
void DeactivateSubgraph(std::vector<int> subgraph);

const size_t size() const {
size_t size() const {
return nodes_.size();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class BasicBlock {
return Instructions;
}

const bool hasInstruction(NodeRef instr) const {
bool hasInstruction(NodeRef instr) const {
return Nodes.hasNode(instr);
}

Expand Down
2 changes: 1 addition & 1 deletion caffe2/share/contrib/nnpack/conv_op.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down