From 92baa885a0bd6f752fbda290aa69b698b90bd53a Mon Sep 17 00:00:00 2001
From: wanghaoshuang <wanghaoshuang@baidu.com>
Date: Wed, 17 Jan 2018 09:56:17 +0800
Subject: [PATCH] Fix code style

---
 paddle/operators/block_expand_op.cc | 2 --
 paddle/operators/block_expand_op.h  | 7 ++++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/paddle/operators/block_expand_op.cc b/paddle/operators/block_expand_op.cc
index 317a43bb7..bef82183b 100644
--- a/paddle/operators/block_expand_op.cc
+++ b/paddle/operators/block_expand_op.cc
@@ -23,7 +23,6 @@ class BlockExpandOp : public framework::OperatorWithKernel {
 
  protected:
   void InferShape(framework::InferShapeContext* ctx) const override {
-    using namespace framework;
     PADDLE_ENFORCE(ctx->HasInput("X"),
                    "Input of BlockExpandOp should not be null.");
     PADDLE_ENFORCE(ctx->HasOutput("Out"),
@@ -142,7 +141,6 @@ class BlockExpandGradOp : public framework::OperatorWithKernel {
 
  protected:
   void InferShape(framework::InferShapeContext* ctx) const override {
-    using namespace framework;
     PADDLE_ENFORCE(ctx->HasInput("X"), "Input(X) should not be null");
     PADDLE_ENFORCE(ctx->HasInput(framework::GradVarName("Out")),
                    "Input(Out@GRAD) shouldn't be null.");
diff --git a/paddle/operators/block_expand_op.h b/paddle/operators/block_expand_op.h
index 022dc3a12..2e4f0cb6f 100644
--- a/paddle/operators/block_expand_op.h
+++ b/paddle/operators/block_expand_op.h
@@ -23,6 +23,9 @@
 namespace paddle {
 namespace operators {
 
+using Tensor = framework::Tensor;
+using LoDTensor = framework::LoDTensor;
+
 inline int get_output_size(int img_size, int block_size, int stride,
                            int padding) {
   return (1 + (img_size + 2 * padding - block_size + stride - 1) / stride);
@@ -32,7 +35,6 @@ template <typename Place, typename T>
 class BlockExpandKernel : public framework::OpKernel<T> {
  public:
   void Compute(const framework::ExecutionContext& ctx) const override {
-    using namespace framework;
     const Tensor* in = ctx.Input<Tensor>("X");
     LoDTensor* out = ctx.Output<LoDTensor>("Out");
     out->mutable_data<T>(ctx.GetPlace());
@@ -89,11 +91,10 @@ template <typename Place, typename T>
 class BlockExpandGradKernel : public framework::OpKernel<T> {
  public:
   void Compute(const framework::ExecutionContext& ctx) const override {
-    using namespace framework;
     auto* in = ctx.Input<Tensor>("X");
     Tensor* d_out =
         const_cast<Tensor*>(ctx.Input<Tensor>(framework::GradVarName("Out")));
-    auto* d_x = ctx.Output<Tensor>(GradVarName("X"));
+    auto* d_x = ctx.Output<Tensor>(framework::GradVarName("X"));
     d_x->mutable_data<T>(ctx.GetPlace());
 
     auto x_v = framework::EigenVector<T>::Flatten(*d_x);
-- 
GitLab