Skip to content

[Relay] Optimize transform shape #13519

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
masahi merged 2 commits into from
Dec 5, 2022
Merged

[Relay] Optimize transform shape #13519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9855e35
[Relay] Optimize transform shape
shengxinhu Nov 30, 2022
f83de4b
add test
shengxinhu Nov 30, 2022
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
10 changes: 1 addition & 9 deletions src/tir/ir/data_layout.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,13 +334,9 @@ inline Array<PrimExpr> TransformShape(const Array<PrimExpr>& src_shape,
// for minor-axis, simply bind it as 0, so that we can reuse forward/backward_rule,
// e.g., (C * 16 + c) / 32
std::unordered_map<const tir::VarNode*, PrimExpr> bind_map;
std::unordered_set<size_t> symbolic_var_set;
for (size_t i = 0; i < src_shape.size(); ++i) {
PrimExpr orig_shape = src_shape[i];
IterVar orig_axis = src_axis[i];
if (orig_shape.as<tir::AnyNode>()) {
symbolic_var_set.insert(i);
}
if (!LayoutAxis::Get(orig_axis).IsPrimal()) {
if (orig_shape.defined()) {
const auto* orig_shape_const = orig_shape.as<IntImmNode>();
Expand Down Expand Up @@ -369,11 +365,7 @@ inline Array<PrimExpr> TransformShape(const Array<PrimExpr>& src_shape,
if (!LayoutAxis::Get(axis).IsPrimal()) {
result.push_back(axis->dom->extent);
} else {
if (symbolic_var_set.count(i)) {
result.push_back(tir::Any());
} else {
result.push_back(ana.Simplify(tir::Substitute(rule, bind_map)));
}
result.push_back(ana.Simplify(tir::Substitute(rule, bind_map)));
}
}

Expand Down
9 changes: 9 additions & 0 deletions tests/python/relay/test_any.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,15 @@ def test_any_layout_transform():
verify_any_layout_transform((16, 1), "CH", "C4cH", (16, 1), (4, 4, 1))


def test_bilayout_with_any():
bilayout = tvm.tir.bijective_layout("NCHW", "NHWC")
assert isinstance(bilayout, tvm.tir.BijectiveLayout)
dst_shape = bilayout.forward_shape((relay.Any(), 32, 7, relay.Any()))
assert dst_shape[3] == 32
src_shape = bilayout.backward_shape(dst_shape)
assert src_shape[1] == 32


def verify_any_expand_dims(data_shape, axis, num_newaxis, static_data_shape, ref_out_shape):
mod = tvm.IRModule()
dtype = "float32"
Expand Down