From fc442ec6eca195739863c504e9c58e98708e9db1 Mon Sep 17 00:00:00 2001 From: superjomn Date: Tue, 14 May 2019 12:47:49 +0800 Subject: [PATCH] reformat for cpplint test=develop --- paddle/fluid/lite/api/cxx_api.h | 4 ++++ paddle/fluid/lite/core/mir/generate_program_pass.h | 3 +++ paddle/fluid/lite/core/mir/graph_visualize_pass.h | 2 ++ paddle/fluid/lite/core/mir/pass_manager.h | 2 +- paddle/fluid/lite/core/mir/ssa_graph.h | 2 ++ paddle/fluid/lite/core/mir/ssa_graph_test.cc | 1 + paddle/fluid/lite/core/mir/static_kernel_pick_pass.cc | 1 + paddle/fluid/lite/core/mir/static_kernel_pick_pass.h | 1 + .../fluid/lite/core/mir/type_target_transform_pass.h | 1 + paddle/fluid/lite/core/op_lite.h | 8 ++++++-- paddle/fluid/lite/core/op_registry.h | 1 + paddle/fluid/lite/core/target_wrapper.h | 1 + paddle/fluid/lite/core/type_system.h | 8 ++++---- paddle/fluid/lite/operators/fc_op.h | 2 +- paddle/fluid/lite/operators/op_params.h | 1 + paddle/fluid/lite/utils/logging.h | 10 +++++----- 16 files changed, 35 insertions(+), 13 deletions(-) diff --git a/paddle/fluid/lite/api/cxx_api.h b/paddle/fluid/lite/api/cxx_api.h index 5d6e503949c..d9c0c4a195a 100644 --- a/paddle/fluid/lite/api/cxx_api.h +++ b/paddle/fluid/lite/api/cxx_api.h @@ -13,6 +13,10 @@ // limitations under the License. #pragma once +#include +#include +#include +#include #include "paddle/fluid/lite/core/op_lite.h" #include "paddle/fluid/lite/core/optimizer.h" #include "paddle/fluid/lite/core/program.h" diff --git a/paddle/fluid/lite/core/mir/generate_program_pass.h b/paddle/fluid/lite/core/mir/generate_program_pass.h index 0ef358ec233..498fe01bb6e 100644 --- a/paddle/fluid/lite/core/mir/generate_program_pass.h +++ b/paddle/fluid/lite/core/mir/generate_program_pass.h @@ -15,6 +15,9 @@ #pragma once #include +#include +#include +#include #include "paddle/fluid/lite/core/kernel.h" #include "paddle/fluid/lite/core/mir/pass.h" diff --git a/paddle/fluid/lite/core/mir/graph_visualize_pass.h b/paddle/fluid/lite/core/mir/graph_visualize_pass.h index f11cfaabf4a..f5f17dd98fe 100644 --- a/paddle/fluid/lite/core/mir/graph_visualize_pass.h +++ b/paddle/fluid/lite/core/mir/graph_visualize_pass.h @@ -14,6 +14,8 @@ #pragma once +#include +#include #include "paddle/fluid/inference/analysis/dot.h" #include "paddle/fluid/lite/core/mir/pass.h" diff --git a/paddle/fluid/lite/core/mir/pass_manager.h b/paddle/fluid/lite/core/mir/pass_manager.h index 901702285ac..2fc4654d920 100644 --- a/paddle/fluid/lite/core/mir/pass_manager.h +++ b/paddle/fluid/lite/core/mir/pass_manager.h @@ -15,8 +15,8 @@ #pragma once #include #include +#include #include - #include "paddle/fluid/lite/core/mir/pass.h" namespace paddle { diff --git a/paddle/fluid/lite/core/mir/ssa_graph.h b/paddle/fluid/lite/core/mir/ssa_graph.h index bcdc963aff6..73a1fd36e9f 100644 --- a/paddle/fluid/lite/core/mir/ssa_graph.h +++ b/paddle/fluid/lite/core/mir/ssa_graph.h @@ -16,6 +16,8 @@ #include #include +#include +#include #include #include #include diff --git a/paddle/fluid/lite/core/mir/ssa_graph_test.cc b/paddle/fluid/lite/core/mir/ssa_graph_test.cc index f24ab854d38..520fcf6e750 100644 --- a/paddle/fluid/lite/core/mir/ssa_graph_test.cc +++ b/paddle/fluid/lite/core/mir/ssa_graph_test.cc @@ -14,6 +14,7 @@ #include "paddle/fluid/lite/core/mir/ssa_graph.h" #include +#include #include "paddle/fluid/framework/program_desc.h" #include "paddle/fluid/lite/core/mir/graph_visualize_pass.h" #include "paddle/fluid/lite/core/mir/passes.h" diff --git a/paddle/fluid/lite/core/mir/static_kernel_pick_pass.cc b/paddle/fluid/lite/core/mir/static_kernel_pick_pass.cc index 3709094ed29..a3599664438 100644 --- a/paddle/fluid/lite/core/mir/static_kernel_pick_pass.cc +++ b/paddle/fluid/lite/core/mir/static_kernel_pick_pass.cc @@ -14,6 +14,7 @@ #include "paddle/fluid/lite/core/mir/static_kernel_pick_pass.h" #include +#include #include #include #include "paddle/fluid/lite/core/mir/pass_registry.h" diff --git a/paddle/fluid/lite/core/mir/static_kernel_pick_pass.h b/paddle/fluid/lite/core/mir/static_kernel_pick_pass.h index 52d5dd08d26..20d2c7d6ff4 100644 --- a/paddle/fluid/lite/core/mir/static_kernel_pick_pass.h +++ b/paddle/fluid/lite/core/mir/static_kernel_pick_pass.h @@ -15,6 +15,7 @@ #pragma once #include +#include #include "paddle/fluid/lite/core/mir/pass.h" #include "paddle/fluid/lite/core/types.h" diff --git a/paddle/fluid/lite/core/mir/type_target_transform_pass.h b/paddle/fluid/lite/core/mir/type_target_transform_pass.h index 411090219fb..f8557f44e3c 100644 --- a/paddle/fluid/lite/core/mir/type_target_transform_pass.h +++ b/paddle/fluid/lite/core/mir/type_target_transform_pass.h @@ -14,6 +14,7 @@ #pragma once +#include #include #include #include "paddle/fluid/lite/core/mir/pass.h" diff --git a/paddle/fluid/lite/core/op_lite.h b/paddle/fluid/lite/core/op_lite.h index 4fb3c1c7636..9230ec8c954 100644 --- a/paddle/fluid/lite/core/op_lite.h +++ b/paddle/fluid/lite/core/op_lite.h @@ -14,9 +14,12 @@ #pragma once +#include #include #include #include +#include +#include #include "paddle/fluid/lite/core/context.h" #include "paddle/fluid/lite/core/kernel.h" #include "paddle/fluid/lite/core/scope.h" @@ -49,8 +52,9 @@ class OpInfo; class OpLite : public Registry { public: OpLite() = default; - OpLite(const std::string &type) : op_type_(type) {} - OpLite(const std::vector &valid_places) : valid_places_(valid_places) { + explicit OpLite(const std::string &type) : op_type_(type) {} + explicit OpLite(const std::vector &valid_places) + : valid_places_(valid_places) { LOG(INFO) << "valid places " << valid_places.size(); } diff --git a/paddle/fluid/lite/core/op_registry.h b/paddle/fluid/lite/core/op_registry.h index 2321e3a250e..db08e47a35d 100644 --- a/paddle/fluid/lite/core/op_registry.h +++ b/paddle/fluid/lite/core/op_registry.h @@ -13,6 +13,7 @@ // limitations under the License. #pragma once +#include #include #include #include diff --git a/paddle/fluid/lite/core/target_wrapper.h b/paddle/fluid/lite/core/target_wrapper.h index cf0632d3879..df21c406e83 100644 --- a/paddle/fluid/lite/core/target_wrapper.h +++ b/paddle/fluid/lite/core/target_wrapper.h @@ -15,6 +15,7 @@ #pragma once #include #include +#include #include "paddle/fluid/lite/utils/cp_logging.h" #ifdef LITE_WITH_CUDA #include diff --git a/paddle/fluid/lite/core/type_system.h b/paddle/fluid/lite/core/type_system.h index 9701fddccb5..b83eca233bf 100644 --- a/paddle/fluid/lite/core/type_system.h +++ b/paddle/fluid/lite/core/type_system.h @@ -104,7 +104,7 @@ class DataType { protected: // Can only extended by subclass. - DataType(ID id) : id_(id) {} + explicit DataType(ID id) : id_(id) {} ID id_{ID::Unsupported}; }; @@ -141,7 +141,7 @@ class Type : public DataType { TargetType target() const { return place_.target; } PrecisionType precision() const { return place_.precision; } DataLayoutType layout() const { return place_.layout; } - short device() const { return place().device; } + int16_t device() const { return place().device; } const Place& place() const { return place_; } const std::string& name() const { return name_; } @@ -156,7 +156,7 @@ class Type : public DataType { /// One should avoid using this construct. Type(ID id, const std::string& name, TargetType target = TargetType::kHost, PrecisionType precision = PrecisionType::kFloat, - DataLayoutType layout = DataLayoutType::kNCHW, short device = 0) + DataLayoutType layout = DataLayoutType::kNCHW, int16_t device = 0) : DataType(id), place_{target, precision, layout, device}, name_(name) {} Place place_; @@ -212,7 +212,7 @@ struct ParamType { const Type* type; ParamType() = default; - ParamType(const Type* type) : type(type) {} + explicit ParamType(const Type* type) : type(type) {} std::string DebugString() const { return type->name(); } }; diff --git a/paddle/fluid/lite/operators/fc_op.h b/paddle/fluid/lite/operators/fc_op.h index c85bb0e8ee2..a6043fa7b1f 100644 --- a/paddle/fluid/lite/operators/fc_op.h +++ b/paddle/fluid/lite/operators/fc_op.h @@ -31,7 +31,7 @@ class FcOpLite : public OpLite { public: FcOpLite() {} - FcOpLite(const std::string &type) : OpLite(type) {} + explicit FcOpLite(const std::string &type) : OpLite(type) {} bool CheckShape() const override; diff --git a/paddle/fluid/lite/operators/op_params.h b/paddle/fluid/lite/operators/op_params.h index ed37d6cef16..a080bafead6 100644 --- a/paddle/fluid/lite/operators/op_params.h +++ b/paddle/fluid/lite/operators/op_params.h @@ -13,6 +13,7 @@ // limitations under the License. #pragma once +#include #include "paddle/fluid/lite/core/compatible_tensor.h" #include "paddle/fluid/lite/utils/all.h" diff --git a/paddle/fluid/lite/utils/logging.h b/paddle/fluid/lite/utils/logging.h index 9c2b6903e49..9d670fe38f6 100644 --- a/paddle/fluid/lite/utils/logging.h +++ b/paddle/fluid/lite/utils/logging.h @@ -22,6 +22,8 @@ #include #include +// NOLINTFILE() + #ifdef LITE_WITH_LIGHT_WEIGHT_FRAMEWORK // LOG() @@ -34,11 +36,9 @@ #define VLOG(level) LOG_INFO.stream() // CHECK() -// NOLINT -#define CHECK(x) \ - if (!(x)) \ - paddle::lite::LogMessageFatal(__FILE__, __LINE__).stream() \ - << "Check failed: " #x << ": " +// clang-format off +#define CHECK(x) if (!(x)) paddle::lite::LogMessageFatal(__FILE__, __LINE__).stream() << "Check failed: " #x << ": " // NOLINT(*) +// clang-format on #define CHECK_EQ(x, y) _CHECK_BINARY(x, ==, y) #define CHECK_LT(x, y) _CHECK_BINARY(x, <, y) #define CHECK_LE(x, y) _CHECK_BINARY(x, <=, y) -- GitLab