Skip to content

merge InferShapeContext and OperatorContext #3347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 9, 2017
Merged

merge InferShapeContext and OperatorContext #3347

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c6a9f0
merge InferShapeContext and OperatorContext
jacquesqiao Aug 9, 2017
0f577e0
OperatorBase& instead of OperatorBase*
jacquesqiao Aug 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions paddle/framework/operator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@ class OperatorBase {
std::shared_ptr<std::unordered_map<std::string, int>> in_out_idxs_;
};

class OperatorContext {
class InferShapeContext {
public:
OperatorContext(const OperatorBase* op, const Scope& scope)
InferShapeContext(const OperatorBase* op, const Scope& scope)
Copy link
Collaborator

@wangkuiyi wangkuiyi Aug 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed that InferShapeContext::op_ is of reference type. Should we make this constructor parameter op also a reference?

Copy link
Member Author

@jacquesqiao jacquesqiao Aug 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good idea! done.

: op_(*op), scope_(scope) {}

size_t InputSize() const { return op_.inputs_.size(); }
Expand Down Expand Up @@ -234,12 +234,6 @@ class OperatorContext {
const Scope& scope_;
};

class InferShapeContext : public OperatorContext {
public:
InferShapeContext(const OperatorBase* op, const Scope& scope)
: OperatorContext(op, scope) {}
};

template <typename T>
struct EigenDeviceConverter;

Expand All @@ -255,11 +249,11 @@ struct EigenDeviceConverter<platform::GPUPlace> {
};
#endif

class ExecutionContext : public OperatorContext {
class ExecutionContext : public InferShapeContext {
public:
ExecutionContext(const OperatorBase* op, const Scope& scope,
const platform::DeviceContext* device_context)
: OperatorContext(op, scope), device_context_(device_context) {}
: InferShapeContext(op, scope), device_context_(device_context) {}

template <typename PlaceType,
typename DeviceType =
Expand Down