Unverified Commit 1d0256f3 authored by Robert Kimball's avatar Robert Kimball Committed by GitHub

Merge branch 'master' into master

parents e9ad86f2 3af90a22
......@@ -230,7 +230,7 @@ namespace ngraph
{
if (old_pops.kind(i) == mkldnn::primitive::kind::eltwise)
{
mkldnn::algorithm alg;
mkldnn::algorithm alg = mkldnn::algorithm_undef;
float scale = 0;
float alpha = 0;
float beta = 0;
......@@ -304,7 +304,7 @@ namespace ngraph
{
if (old_pops.kind(i) == mkldnn::primitive::kind::eltwise)
{
mkldnn::algorithm alg;
mkldnn::algorithm alg = mkldnn::algorithm_undef;
float scale = 0;
float alpha = 0;
float beta = 0;
......
......@@ -403,9 +403,14 @@ void print_node(ostringstream& writer, const shared_ptr<Node>& node)
size_t arg_idx = 0;
for (const descriptor::Input& op_input : node->get_inputs())
{
writer << table_row_begin() << font_small_begin
<< op_input.get_element_type().c_type_string() << " input" << arg_idx
<< vector_to_string(op_input.get_shape()) << font_end << table_row_end;
writer << print_table_row_dims(op_input.get_element_type().c_type_string() + " input" +
to_string(arg_idx),
op_input.get_shape());
if (arg_idx >= 9)
{
writer << print_table_row_value("... total inputs", node->get_inputs().size());
break;
}
++arg_idx;
}
}
......@@ -415,9 +420,9 @@ void print_node(ostringstream& writer, const shared_ptr<Node>& node)
size_t arg_idx = 0;
for (const descriptor::Output& op_output : node->get_outputs())
{
writer << table_row_begin() << font_small_begin
<< op_output.get_element_type().c_type_string() << " output" << arg_idx
<< vector_to_string(op_output.get_shape()) << font_end << table_row_end;
writer << print_table_row_dims(op_output.get_element_type().c_type_string() +
" output" + to_string(arg_idx),
op_output.get_shape());
++arg_idx;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment