Merge pull request #3193 from NervanaSystems/gauri/macos_cast_r023

diyessi · web-flow · commit a93547d633ad · 2019-07-09T13:43:46.000-07:00
Fix crash on MacOS for r0.23
diff --git a/src/ngraph/runtime/cpu/mkldnn_utils.cpp b/src/ngraph/runtime/cpu/mkldnn_utils.cpp
@@ -692,8 +692,9 @@ bool runtime::cpu::mkldnn_utils::is_mkldnn_padded_layout(const mkldnn::memory::d
 
 bool runtime::cpu::mkldnn_utils::use_mkldnn_kernel(const ngraph::Node* node)
 {
-    if (auto* op_node = dynamic_cast<const ngraph::op::Op*>(node))
+    if (node->is_op())
     {
+        auto* op_node = static_cast<const ngraph::op::Op*>(node);
         auto op_annotations = op_node->get_op_annotations();
         return (op_annotations &&
                 static_pointer_cast<ngraph::runtime::cpu::CPUOpAnnotations>(op_annotations)

Original file line number	Diff line number	Diff line change
`@@ -692,8 +692,9 @@ bool runtime::cpu::mkldnn_utils::is_mkldnn_padded_layout(const mkldnn::memory::d`
`692`	`692`
`693`	`693`	`bool runtime::cpu::mkldnn_utils::use_mkldnn_kernel(const ngraph::Node* node)`
`694`	`694`	`{`
`695`		`- if (auto* op_node = dynamic_cast<const ngraph::op::Op*>(node))`
	`695`	`+ if (node->is_op())`
`696`	`696`	`{`
	`697`	`+ auto* op_node = static_cast<const ngraph::op::Op*>(node);`
`697`	`698`	`auto op_annotations = op_node->get_op_annotations();`
`698`	`699`	`return (op_annotations &&`
`699`	`700`	`static_pointer_cast<ngraph::runtime::cpu::CPUOpAnnotations>(op_annotations)`