Skip to content

Fixing some issues with the master branch #1033

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 5 commits into from
May 8, 2022
Merged

Fixing some issues with the master branch #1033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c275dd0
tests: Update to new exception operator
narendasan May 8, 2022
828d120
tests: Update fp16 test for new API
narendasan May 8, 2022
65dbf90
feat(aten::add): adding string concat evaluator
narendasan May 8, 2022
79b8392
refactor(//core/lowering): Make logic a bit clearer in EE pass
narendasan May 8, 2022
b89a6f5
refactor: apply linting
narendasan May 8, 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
9 changes: 7 additions & 2 deletions core/conversion/evaluators/aten.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,15 +342,20 @@ auto aten_registrations TORCHTRT_UNUSED =
auto a = args.at(n->input(0)).unwrapToDouble();
auto b = args.at(n->input(1)).unwrapToDouble();
return a + b;
} else if (args.at(n->input(0)).IValue()->isString()) {
auto a = args.at(n->input(0)).unwrapToString();
auto b = args.at(n->input(1)).unwrapToString();
return a + b;
} else {
TORCHTRT_THROW_ERROR(
"Unimplemented data type for aten::add evaluator: "
<< args.at(n->input(0)).IValue()->type()->str());
return {};
}
},
EvalOptions().validSchemas(
{"aten::add.int(int a, int b) -> (int)", "aten::add.float(float a, float b) -> (float)"})})
EvalOptions().validSchemas({"aten::add.int(int a, int b) -> (int)",
"aten::add.float(float a, float b) -> (float)",
"aten::add.str(str a, str b) -> (str)"})})
.evaluator({c10::Symbol::fromQualString("aten::add_"),
[](const torch::jit::Node* n, kwargs& args) -> c10::optional<torch::jit::IValue> {
if (args.at(n->input(0)).IValue()->isList()) {
Expand Down
39 changes: 19 additions & 20 deletions core/lowering/passes/exception_elimination.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ struct ExceptionOrPassPatternElimination {
bool arm1_starts_with_exception = (*arm1_start)->kind() == prim::RaiseException;
bool arm2_starts_with_exception = (*arm2_start)->kind() == prim::RaiseException;

if (!arm1_starts_with_exception && !arm2_starts_with_exception) {
// Neither arm matches the pattern
return false;
}
// if (!arm1_starts_with_exception && !arm2_starts_with_exception) {
// Neither arm matches the pattern
// return false;
//}

/// Check if this Node hosts a pattern like so:
/// = prim::If(%5958)
Expand All @@ -57,14 +57,12 @@ struct ExceptionOrPassPatternElimination {
/// block1():
/// -> ()
if (arm1_starts_with_exception) {
if ((*(++arm1_start))->kind() != prim::Return) {
if ((*(++arm1_start))->kind() == prim::Return) {
// Make sure that block0 is solely just the exception and the return
return false;
}

if ((*(arm2_start))->kind() != prim::Return) {
// Make sure that block1 is solely the return
return false;
if ((*(arm2_start))->kind() == prim::Return) {
// Make sure that block1 is solely the return
return true;
}
}
}

Expand All @@ -76,25 +74,23 @@ struct ExceptionOrPassPatternElimination {
/// = prim::RaiseException(%45)
/// -> ()
if (arm2_starts_with_exception) {
if ((*(++arm2_start))->kind() != prim::Return) {
if ((*(++arm2_start))->kind() == prim::Return) {
// Make sure that block1 is solely just the exception and the return
return false;
}

if ((*(arm1_start))->kind() != prim::Return) {
// Make sure that block0 is solely the return
return false;
if ((*(arm1_start))->kind() == prim::Return) {
// Make sure that block0 is solely the return
return true;
}
}
}

return true;
return false;
}

void findExceptionOrPassNodes(Block* b) {
for (auto it = b->nodes().begin(); it != b->nodes().end(); it++) {
auto n = *it;
if (n->kind() == prim::If && isExceptionOrPassNode(n)) {
LOG_GRAPH("Found that node " << *n << " is an exception or pass node (EliminateChecks)" << std::endl);
LOG_ERROR("Found that node " << *n << " is an exception or pass node (EliminateChecks)" << std::endl);
it.destroyCurrent();
}
}
Expand All @@ -107,6 +103,9 @@ struct ExceptionOrPassPatternElimination {
void EliminateExceptionOrPassPattern(std::shared_ptr<Graph> graph) {
ExceptionOrPassPatternElimination eppe(std::move(graph));
eppe.run();
if (graph) {
LOG_ERROR("Post Eliminate Exception or Pass Patterns: " << *graph);
}
}

} // namespace passes
Expand Down
5 changes: 4 additions & 1 deletion core/lowering/register_trt_placeholder_ops.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ c10::AliasAnalysisKind aliasAnalysisFromSchema() {
RegisterOperators trt_placeholder_ops_reg({
/// Op marks a Tensor to be conveted from an Torch Tensor
/// to a TRT constant Tensor
Operator("trt::const(Tensor val) -> Tensor", [](Stack& stack) { /*noop*/ }, aliasAnalysisFromSchema()),
Operator(
"trt::const(Tensor val) -> Tensor",
[](Stack& stack) { /*noop*/ },
aliasAnalysisFromSchema()),
});

} // namespace jit
Expand Down
Empty file modified core/partitioning/partitioning.cpp
100755 → 100644
View file
Open in desktop
Empty file.
6 changes: 4 additions & 2 deletions tests/accuracy/test_fp16_accuracy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ TEST_P(AccuracyTests, FP16AccuracyIsClose) {
}
torch::Tensor jit_accuracy = (jit_correct / jit_total) * 100;

std::vector<std::vector<int64_t>> input_shape = {{32, 3, 32, 32}};
auto compile_spec = torch_tensorrt::ts::CompileSpec({input_shape});
std::vector<int64_t> input_shape = {32, 3, 32, 32};
auto input = torch_tensorrt::Input(input_shape);
input.dtype = torch::kF16;
auto compile_spec = torch_tensorrt::ts::CompileSpec({input});
compile_spec.enabled_precisions.insert(torch::kF16);

auto trt_mod = torch_tensorrt::ts::compile(mod, compile_spec);
Expand Down
14 changes: 9 additions & 5 deletions tests/core/lowering/test_exception_elimination_pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,17 @@ TEST(LoweringPasses, EliminateExceptionOrPassPattern_Block0) {
g->insertNode(bool_node);
auto if_node = g->create(torch::jit::prim::If, {bool_node->output()}, 0);
auto if_block0 = if_node->addBlock();
auto exception_node = g->create(torch::jit::prim::RaiseException, {except_val}, 0);
auto exception_node = g->create(torch::jit::prim::RaiseException, {except_val, none_const_val}, 0);
if_block0->appendNode(exception_node);
auto if_block1 = if_node->addBlock();
/*auto if_block1 =*/if_node->addBlock();
g->insertNode(if_node);
auto cat_node = g->create(torch::jit::aten::cat, {list_node->output(), zero_const_val});
g->insertNode(cat_node);
g->registerOutput(cat_node->output());

std::cout << "Source Graph: " << *g << std::endl;
torch_tensorrt::core::lowering::passes::EliminateExceptionOrPassPattern(g);
std::cout << "Modified Graph: " << *g << std::endl;
for (auto node : g->nodes()) {
EXPECT_NE(node, if_node);
}
Expand Down Expand Up @@ -95,16 +97,18 @@ TEST(LoweringPasses, EliminateExceptionOrPassPattern_Block1) {
bool_node->output()->setType(torch::jit::BoolType::get());
g->insertNode(bool_node);
auto if_node = g->create(torch::jit::prim::If, {bool_node->output()}, 0);
auto if_block0 = if_node->addBlock();
/*auto if_block0 = */ if_node->addBlock();
auto if_block1 = if_node->addBlock();
auto exception_node = g->create(torch::jit::prim::RaiseException, {except_val}, 0);
auto exception_node = g->create(torch::jit::prim::RaiseException, {except_val, none_const_val}, 0);
if_block1->appendNode(exception_node);
g->insertNode(if_node);
auto cat_node = g->create(torch::jit::aten::cat, {list_node->output(), zero_const_val});
g->insertNode(cat_node);
g->registerOutput(cat_node->output());

std::cout << "Source Graph: " << *g << std::endl;
torch_tensorrt::core::lowering::passes::EliminateExceptionOrPassPattern(g);
std::cout << "Modified Graph: " << *g << std::endl;
for (auto node : g->nodes()) {
EXPECT_NE(node, if_node);
}
Expand Down Expand Up @@ -150,7 +154,7 @@ TEST(LoweringPasses, EliminateExceptionOrPassPattern_Negative) {
auto if_block0 = if_node->addBlock();
auto append_node = g->create(torch::jit::aten::append, {list_node->output(), y});
if_block0->appendNode(append_node);
auto if_block1 = if_node->addBlock();
/*auto if_block1 = */ if_node->addBlock();
g->insertNode(if_node);
auto cat_node = g->create(torch::jit::aten::cat, {list_node->output(), zero_const_val});
g->insertNode(cat_node);
Expand Down