diff --git a/paddle/fluid/eager/legacy/infer_shape_context.h b/paddle/fluid/eager/legacy/infer_shape_context.h index bf8ebed36a7491715d9fb972fc559e7bf81a06a2..7a05f6a9b35814a9dcd8907423ae535d2a0879df 100644 --- a/paddle/fluid/eager/legacy/infer_shape_context.h +++ b/paddle/fluid/eager/legacy/infer_shape_context.h @@ -216,13 +216,13 @@ class EagerInferShapeContext : public paddle::framework::InferShapeContext { // TODO(paddle-dev): Can this be template? std::vector GetInputVarPtrs( - const std::string& name) override { + const std::string& name) const override { PADDLE_THROW(paddle::platform::errors::PermissionDenied( "GetInputVarPtrs not support in dygraph runtime context")); } std::vector GetOutputVarPtrs( - const std::string& name) override { + const std::string& name) const override { PADDLE_THROW(paddle::platform::errors::PermissionDenied( "GetOutputVarPtrs not support in dygraph runtime context")); } diff --git a/paddle/fluid/framework/new_executor/new_executor_defs.cc b/paddle/fluid/framework/new_executor/new_executor_defs.cc index 0d7c5187e91131f5b2a4e926c0258e19b710b009..73f16fe3e9cc79c0ff3481f52bc45bcae80c9da9 100644 --- a/paddle/fluid/framework/new_executor/new_executor_defs.cc +++ b/paddle/fluid/framework/new_executor/new_executor_defs.cc @@ -309,7 +309,7 @@ bool InterpretercoreInferShapeContext::IsRuntime() const { return true; } // TODO(paddle-dev): Can this be template? std::vector InterpretercoreInferShapeContext::GetInputVarPtrs( - const std::string& name) { + const std::string& name) const { const std::vector& vars = InputVars(name); std::vector res; res.reserve(vars.size()); @@ -318,7 +318,8 @@ std::vector InterpretercoreInferShapeContext::GetInputVarPtrs( } std::vector -InterpretercoreInferShapeContext::GetOutputVarPtrs(const std::string& name) { +InterpretercoreInferShapeContext::GetOutputVarPtrs( + const std::string& name) const { const std::vector& vars = OutputVars(name); std::vector res; res.reserve(vars.size()); diff --git a/paddle/fluid/framework/new_executor/new_executor_defs.h b/paddle/fluid/framework/new_executor/new_executor_defs.h index 76071f2181964c1b8ce59af74aa59d9723f77f27..d691a75a6d35b46563564bdabb2e7599b3d165aa 100644 --- a/paddle/fluid/framework/new_executor/new_executor_defs.h +++ b/paddle/fluid/framework/new_executor/new_executor_defs.h @@ -86,10 +86,10 @@ class InterpretercoreInferShapeContext : public InferShapeContext { // TODO(paddle-dev): Can this be template? std::vector GetInputVarPtrs( - const std::string& name) override; + const std::string& name) const override; std::vector GetOutputVarPtrs( - const std::string& name) override; + const std::string& name) const override; DDim GetInputDim(const std::string& name) const override; diff --git a/paddle/fluid/framework/op_desc.cc b/paddle/fluid/framework/op_desc.cc index 2c5fcf28106a3c65dda794d0205d84a4d3c6cc9b..670a269391a2ffd08e46bae4feb3795474a16959 100644 --- a/paddle/fluid/framework/op_desc.cc +++ b/paddle/fluid/framework/op_desc.cc @@ -200,7 +200,7 @@ class CompileTimeInferShapeContext : public InferShapeContext { } std::vector GetInputVarPtrs( - const std::string &name) override { + const std::string &name) const override { const std::vector arg_names = Inputs(name); std::vector res; res.reserve(arg_names.size()); @@ -212,7 +212,7 @@ class CompileTimeInferShapeContext : public InferShapeContext { } std::vector GetOutputVarPtrs( - const std::string &name) override { + const std::string &name) const override { const std::vector arg_names = Outputs(name); std::vector res; res.reserve(arg_names.size()); diff --git a/paddle/fluid/framework/operator.cc b/paddle/fluid/framework/operator.cc index 3b41eb6c1938398b8a444fd1c4704e5fc858a547..2f46ef9d032ea79c908bcb02a5aa0b4186ac38d1 100644 --- a/paddle/fluid/framework/operator.cc +++ b/paddle/fluid/framework/operator.cc @@ -871,7 +871,7 @@ class RuntimeInferShapeContext : public InferShapeContext { // TODO(paddle-dev): Can this be template? std::vector GetInputVarPtrs( - const std::string& name) override { + const std::string& name) const override { const std::vector& vars = InputVars(name); std::vector res; res.reserve(vars.size()); @@ -880,7 +880,7 @@ class RuntimeInferShapeContext : public InferShapeContext { } std::vector GetOutputVarPtrs( - const std::string& name) override { + const std::string& name) const override { const std::vector& vars = OutputVars(name); std::vector res; res.reserve(vars.size()); diff --git a/paddle/fluid/framework/shape_inference.h b/paddle/fluid/framework/shape_inference.h index cfeaeab52cee0808e4c1d851fe76fb898497cc6a..10b0fa6afd78a60cdb160fa1a793f8b5e5121957 100644 --- a/paddle/fluid/framework/shape_inference.h +++ b/paddle/fluid/framework/shape_inference.h @@ -103,9 +103,9 @@ class InferShapeContext { virtual bool IsRuntime() const = 0; virtual std::vector GetInputVarPtrs( - const std::string &name) = 0; + const std::string &name) const = 0; virtual std::vector GetOutputVarPtrs( - const std::string &name) = 0; + const std::string &name) const = 0; protected: virtual std::vector GetRepeatedDims(const std::string &name) const = 0; diff --git a/paddle/fluid/imperative/infer_shape_context.h b/paddle/fluid/imperative/infer_shape_context.h index 7efe1177f5dc78d36dce0833fc8ec5fdfc0ed921..167d5682cbfdb318f470281dd3a5f023f4789e75 100644 --- a/paddle/fluid/imperative/infer_shape_context.h +++ b/paddle/fluid/imperative/infer_shape_context.h @@ -216,13 +216,13 @@ class DygraphInferShapeContext : public framework::InferShapeContext { // TODO(paddle-dev): Can this be template? std::vector GetInputVarPtrs( - const std::string& name) override { + const std::string& name) const override { PADDLE_THROW(platform::errors::PermissionDenied( "GetInputVarPtrs not support in dygraph runtime context")); } std::vector GetOutputVarPtrs( - const std::string& name) override { + const std::string& name) const override { PADDLE_THROW(platform::errors::PermissionDenied( "GetOutputVarPtrs not support in dygraph runtime context")); }