Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Improve static cached_op optimization #15187

Merged
merged 3 commits into from
Jun 13, 2019
Merged

Improve static cached_op optimization #15187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23c2c82
Fix cached op
ZhennanQin Jun 5, 2019
14ea11a
Fix UT
ZhennanQin Jun 11, 2019
30e4156
trigger
xinyu-intel Jun 11, 2019
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
2 changes: 1 addition & 1 deletion src/imperative/cached_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ bool CachedOp::CheckDynamicShapeExists(const Context& default_ctx,
CheckAndInferShape(&g, std::move(shape_inputs), true,
{0, 0}, {0, 0},
&contain_dynamic_shape);
if (contain_dynamic_shape && erase_result) {
if (!config_.static_shape && erase_result) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Sounds like something wasn't properly tested here? Maybe add a test to cover this path?

Copy link
Contributor

Choose a reason for hiding this comment

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

It's already covered by current UT, there're 2 cases failed before fixing this.

g.attrs.erase("shape");
g.attrs.erase("shape_inputs");
}
Expand Down
5 changes: 4 additions & 1 deletion src/imperative/imperative_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,10 @@ inline bool CheckAndInferShape(nnvm::Graph* p_g, mxnet::ShapeVector&& shapes,
*contain_unknown = false;
}
nnvm::Graph& g = *p_g;
if (g.attrs.count("shape")) {
if (use_inputs) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Please add the comments in the code

Copy link
Contributor

Choose a reason for hiding this comment

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

This code is removed from previous commit by mistake. This is just to recover them back.

if (g.attrs.count("shape_inputs") && g.GetAttr<mxnet::ShapeVector>("shape_inputs") == shapes)
return true;
} else if (g.attrs.count("shape")) {
const auto& prev_shapes = g.GetAttr<mxnet::ShapeVector>("shape");
if (prev_shapes.size() == shapes.size()) {
bool match = true;
Expand Down