Merge develop

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();
   }
 };

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();
   }
 };

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();
   }
 };

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();
   }
 };