Commit 42e52e42 authored by Jaikrishnan Menon's avatar Jaikrishnan Menon

CPU: Formatting fixes

parent e0c3400b
...@@ -2038,15 +2038,15 @@ namespace ngraph ...@@ -2038,15 +2038,15 @@ namespace ngraph
args[0].get_element_type() == element::f32) args[0].get_element_type() == element::f32)
{ {
auto& mkldnn_emitter = external_function->get_mkldnn_emitter(); auto& mkldnn_emitter = external_function->get_mkldnn_emitter();
auto input_data_desc = auto input_data_desc = mkldnn_emitter->build_memory_descriptor(
mkldnn_emitter->build_memory_descriptor(args[0], mkldnn::memory::format::nchw); args[0], mkldnn::memory::format::nchw);
auto weights_desc = auto weights_desc = mkldnn_emitter->build_memory_descriptor(
mkldnn_emitter->build_memory_descriptor(args[1], mkldnn::memory::format::oihw); args[1], mkldnn::memory::format::oihw);
auto result_desc = auto result_desc = mkldnn_emitter->build_memory_descriptor(
mkldnn_emitter->build_memory_descriptor(out[0], mkldnn::memory::format::nchw); out[0], mkldnn::memory::format::nchw);
size_t conv_index = size_t conv_index = mkldnn_emitter->build_convolution_forward(
mkldnn_emitter->build_convolution_forward(input_data_desc, input_data_desc,
weights_desc, weights_desc,
result_desc, result_desc,
convolution->get_window_movement_strides(), convolution->get_window_movement_strides(),
...@@ -2054,15 +2054,15 @@ namespace ngraph ...@@ -2054,15 +2054,15 @@ namespace ngraph
convolution->get_padding_above()); convolution->get_padding_above());
auto& deps = mkldnn_emitter->get_primitive_deps(conv_index); auto& deps = mkldnn_emitter->get_primitive_deps(conv_index);
writer << "cpu::mkldnn_utils::set_memory_ptr(ctx, " << to_string(deps[0]) << ", " writer << "cpu::mkldnn_utils::set_memory_ptr(ctx, " << to_string(deps[0])
<< args[0].get_name() << ");\n"; << ", " << args[0].get_name() << ");\n";
writer << "cpu::mkldnn_utils::set_memory_ptr(ctx, " << to_string(deps[1]) << ", " writer << "cpu::mkldnn_utils::set_memory_ptr(ctx, " << to_string(deps[1])
<< args[1].get_name() << ");\n"; << ", " << args[1].get_name() << ");\n";
writer << "cpu::mkldnn_utils::set_memory_ptr(ctx, " << to_string(deps[2]) << ", " writer << "cpu::mkldnn_utils::set_memory_ptr(ctx, " << to_string(deps[2])
<< out[0].get_name() << ");\n"; << ", " << out[0].get_name() << ");\n";
writer << "cpu::mkldnn_utils::mkldnn_invoke_primitive(ctx, " << to_string(conv_index) writer << "cpu::mkldnn_utils::mkldnn_invoke_primitive(ctx, "
<< ");\n"; << to_string(conv_index) << ");\n";
} }
else if (filter_dilated && !data_dilated && arg0_rank == 4 && arg1_rank == 4 && else if (filter_dilated && !data_dilated && arg0_rank == 4 && arg1_rank == 4 &&
args[0].get_element_type() == element::f32) args[0].get_element_type() == element::f32)
......
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