Merge branch 'master' into jmenon/dex4

src/ngraph/codegen/compiler.cpp

@@ -435,6 +435,7 @@ void codegen::CompilerCore::configure_search_path()
     add_header_search_path("/usr/lib/gcc/x86_64-linux-gnu/" + header_version + "/include-fixed");
     add_header_search_path("/usr/include/x86_64-linux-gnu");
     add_header_search_path("/usr/include");
+    add_header_search_path("/usr/include/c++/" + header_version + "/x86_64-redhat-linux");
 
     add_header_search_path(EIGEN_HEADERS_PATH);
     add_header_search_path(MKLDNN_HEADERS_PATH);

src/ngraph/runtime/cpu/cpu_emitter.cpp

@@ -1652,9 +1652,7 @@ namespace ngraph
             void CPU_Emitter::EMITTER_DECL(ngraph::op::Reshape)
             {
                 auto reshape = static_cast<const ngraph::op::Reshape*>(node);
-                auto annotation = reshape->get_op_annotations();
-                if (annotation && annotation->get_in_place_oi_pairs().size() > 0 &&
-                    out[0].get_name() == args[0].get_name())
+                if (!reshape->get_is_transpose() && out[0].get_name() == args[0].get_name())
                 {
                     writer.block_begin();
                     writer << "// Stride change only, skipping.\n";

src/ngraph/runtime/cpu/pass/cpu_assignment.cpp

@@ -548,13 +548,7 @@ namespace ngraph
                     // not in the memory pool, or has output users.
                     bool need_copy =
                         reshape->get_is_transpose() || arg->is_parameter() || arg->is_constant();
-                    for (auto n = users.begin(); !need_copy && n != users.end(); ++n)
-                    {
-                        if ((*n)->is_output())
-                        {
-                            need_copy = true;
-                        }
-                    }
+
                     if (!need_copy)
                     {
                         // map output to the input memory