Skip to content

fix: Support dims < -1 in aten::stack converter #1947

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 1 commit into from
May 29, 2023
Merged

fix: Support dims < -1 in aten::stack converter #1947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions core/conversion/converters/impl/stack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ auto stack_registrations TORCHTRT_UNUSED = RegisterNodeConversionPatterns().patt
[](ConversionCtx* ctx, const torch::jit::Node* n, args& args) -> bool {
auto in = args[0].IValue()->toListRef();
auto dim = args[1].unwrapToInt();
if (-1 == dim) {
if (dim < 0) {
auto first_in = in[0];
if (first_in.isTensor()) {
dim = first_in.toTensor().ndimension();
dim = first_in.toTensor().ndimension() + dim + 1;
} else {
dim = first_in.toCustomClass<TensorContainer>()->tensor()->getDimensions().nbDims;
dim = first_in.toCustomClass<TensorContainer>()->tensor()->getDimensions().nbDims + dim + 1;
}
}

Expand Down
22 changes: 18 additions & 4 deletions tests/core/conversion/converters/test_stack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ TEST(Converters, ATenStackPureTensorConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in1, in2});

ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(
jit_results[0], trt_results[0].reshape_as(jit_results[0]), THRESHOLD_E5));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0], THRESHOLD_E5));
};
const auto graph = R"IR(
graph(%0 : Tensor,
Expand All @@ -35,9 +34,17 @@ TEST(Converters, ATenStackPureTensorConvertsCorrectly) {
%3 : int = prim::Constant[value=-1]()
%4 : Tensor = aten::stack(%2, %3)
return (%4))IR";
const auto graph3 = R"IR(
graph(%0 : Tensor,
%1 : Tensor):
%2 : Tensor[] = prim::ListConstruct(%0, %1)
%3 : int = prim::Constant[value=-2]()
%4 : Tensor = aten::stack(%2, %3)
return (%4))IR";

TestATenStackPureTensorConvertsCorrectly(graph);
TestATenStackPureTensorConvertsCorrectly(graph2);
TestATenStackPureTensorConvertsCorrectly(graph3);
}

TEST(Converters, ATenStackPureTensorDynamicConvertsCorrectly) {
Expand Down Expand Up @@ -89,8 +96,7 @@ TEST(Converters, ATenStackDiffTensorConvertsCorrectly) {
params = torch_tensorrt::core::ir::get_static_params(g->inputs(), {in2});
auto trt_results = torch_tensorrt::tests::util::RunGraphEngine(g, params, {in1});

ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(
jit_results[0], trt_results[0].reshape_as(jit_results[0]), THRESHOLD_E5));
ASSERT_TRUE(torch_tensorrt::tests::util::almostEqual(jit_results[0], trt_results[0], THRESHOLD_E5));
};
const auto graph = R"IR(
graph(%0 : Tensor,
Expand All @@ -106,6 +112,14 @@ TEST(Converters, ATenStackDiffTensorConvertsCorrectly) {
%3 : int = prim::Constant[value=-1]()
%4 : Tensor = aten::stack(%2, %3)
return (%4))IR";
const auto graph3 = R"IR(
graph(%0 : Tensor,
%1 : Float(4, 4, 4, strides=[16, 4, 1])):
%2 : Tensor[] = prim::ListConstruct(%0, %1)
%3 : int = prim::Constant[value=-3]()
%4 : Tensor = aten::stack(%2, %3)
return (%4))IR";
TestATenStackDiffTensorConvertsCorrectly(graph);
TestATenStackDiffTensorConvertsCorrectly(graph2);
TestATenStackDiffTensorConvertsCorrectly(graph3);
}