From 73a9f0f25d86b46fa74fc574e2f443d644bcfb88 Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Mon, 17 Jul 2017 19:44:12 +0800
Subject: [PATCH] Merge develop

---
 paddle/operators/mul_op.h         | 3 ++-
 paddle/operators/rowwise_add_op.h | 2 +-
 paddle/operators/sigmoid_op.h     | 2 +-
 paddle/operators/softmax_op.h     | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/paddle/operators/mul_op.h b/paddle/operators/mul_op.h
index ed8d26e1367..ce8a0169e0c 100644
--- a/paddle/operators/mul_op.h
+++ b/paddle/operators/mul_op.h
@@ -13,6 +13,7 @@
    limitations under the License. */
 
 #pragma once
+
 #include <glog/logging.h>
 #include <paddle/framework/operator.h>
 
@@ -22,7 +23,7 @@ namespace operators {
 template <typename Place>
 class MulKernel : public framework::OpKernel {
 public:
-  void Compute(const KernelContext &context) const override {
+  void Compute(const framework::KernelContext &context) const override {
     LOG(INFO) << "Mul kernel in " << typeid(Place).name();
   }
 };
diff --git a/paddle/operators/rowwise_add_op.h b/paddle/operators/rowwise_add_op.h
index 3dfde93ba2d..35f43e6376b 100644
--- a/paddle/operators/rowwise_add_op.h
+++ b/paddle/operators/rowwise_add_op.h
@@ -22,7 +22,7 @@ namespace operators {
 template <typename Place>
 class RowWiseAddKernel : public framework::OpKernel {
 public:
-  void Compute(const KernelContext &context) const override {
+  void Compute(const framework::KernelContext &context) const override {
     LOG(INFO) << "RowWiseAdd kernel in " << typeid(Place).name();
   }
 };
diff --git a/paddle/operators/sigmoid_op.h b/paddle/operators/sigmoid_op.h
index 191aa42e4a6..42173343f3e 100644
--- a/paddle/operators/sigmoid_op.h
+++ b/paddle/operators/sigmoid_op.h
@@ -23,7 +23,7 @@ namespace operators {
 template <typename Place>
 class SigmoidKernel : public framework::OpKernel {
 public:
-  void Compute(const KernelContext &context) const override {
+  void Compute(const framework::KernelContext &context) const override {
     LOG(INFO) << "Sigmoid kernel in " << typeid(Place).name();
   }
 };
diff --git a/paddle/operators/softmax_op.h b/paddle/operators/softmax_op.h
index fe97c9aafe4..74e9e2786b1 100644
--- a/paddle/operators/softmax_op.h
+++ b/paddle/operators/softmax_op.h
@@ -23,7 +23,7 @@ namespace operators {
 template <typename Place>
 class SoftmaxKernel : public framework::OpKernel {
 public:
-  void Compute(const KernelContext &context) const override {
+  void Compute(const framework::KernelContext &context) const override {
     LOG(INFO) << "Softmax kernel in " << typeid(Place).name();
   }
 };
-- 
GitLab