From 8113de942547d20f923b5af825eddcef99249d90 Mon Sep 17 00:00:00 2001 From: Abhinav Arora <abhinavarora28@gmail.com> Date: Thu, 19 Apr 2018 14:54:51 -0700 Subject: [PATCH] Fix more CPPLint errors (#10069) --- paddle/fluid/operators/channel_recv_op.cc | 8 ++++---- paddle/fluid/operators/conditional_block_op.cc | 2 +- paddle/fluid/operators/expand_op.cc | 2 -- paddle/fluid/operators/go_op.cc | 2 +- paddle/fluid/operators/increment_op.cc | 1 + 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/paddle/fluid/operators/channel_recv_op.cc b/paddle/fluid/operators/channel_recv_op.cc index 844b3ae3b7..25c5c3c95e 100644 --- a/paddle/fluid/operators/channel_recv_op.cc +++ b/paddle/fluid/operators/channel_recv_op.cc @@ -29,11 +29,11 @@ namespace paddle { namespace operators { void SetReceiveStatus(const platform::Place &dev_place, - framework::Variable &status_var, bool status) { + framework::Variable *status_var, bool status) { auto cpu = platform::CPUPlace(); auto status_tensor = - status_var.GetMutable<framework::LoDTensor>()->mutable_data<bool>({1}, - cpu); + status_var->GetMutable<framework::LoDTensor>()->mutable_data<bool>({1}, + cpu); status_tensor[0] = status; } @@ -66,7 +66,7 @@ class ChannelRecvOp : public framework::OperatorBase { bool ok = concurrency::ChannelReceive(ch, output_var); // Set the status output of the `ChannelReceive` call. - SetReceiveStatus(dev_place, *scope.FindVar(Output(Status)), ok); + SetReceiveStatus(dev_place, scope.FindVar(Output(Status)), ok); } }; diff --git a/paddle/fluid/operators/conditional_block_op.cc b/paddle/fluid/operators/conditional_block_op.cc index bff2c34ec8..137fee99e8 100644 --- a/paddle/fluid/operators/conditional_block_op.cc +++ b/paddle/fluid/operators/conditional_block_op.cc @@ -47,7 +47,7 @@ class ConditionalOp : public framework::OperatorBase { if (!(ips.size() == 1UL && ips[0]->IsInitialized())) { PADDLE_THROW("should have one initialized input as condition"); } - if (!(ips[0]->type().hash_code() == typeid(bool).hash_code() && + if (!(ips[0]->type().hash_code() == typeid(bool).hash_code() && // NOLINT ips[0]->numel() == 1)) { PADDLE_THROW( "condition input's data type should be bool, " diff --git a/paddle/fluid/operators/expand_op.cc b/paddle/fluid/operators/expand_op.cc index 9c71ee6d3b..4ae91d074d 100644 --- a/paddle/fluid/operators/expand_op.cc +++ b/paddle/fluid/operators/expand_op.cc @@ -15,8 +15,6 @@ limitations under the License. */ #include "paddle/fluid/operators/expand_op.h" #include <vector> -#include <vector> - namespace paddle { namespace operators { diff --git a/paddle/fluid/operators/go_op.cc b/paddle/fluid/operators/go_op.cc index 58fe324462..b8e1556c23 100644 --- a/paddle/fluid/operators/go_op.cc +++ b/paddle/fluid/operators/go_op.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include <thread> +#include <thread> // NOLINT #include <vector> #include "paddle/fluid/framework/executor.h" #include "paddle/fluid/framework/lod_tensor.h" diff --git a/paddle/fluid/operators/increment_op.cc b/paddle/fluid/operators/increment_op.cc index 5d8710a9b3..d8c97b27b3 100644 --- a/paddle/fluid/operators/increment_op.cc +++ b/paddle/fluid/operators/increment_op.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "paddle/fluid/operators/increment_op.h" +#include <string> namespace paddle { namespace operators { -- GitLab