[PT FE]: extend logical operations support (#19981)

* [PT FE]: extend logical operations support

* tests

* more tests
This commit is contained in:
Ekaterina Aidova authored and GitHub committed 2023-09-22 10:11:36 +04:00
1 parent 3f3d89678e
commit 8d59fcd34f
3 files changed
+108 -4

No files matched your search

+38 -4
View File
@@ -4,7 +4,9 @@
#include "openvino/frontend/pytorch/node_context.hpp"
#include "openvino/op/logical_and.hpp"
#include "openvino/op/logical_not.hpp"
#include "openvino/op/logical_or.hpp"
#include "openvino/op/logical_xor.hpp"
#include "utils.hpp"
namespace ov {
@@ -15,25 +17,57 @@ namespace op {
using namespace ov::op;
OutputVector translate_or(const NodeContext& context) {
num_inputs_check(context, 2, 2);
num_inputs_check(context, 2, 3);
auto x = context.get_input(0);
auto y = context.get_input(1);
x = context.mark_node(std::make_shared<v0::Convert>(x, element::boolean));
y = context.mark_node(std::make_shared<v0::Convert>(y, element::boolean));
// TODO: use bitwise op here when will be supported by openvino
auto or_node = context.mark_node(std::make_shared<v1::LogicalOr>(x, y));
if (!context.input_is_none(2)) {
context.mutate_input(2, or_node);
}
return {or_node};
};
OutputVector translate_and(const NodeContext& context) {
num_inputs_check(context, 2, 2);
num_inputs_check(context, 2, 3);
auto x = context.get_input(0);
auto y = context.get_input(1);
x = context.mark_node(std::make_shared<v0::Convert>(x, element::boolean));
y = context.mark_node(std::make_shared<v0::Convert>(y, element::boolean));
// TODO: use bitwise op here when will be supported by openvino
auto or_node = context.mark_node(std::make_shared<v1::LogicalAnd>(x, y));
return {or_node};
auto and_node = context.mark_node(std::make_shared<v1::LogicalAnd>(x, y));
if (!context.input_is_none(2)) {
context.mutate_input(2, and_node);
}
return {and_node};
};
OutputVector translate_not(const NodeContext& context) {
num_inputs_check(context, 1, 2);
auto x = context.get_input(0);
x = context.mark_node(std::make_shared<v0::Convert>(x, element::boolean));
// TODO: use bitwise op here when will be supported by openvino
auto not_node = context.mark_node(std::make_shared<v1::LogicalNot>(x));
if (!context.input_is_none(1)) {
context.mutate_input(1, not_node);
}
return {not_node};
};
OutputVector translate_xor(const NodeContext& context) {
num_inputs_check(context, 2, 3);
auto x = context.get_input(0);
auto y = context.get_input(1);
x = context.mark_node(std::make_shared<v0::Convert>(x, element::boolean));
y = context.mark_node(std::make_shared<v0::Convert>(y, element::boolean));
// TODO: use bitwise op here when will be supported by openvino
auto xor_node = context.mark_node(std::make_shared<v1::LogicalXor>(x, y));
if (!context.input_is_none(2)) {
context.mutate_input(2, xor_node);
}
return {xor_node};
};
} // namespace op
+6
View File
@@ -111,6 +111,7 @@ OP_CONVERTER(translate_new_zeros);
OP_CONVERTER(translate_nms);
OP_CONVERTER(translate_nonzero);
OP_CONVERTER(translate_norm);
OP_CONVERTER(translate_not);
OP_CONVERTER(translate_numel);
OP_CONVERTER(translate_one_hot);
OP_CONVERTER(translate_ones);
@@ -188,6 +189,7 @@ OP_CONVERTER(translate_quantized_cat);
OP_CONVERTER(translate_quantized_convnd);
OP_CONVERTER(translate_quantized_convnd_relu);
OP_CONVERTER(translate_quantized_linear);
OP_CONVERTER(translate_xor);
// Torch FX Translations
OP_CONVERTER(translate_arange_fx);
OP_CONVERTER(translate_batch_norm_fx);
@@ -343,6 +345,10 @@ const std::map<std::string, CreatorFunction> get_supported_ops_ts() {
{"aten::linspace", op::translate_linspace},
{"aten::log", op::translate_log},
{"aten::log_", op::inplace_op<op::translate_log>},
{"aten::logical_and", op::translate_and},
{"aten::logical_or", op::translate_or},
{"aten::logical_not", op::translate_not},
{"aten::logical_xor", op::translate_xor},
{"aten::log_softmax", op::translate_log_softmax},
{"aten::log2", op::translate_log2},
{"aten::log2_", op::inplace_op<op::translate_log2>},