Commit 1cede467 authored by gaurides's avatar gaurides Committed by Scott Cyphers

Fixed MKLDNN convolution prop_kind (#2813)

parent 2c361e80
...@@ -280,7 +280,7 @@ mkldnn::memory::format MKLDNNEmitter::query_convolution_forward_weight_format( ...@@ -280,7 +280,7 @@ mkldnn::memory::format MKLDNNEmitter::query_convolution_forward_weight_format(
mkldnn::algorithm convolution_algo = mkldnn_utils::get_conv_algo(); mkldnn::algorithm convolution_algo = mkldnn_utils::get_conv_algo();
mkldnn::engine cpu_engine(mkldnn::engine::cpu, 0); mkldnn::engine cpu_engine(mkldnn::engine::cpu, 0);
mkldnn::convolution_forward::desc conv_desc_layout( mkldnn::convolution_forward::desc conv_desc_layout(
mkldnn::prop_kind::forward, mkldnn::prop_kind::forward_inference,
convolution_algo, convolution_algo,
input_data_desc, input_data_desc,
weights_desc_any, // this needs to be in default format weights_desc_any, // this needs to be in default format
...@@ -397,7 +397,7 @@ size_t MKLDNNEmitter::build_convolution_forward(const mkldnn::memory::desc& inpu ...@@ -397,7 +397,7 @@ size_t MKLDNNEmitter::build_convolution_forward(const mkldnn::memory::desc& inpu
try try
{ {
auto conv_prim = new mkldnn::convolution_forward( auto conv_prim = new mkldnn::convolution_forward(
{{mkldnn::prop_kind::forward, {{mkldnn::prop_kind::forward_inference,
convolution_algo, convolution_algo,
input_data_desc, input_data_desc,
weights_desc, weights_desc,
...@@ -547,7 +547,7 @@ size_t MKLDNNEmitter::build_convolution_forward(const mkldnn::memory::desc& inpu ...@@ -547,7 +547,7 @@ size_t MKLDNNEmitter::build_convolution_forward(const mkldnn::memory::desc& inpu
try try
{ {
conv_index = insert_primitive(new mkldnn::convolution_forward( conv_index = insert_primitive(new mkldnn::convolution_forward(
{{mkldnn::prop_kind::forward, {{mkldnn::prop_kind::forward_inference,
convolution_algo, convolution_algo,
input_data_desc, input_data_desc,
weights_desc, weights_desc,
......
...@@ -1364,7 +1364,7 @@ namespace ngraph ...@@ -1364,7 +1364,7 @@ namespace ngraph
{ {
auto bias_desc = mkldnn_utils::get_input_mkldnn_md(node, 2); auto bias_desc = mkldnn_utils::get_input_mkldnn_md(node, 2);
return mkldnn::convolution_forward::desc( return mkldnn::convolution_forward::desc(
mkldnn::prop_kind::forward, mkldnn::prop_kind::forward_inference,
convolution_algo, convolution_algo,
data_desc, data_desc,
weights_desc, weights_desc,
...@@ -1379,7 +1379,7 @@ namespace ngraph ...@@ -1379,7 +1379,7 @@ namespace ngraph
else else
{ {
return mkldnn::convolution_forward::desc( return mkldnn::convolution_forward::desc(
mkldnn::prop_kind::forward, mkldnn::prop_kind::forward_inference,
convolution_algo, convolution_algo,
data_desc, data_desc,
weights_desc, weights_desc,
......
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