Skip to content
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

Jump to bottom

[GraphOptimizer] Optimize consecutive non-inverse transposes #2335

Merged
merged 4 commits into from Feb 4, 2019
Merged

[GraphOptimizer] Optimize consecutive non-inverse transposes #2335

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca93683
Combine consecutive non-inverse transposes
Squadrick Feb 2, 2019
47e94a8
Merge branch 'master' of https://github.com/pytorch/glow into consecu…
Squadrick Feb 4, 2019
da92228
Fix Minor bugs and add documentation
Squadrick Feb 4, 2019
8638c7d
Remove unused function `isIdentityShuffle()`
Squadrick Feb 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions lib/Optimizer/GraphOptimizer.cpp
View file
Open in desktop
Expand Up @@ -455,6 +455,18 @@ static bool sinkCode(Function *F) {
changed = true;
continue;
}

// The two non-inverse transposes can be combined into a single transpose.
llvm::SmallVector<unsigned_t, max_tensor_dimensions> newMask;
newMask.resize(mask2.size());

for (unsigned i = 0; i < mask2.size(); i++)
Squadrick marked this conversation as resolved.
Show resolved Hide resolved
newMask[i] = mask2[mask1[i]];

auto *newTR = F->createTranspose("tranpose", TR2->getInput(), newMask);
TR1->getResult().replaceAllUsesOfWith(newTR->getResult());
changed = true;
continue;
}

if (auto *RN = dyn_cast<ReshapeNode>(node)) {
Expand Down
31 changes: 14 additions & 17 deletions tests/unittests/GraphOptzTest.cpp
View file
Open in desktop
Expand Up @@ -806,30 +806,27 @@ TEST_F(GraphOptz, removeIdentityTransposeWithPredicate) {
EXPECT_EQ(A->dims(), llvm::makeArrayRef(origDims));
}

jfix71 marked this conversation as resolved.
Show resolved Hide resolved
TEST_F(GraphOptz, dontCancelTwoTransposesIfNotMatching) {
TEST_F(GraphOptz, mergeNonInverseTransposes) {
const size_t origDims[] = {1, 5, 10, 15};
const size_t afterFirstTransposeDims[] = {1, 10, 15, 5};
const size_t afterSecondTransposeDims[] = {1, 15, 5, 10};
const size_t finalDims[] = {5, 1, 15, 10};

Node *A = mod_.createPlaceholder(ElemKind::FloatTy, origDims, "input", false);
TransposeNode *T1 = F_->createTranspose("transpose", A, NCHW2NHWC);
TransposeNode *T2 = F_->createTranspose("transpose", T1, NCHW2NHWC);
SaveNode *save = F_->createSave("ret", T2);
TransposeNode *T1 = F_->createTranspose("transpose", A, {0, 3, 2, 1});
jfix71 marked this conversation as resolved.
Show resolved Hide resolved
TransposeNode *T2 = F_->createTranspose("transpose", T1, {0, 2, 3, 1});
TransposeNode *T3 = F_->createTranspose("transpose", T2, {1, 0, 3, 2});
TransposeNode *T4 = F_->createTranspose("transpose", T3, {3, 1, 2, 0});
SaveNode *save = F_->createSave("ret", T4);

EXPECT_EQ(F_->getNodes().size(), 3);
EXPECT_EQ(F_->getNodes().size(), 5);

::glow::optimize(F_, CompilationMode::Infer);

EXPECT_EQ(F_->getNodes().size(), 3);
// Make sure the structure of the graph did not change.
Node *secondTranspose = save->getInput();
EXPECT_EQ(secondTranspose->dims(0),
llvm::makeArrayRef(afterSecondTransposeDims));
EXPECT_EQ(secondTranspose, T2);
Node *firstTranspose = T2->getInput();
EXPECT_EQ(firstTranspose, T1);
EXPECT_EQ(T1->dims(0), llvm::makeArrayRef(afterFirstTransposeDims));
EXPECT_EQ(T1->getInput().getNode(), A);
auto *TR = llvm::dyn_cast<TransposeNode>(save->getInput());
EXPECT_EQ(F_->getNodes().size(), 2);
EXPECT_NE(TR, nullptr);
EXPECT_EQ(TR->dims(0), llvm::makeArrayRef(finalDims));
Squadrick marked this conversation as resolved.
Show resolved Hide resolved
EXPECT_EQ(A->dims(0), llvm::makeArrayRef(origDims));
EXPECT_EQ(TR->getInput().getNode(), A);
}

TEST_F(GraphOptz, sinkTransposeBelowArithmeticNodes) {
Expand Down