Merge branch 'feature/fix_compile_error' into feature/complete_variable_bind

8 years ago · 4be2f44c68
parent 49ca0b4831 92add2a29b
commit 4be2f44c68
1 changed files with 1 additions and 1 deletions
--- a/paddle/operators/adamax_op.cc
+++ b/paddle/operators/adamax_op.cc
@ -22,7 +22,7 @@ class AdamaxOp : public framework::OperatorWithKernel {
  using framework::OperatorWithKernel::OperatorWithKernel;

 protected:
-  void InferShape(framework::InferShapeContextBase *ctx) const override {
+  void InferShape(framework::InferShapeContext *ctx) const override {
    PADDLE_ENFORCE(ctx->HasInput("Param"),
                   "Input(Param) of AdamaxOp should not be null.");
    PADDLE_ENFORCE(ctx->HasInput("Grad"),