From 709a9edd466e125ca9ec14ad3421ccf5236e5023 Mon Sep 17 00:00:00 2001
From: ktlichkid <liqingsheng@baidu.com>
Date: Fri, 27 Apr 2018 11:19:54 +0800
Subject: [PATCH] Code clean up

---
 paddle/fluid/operators/beam_search_op.cc |  5 ---
 paddle/fluid/operators/beam_search_op.h  | 56 ------------------------
 2 files changed, 61 deletions(-)

diff --git a/paddle/fluid/operators/beam_search_op.cc b/paddle/fluid/operators/beam_search_op.cc
index a27d197d1c2..cff097cca13 100644
--- a/paddle/fluid/operators/beam_search_op.cc
+++ b/paddle/fluid/operators/beam_search_op.cc
@@ -21,8 +21,6 @@ limitations under the License. */
 #include "paddle/fluid/framework/lod_tensor.h"
 #include "paddle/fluid/framework/op_registry.h"
 
-#include <iostream>
-
 namespace paddle {
 namespace operators {
 
@@ -239,17 +237,14 @@ class BeamSearchOp : public framework::OperatorWithKernel {
       PADDLE_ENFORCE(ctx->HasOutput(arg),
                      "BeamSearch need output argument '%s'", arg);
     }
-    std::cout << "Done Infer Shape\n";
   }
 
   framework::OpKernelType GetExpectedKernelType(
       const framework::ExecutionContext &ctx) const override {
-    std::cout << "Get Expected type 1\n";
     framework::OpKernelType kt = framework::OpKernelType(
         framework::ToDataType(
             ctx.Input<framework::LoDTensor>("pre_ids")->type()),
         platform::CPUPlace());
-    std::cout << "Get Expected type 2\n";
     return kt;
   }
 };
diff --git a/paddle/fluid/operators/beam_search_op.h b/paddle/fluid/operators/beam_search_op.h
index 55bf48cb625..97b039038d1 100644
--- a/paddle/fluid/operators/beam_search_op.h
+++ b/paddle/fluid/operators/beam_search_op.h
@@ -23,8 +23,6 @@ limitations under the License. */
 #include "paddle/fluid/framework/lod_tensor.h"
 #include "paddle/fluid/framework/operator.h"
 
-#include <iostream>
-
 namespace paddle {
 namespace operators {
 
@@ -198,79 +196,25 @@ template <typename DeviceContext, typename T>
 class BeamSearchOpKernel : public framework::OpKernel<T> {
  public:
   void Compute(const framework::ExecutionContext& context) const override {
-    std::cout << "Compute 1\n";
     auto ids_var = context.Input<framework::LoDTensor>("ids");
-    std::cout << "Compute 2\n";
     auto scores_var = context.Input<framework::LoDTensor>("scores");
-    std::cout << "Compute 3\n";
     auto pre_ids_var = context.Input<framework::LoDTensor>("pre_ids");
-    std::cout << "Compute 4\n";
     PADDLE_ENFORCE_NOT_NULL(ids_var);
-    std::cout << "Compute 5\n";
     PADDLE_ENFORCE_NOT_NULL(scores_var);
-    std::cout << "Compute 6\n";
     PADDLE_ENFORCE_NOT_NULL(pre_ids_var);
-    std::cout << "Compute 7\n";
-    // auto& ids = ids_var->Get<framework::LoDTensor>();
-    // auto& scores = scores_var->Get<framework::LoDTensor>();
-    // auto& pre_ids = pre_ids_var->Get<framework::LoDTensor>();
 
     size_t level = context.Attr<int>("level");
-    std::cout << "Compute 8\n";
     size_t beam_size = context.Attr<int>("beam_size");
-    std::cout << "Compute 9\n";
     int end_id = context.Attr<int>("end_id");
-    std::cout << "Compute 10\n";
     BeamSearch alg(*ids_var, *scores_var, level, beam_size, end_id);
-    std::cout << "Compute 11\n";
     auto selected_ids_var =
         context.Output<framework::LoDTensor>("selected_ids");
-    std::cout << "Compute 12\n";
     auto selected_scores_var =
         context.Output<framework::LoDTensor>("selected_scores");
-    std::cout << "Compute 13\n";
     PADDLE_ENFORCE_NOT_NULL(selected_ids_var);
-    std::cout << "Compute 14\n";
     PADDLE_ENFORCE_NOT_NULL(selected_scores_var);
-    std::cout << "Compute 15\n";
-    // auto& selected_ids_tensor =
-    //    *selected_ids_var->GetMutable<framework::LoDTensor>();
-    // auto& selected_scores_tensor =
-    //    *selected_scores_var->GetMutable<framework::LoDTensor>();
     alg(*pre_ids_var, selected_ids_var, selected_scores_var);
-    std::cout << "Compute 16\n";
   }
 };
-
-/*
-  void RunImpl(const framework::Scope& scope,
-               const platform::Place& dev_place) const override {
-    auto ids_var = scope.FindVar(Input("ids"));
-    auto scores_var = scope.FindVar(Input("scores"));
-    auto pre_ids_var = scope.FindVar(Input("pre_ids"));
-    PADDLE_ENFORCE_NOT_NULL(ids_var);
-    PADDLE_ENFORCE_NOT_NULL(scores_var);
-    PADDLE_ENFORCE_NOT_NULL(pre_ids_var);
-
-    auto& ids = ids_var->Get<framework::LoDTensor>();
-    auto& scores = scores_var->Get<framework::LoDTensor>();
-    auto& pre_ids = pre_ids_var->Get<framework::LoDTensor>();
-    size_t level = Attr<int>("level");
-    size_t beam_size = Attr<int>("beam_size");
-    int end_id = Attr<int>("end_id");
-    BeamSearch alg(ids, scores, level, beam_size, end_id);
-
-    auto selected_ids_var = scope.FindVar(Output("selected_ids"));
-    auto selected_scores_var = scope.FindVar(Output("selected_scores"));
-    PADDLE_ENFORCE_NOT_NULL(selected_ids_var);
-    PADDLE_ENFORCE_NOT_NULL(selected_scores_var);
-    auto& selected_ids_tensor =
-        *selected_ids_var->GetMutable<framework::LoDTensor>();
-    auto& selected_scores_tensor =
-        *selected_scores_var->GetMutable<framework::LoDTensor>();
-    alg(pre_ids, &selected_ids_tensor, &selected_scores_tensor);
-  }
-*/
-
 }  // namespace operators
 }  // namespace paddle
-- 
GitLab