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

Remove "static inputs" for reduction ops #592

Closed
wants to merge 2 commits into from
Closed

Remove "static inputs" for reduction ops #592

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
b6c8f79
Remove "static inputs" for reduction ops
Jul 21, 2020
c741fa8
Compilation fix
Sep 22, 2020
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
73 changes: 21 additions & 52 deletions ngraph_bridge/ngraph_builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2079,45 +2079,8 @@ static Status TranslateNonMaxSuppressionV4Op(
return Status::OK();
}

static Status TranslateReduceOp(
const Node* op, const std::vector<const Tensor*>& static_input_map,
Builder::OpMap& ng_op_map,
std::function<ng::Output<ng::Node>(ng::Output<ng::Node>,
ng::Output<ng::Node>, const bool)>
create_ng_node) {
ng::Output<ng::Node> ng_input;
TF_RETURN_IF_ERROR(GetInputNode(ng_op_map, op, 0, ng_input));
bool tf_keep_dims;
if (GetNodeAttr(op->attrs(), "keep_dims", &tf_keep_dims) != Status::OK()) {
tf_keep_dims = false;
}

std::vector<int64> axes;
TF_RETURN_IF_ERROR(GetStaticInputVector(op, 1, static_input_map, &axes));

ng::Shape input_shape = ng_input.get_shape();
size_t input_rank = input_shape.size();

TF_RETURN_IF_ERROR(CheckAxisDimInRange(axes, input_rank));

std::vector<size_t> ng_reduction_axes_vect(axes.size());
std::transform(
axes.begin(), axes.end(), ng_reduction_axes_vect.begin(),
[input_rank](int idx) { return idx + (idx < 0 ? (int)input_rank : 0); });
auto ng_reduction_axes = ConstructNgNode<opset::Constant>(
op->name(), ng::element::i64, ng::Shape{ng_reduction_axes_vect.size()},
ng_reduction_axes_vect);

ng::Output<ng::Node> ng_node =
create_ng_node(ng_input, ng_reduction_axes, tf_keep_dims);
Builder::SetTracingInfo(op->name(), ng_node);

SaveNgOp(ng_op_map, op->name(), ng_node);
return Status::OK();
}

template <typename T>
static Status TranslateDirectReduceOp(
static Status TranslateReduceOp(
const Node* op, const std::vector<const Tensor*>& static_input_map,
Builder::OpMap& ng_op_map) {
// ensure its either an arithmetic or a logical reduction
Expand All @@ -2127,13 +2090,19 @@ static Status TranslateDirectReduceOp(
"Expected node to be either a valid logical or arithmetic reduction "
"type");
}
return TranslateReduceOp(
op, static_input_map, ng_op_map,
[&op](ng::Output<ng::Node> ng_input,
ng::Output<ng::Node> ng_reduction_axes, const bool keep_dims) {
return ConstructNgNode<T>(op->name(), ng_input, ng_reduction_axes,
keep_dims);
});

ng::Output<ng::Node> ng_input, ng_reduction_indices;
TF_RETURN_IF_ERROR(
GetInputNodes(ng_op_map, op, ng_input, ng_reduction_indices));
bool keep_dims;
if (GetNodeAttr(op->attrs(), "keep_dims", &keep_dims) != Status::OK()) {
keep_dims = false;
}

auto ng_node =
ConstructNgNode<T>(op->name(), ng_input, ng_reduction_indices, keep_dims);
SaveNgOp(ng_op_map, op->name(), ng_node);
return Status::OK();
}

static Status TranslateOneHotOp(
Expand Down Expand Up @@ -3002,8 +2971,8 @@ const static std::map<
{"Add", TranslateBinaryOp<opset::Add>},
{"AddN", TranslateAddNOp},
{"AddV2", TranslateBinaryOp<opset::Add>},
{"Any", TranslateDirectReduceOp<opset::ReduceLogicalOr>},
{"All", TranslateDirectReduceOp<opset::ReduceLogicalAnd>},
{"Any", TranslateReduceOp<opset::ReduceLogicalOr>},
{"All", TranslateReduceOp<opset::ReduceLogicalAnd>},
{"ArgMax", TranslateArgMaxOp},
{"ArgMin", TranslateArgMinOp},
{"Asin", TranslateUnaryOp<opset::Asin>},
Expand Down Expand Up @@ -3053,13 +3022,13 @@ const static std::map<
{"LogicalNot", TranslateUnaryOp<opset::LogicalNot>},
{"LogicalOr", TranslateBinaryOp<opset::LogicalOr>},
{"MatMul", TranslateMatMulOp},
{"Max", TranslateDirectReduceOp<opset::ReduceMax>},
{"Max", TranslateReduceOp<opset::ReduceMax>},
{"Maximum", TranslateBinaryOp<opset::Maximum>},
{"MaxPool", TranslateMaxPoolOp},
{"MaxPool3D", TranslateMaxPool3DOp},
{"NonMaxSuppressionV4", TranslateNonMaxSuppressionV4Op},
{"Mean", TranslateDirectReduceOp<opset::ReduceMean>},
{"Min", TranslateDirectReduceOp<opset::ReduceMin>},
{"Mean", TranslateReduceOp<opset::ReduceMean>},
{"Min", TranslateReduceOp<opset::ReduceMin>},
{"Minimum", TranslateBinaryOp<opset::Minimum>},
{"MirrorPad", TranslatePadOp},
{"Mul", TranslateBinaryOp<opset::Multiply>},
Expand All @@ -3077,7 +3046,7 @@ const static std::map<
{"Pow", TranslateBinaryOp<opset::Power>},
// PreventGradient is just Identity in dataflow terms, so reuse that.
{"PreventGradient", TranslateIdentityOp},
{"Prod", TranslateDirectReduceOp<opset::ReduceProd>},
{"Prod", TranslateReduceOp<opset::ReduceProd>},
{"Rank", TranslateRankOp},
{"RealDiv", TranslateBinaryOp<opset::Divide>},
{"Reciprocal", TranslateReciprocalOp},
Expand Down Expand Up @@ -3106,7 +3075,7 @@ const static std::map<
{"Squeeze", TranslateSqueezeOp},
{"StridedSlice", TranslateStridedSliceOp},
{"Sub", TranslateBinaryOp<opset::Subtract>},
{"Sum", TranslateDirectReduceOp<opset::ReduceSum>},
{"Sum", TranslateReduceOp<opset::ReduceSum>},
{"Tan", TranslateUnaryOp<opset::Tan>},
{"Tanh", TranslateUnaryOp<opset::Tanh>},
{"Tile", TranslateTileOp},
Expand Down
7 changes: 0 additions & 7 deletions ngraph_bridge/ngraph_mark_for_clustering.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,32 +195,25 @@ const std::map<std::string, SetAttributesFunction>& GetAttributeSetters() {

if (!initialized) {
// Set Additional Attributes (if any)
set_attributes_map["Any"] = SetStaticInputs({1});
set_attributes_map["All"] = SetStaticInputs({1});
set_attributes_map["ArgMax"] = SetStaticInputs({1});
set_attributes_map["ArgMin"] = SetStaticInputs({1});
set_attributes_map["ConcatV2"] = SetStaticInputs({-1});
set_attributes_map["Conv2DBackpropInput"] = SetStaticInputs({0});
set_attributes_map["ExpandDims"] = SetStaticInputs({1});
set_attributes_map["Fill"] = SetStaticInputs({0});
set_attributes_map["GatherV2"] = SetStaticInputs({2});
set_attributes_map["Max"] = SetStaticInputs({1});
set_attributes_map["Mean"] = SetStaticInputs({1});
set_attributes_map["Min"] = SetStaticInputs({1});
set_attributes_map["MirrorPad"] = SetStaticInputs({1});
set_attributes_map["NonMaxSuppressionV4"] = SetStaticInputs({2, 3, 4});
set_attributes_map["OneHot"] = SetStaticInputs({1});
set_attributes_map["Pad"] = SetStaticInputs({1});
set_attributes_map["PadV2"] = SetStaticInputs({1, 2});
set_attributes_map["Prod"] = SetStaticInputs({1});
set_attributes_map["Reshape"] = SetStaticInputs({1});
set_attributes_map["Shape"] = SetStaticInputs({0});
set_attributes_map["ScatterNd"] = SetStaticInputs({2});
set_attributes_map["Slice"] = SetStaticInputs({1, 2});
set_attributes_map["Split"] = SetStaticInputs({0});
set_attributes_map["SplitV"] = SetStaticInputs({1, 2});
set_attributes_map["StridedSlice"] = SetStaticInputs({1, 2, 3});
set_attributes_map["Sum"] = SetStaticInputs({1});
set_attributes_map["TopKV2"] = SetStaticInputs({1});
set_attributes_map["Tile"] = SetStaticInputs({1});
set_attributes_map["Transpose"] = SetStaticInputs({1});
Expand Down