Remove runtime/cpu includes from things outside runtime/cpu (#2910)

Author: Adam Procter

src/ngraph/pass/propagate_cacheability.cpp

@@ -20,7 +20,6 @@
 #include "ngraph/op/constant.hpp"
 #include "ngraph/op/parameter.hpp"
 #include "ngraph/op/util/op_annotations.hpp"
-#include "ngraph/runtime/cpu/cpu_op_annotations.hpp"
 
 using namespace std;
 using namespace ngraph;

src/ngraph/runtime/backend.cpp

@@ -19,7 +19,6 @@
 #include "ngraph/file_util.hpp"
 #include "ngraph/runtime/backend.hpp"
 #include "ngraph/runtime/backend_manager.hpp"
-#include "ngraph/runtime/cpu/cpu_tensor_view.hpp"
 #include "ngraph/util.hpp"
 
 using namespace std;

test/autodiff.in.cpp

@@ -27,8 +27,10 @@
 
 #include "ngraph/ngraph.hpp"
 #include "ngraph/pass/manager.hpp"
+#if defined(AUTODIFF_BACKEND_CPU)
 #include "ngraph/runtime/cpu/op/batch_mat_mul_transpose.hpp"
 #include "ngraph/runtime/cpu/pass/cpu_mat_fusion.hpp"
+#endif
 #include "ngraph/runtime/reference/avg_pool.hpp"
 #include "util/autodiff/backprop_function.hpp"
 #include "util/autodiff/numeric_compare.hpp"

test/control_dependencies.cpp

@@ -32,7 +32,6 @@
 #include "ngraph/pass/manager.hpp"
 #include "ngraph/pass/visualize_tree.hpp"
 #include "ngraph/pattern/matcher.hpp"
-#include "ngraph/runtime/cpu/pass/cpu_fusion.hpp"
 #include "ngraph/serializer.hpp"
 #include "ngraph/util.hpp"
 #include "util/all_close.hpp"

test/hybrid_backend.cpp

@@ -25,7 +25,6 @@
 #include "ngraph/pass/visualize_tree.hpp"
 #include "ngraph/runtime/backend.hpp"
 #include "ngraph/runtime/backend_manager.hpp"
-#include "ngraph/runtime/cpu/cpu_backend.hpp"
 #include "ngraph/runtime/hybrid/hybrid_backend.hpp"
 #include "ngraph/runtime/hybrid/hybrid_util.hpp"
 #include "ngraph/runtime/hybrid/op/function_call.hpp"
@@ -45,7 +44,7 @@ static runtime::Backend* hybrid_creator(const char* config)
     vector<string> unsupported_1 = {"Multiply"};
     vector<shared_ptr<runtime::Backend>> backend_list = {
         make_shared<runtime::interpreter::INTBackend>(unsupported_0),
-        make_shared<runtime::cpu::CPU_Backend>()};
+        runtime::Backend::create("CPU")};
 
     return new runtime::hybrid::HybridBackend(backend_list);
 }

test/pattern.cpp

@@ -39,7 +39,6 @@
 #include "ngraph/pattern/matcher.hpp"
 #include "ngraph/pattern/op/label.hpp"
 #include "ngraph/pattern/op/skip.hpp"
-#include "ngraph/runtime/cpu/pass/cpu_fusion.hpp"
 #include "ngraph/serializer.hpp"
 #include "util/matcher.hpp"
 #include "util/test_tools.hpp"