fix merge conflict

8 years ago · 5993497cb7
parent 571f43ca39
commit 5993497cb7
1 changed files with 2 additions and 1 deletions
--- a/paddle/operators/sequence_pool_op.h
+++ b/paddle/operators/sequence_pool_op.h
@ -111,7 +111,8 @@ class SequencePoolGradKernel : public framework::OpKernel<T> {
    in_g->mutable_data<T>(context.GetPlace());
    if (strategy == LAST || strategy == FIRST) {
      // set X@Grad be zero at first when strategy is LAST/FIRST
-      math::SetConstant<Place, T>(context.device_context(), in_g, 0);
+      math::SetConstant<Place, T> functor;
+      functor(context.device_context(), in_g, 0);
    }
    auto place = context.GetEigenDevice<Place>();
    for (int i = 0; i < static_cast<int>(lod.size()) - 1; ++i) {