From 876e9d2bc26da5959ea7f2db17b96d9868172100 Mon Sep 17 00:00:00 2001
From: dongzhihong <dzhwinter@gmail.com>
Date: Mon, 7 Aug 2017 17:37:36 +0800
Subject: [PATCH] "sigmoid confict resolved"

---
 paddle/operators/sigmoid_op.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/paddle/operators/sigmoid_op.h b/paddle/operators/sigmoid_op.h
index 611c23667..7af879b20 100644
--- a/paddle/operators/sigmoid_op.h
+++ b/paddle/operators/sigmoid_op.h
@@ -42,9 +42,9 @@ class SigmoidKernel : public framework::OpKernel {
 };
 
 template <typename Place, typename T>
-class SigmoidGradKernel : public OpKernel {
+class SigmoidGradKernel : public framework::OpKernel {
  public:
-  void Compute(const ExecutionContext& context) const override {
+  void Compute(const framework::ExecutionContext& context) const override {
     auto Y_t = context.Input<Tensor>("Y");
     auto dY_t = context.Input<Tensor>(framework::GradVarName("Y"));
     auto dX_t = context.Output<Tensor>(framework::GradVarName("X"));
-- 
GitLab