WIP

src/ngraph/runtime/cpu/cpu_backend.cpp

@@ -14,8 +14,8 @@
 
 #include "ngraph/runtime/cpu/cpu_backend.hpp"
 #include "ngraph/log.hpp"
-#include "ngraph/runtime/external_function.hpp"
 #include "ngraph/runtime/cpu/cpu_tensor_view.hpp"
+#include "ngraph/runtime/external_function.hpp"
 
 using namespace ngraph;
 using namespace std;

src/ngraph/runtime/cpu/cpu_call_frame.cpp

@@ -76,11 +76,13 @@ void runtime::cpu::CPU_CallFrame::call(
 }
 
 void runtime::cpu::CPU_CallFrame::propagate_layouts(
-    const std::vector<std::shared_ptr<runtime::TensorView>>& tvs, const LayoutDescriptorPtrs& layouts) const
+    const std::vector<std::shared_ptr<runtime::TensorView>>& tvs,
+    const LayoutDescriptorPtrs& layouts) const
 {
     if (layouts.size() != tvs.size())
     {
-        throw ngraph_error("Error propagating layouts - tensor view and layout descriptor counts do not match");
+        throw ngraph_error(
+            "Error propagating layouts - tensor view and layout descriptor counts do not match");
     }
     for (size_t i = 0; i < tvs.size(); i++)
     {

src/ngraph/runtime/cpu/cpu_call_frame.hpp

@@ -20,8 +20,8 @@
 
 #include "ngraph/function.hpp"
 #include "ngraph/runtime/call_frame.hpp"
-#include "ngraph/runtime/tensor_view.hpp"
 #include "ngraph/runtime/cpu/cpu_layout_descriptor.hpp"
+#include "ngraph/runtime/tensor_view.hpp"
 
 namespace ngraph
 {

src/ngraph/runtime/cpu/cpu_external_function.cpp

@@ -832,12 +832,14 @@ shared_ptr<ngraph::runtime::CallFrame> runtime::cpu::CPU_ExternalFunction::make_
                                                             m_compiled_function);
 }
 
-const runtime::cpu::LayoutDescriptorPtrs& runtime::cpu::CPU_ExternalFunction::get_parameter_layout_descriptors()
+const runtime::cpu::LayoutDescriptorPtrs&
+    runtime::cpu::CPU_ExternalFunction::get_parameter_layout_descriptors()
 {
     return parameter_layout_descriptors;
 }
 
-const runtime::cpu::LayoutDescriptorPtrs& runtime::cpu::CPU_ExternalFunction::get_result_layout_descriptors()
+const runtime::cpu::LayoutDescriptorPtrs&
+    runtime::cpu::CPU_ExternalFunction::get_result_layout_descriptors()
 {
     return result_layout_descriptors;
 }

src/ngraph/runtime/cpu/cpu_layout_descriptor.hpp

@@ -36,8 +36,7 @@ namespace ngraph
             public:
                 LayoutDescriptor(const ngraph::descriptor::TensorView& tv,
                                  const AxisVector& tv_axis_order);
-                ~LayoutDescriptor() { }
-
+                ~LayoutDescriptor() {}
                 size_t get_size() override { return size; }
                 size_t get_offset() const { return offset; }
                 size_t get_index_offset(const std::vector<size_t>& indices) override;
@@ -45,10 +44,12 @@ namespace ngraph
                 const Strides& get_strides() const override { return strides; }
                 bool operator==(const TensorViewLayout& other) const override;
 
-                void set_mkldnn_format(const mkldnn::memory::format& format) { mkldnn_format = format; }
+                void set_mkldnn_format(const mkldnn::memory::format& format)
+                {
+                    mkldnn_format = format;
+                }
                 mkldnn::memory::format get_mkldnn_format() const { return mkldnn_format; }
                 const AxisVector& get_axis_order() const { return axis_order; }
-
                 static const AxisVector Native2DAxisOrder;
                 static const AxisVector Native4DAxisOrder;
                 static const AxisVector CHWNAxisOrder;
@@ -64,7 +65,8 @@ namespace ngraph
                 mkldnn::memory::format mkldnn_format;
             };
 
-            typedef std::vector<std::shared_ptr<ngraph::runtime::cpu::LayoutDescriptor>> LayoutDescriptorPtrs;
+            typedef std::vector<std::shared_ptr<ngraph::runtime::cpu::LayoutDescriptor>>
+                LayoutDescriptorPtrs;
         }
     }
 }

src/ngraph/runtime/cpu/cpu_tensor_view.cpp

@@ -15,12 +15,12 @@
 #include <cstring>
 #include <memory>
 
-#include "ngraph/except.hpp"
-#include "ngraph/shape.hpp"
+#include "cpu_tensor_view.hpp"
 #include "ngraph/descriptor/layout/tensor_view_layout.hpp"
 #include "ngraph/descriptor/primary_tensor_view.hpp"
+#include "ngraph/except.hpp"
 #include "ngraph/runtime/cpu/cpu_layout_descriptor.hpp"
-#include "cpu_tensor_view.hpp"
+#include "ngraph/shape.hpp"
 
 using namespace ngraph;
 using namespace std;
@@ -41,9 +41,8 @@ runtime::cpu::CPUTensorView::CPUTensorView(const ngraph::element::Type& element_
     // TODO(jmenon): A fallback layout should not be needed but is required
     // because of how some unit test functionality is written (ex. 'backprop_derivative')
     // This needs to be removed
-    m_descriptor->set_tensor_view_layout(
-        std::make_shared<runtime::cpu::LayoutDescriptor>(*m_descriptor,
-                                                         runtime::cpu::LayoutDescriptor::create_native_axis_order(shape.size())));
+    m_descriptor->set_tensor_view_layout(std::make_shared<runtime::cpu::LayoutDescriptor>(
+        *m_descriptor, runtime::cpu::LayoutDescriptor::create_native_axis_order(shape.size())));
 
     buffer_size = shape_size(shape) * element_type.size();
     if (buffer_size)

src/ngraph/runtime/cpu/mkldnn_utils.cpp

@@ -31,13 +31,10 @@ namespace ngraph
         {
             namespace MKLDNN
             {
-
 #define TI(x) std::type_index(typeid(x))
 
                 const std::unordered_set<std::type_index> OpRegistry{
-                    TI(ngraph::op::Convolution),
-                    TI(ngraph::op::AvgPool),
-                    TI(ngraph::op::MaxPool),
+                    TI(ngraph::op::Convolution), TI(ngraph::op::AvgPool), TI(ngraph::op::MaxPool),
                 };
 
                 bool IsMKLDNNOp(ngraph::Node& op)
@@ -45,18 +42,15 @@ namespace ngraph
                     return (OpRegistry.find(TI(op)) != OpRegistry.end());
                 }
 
-                mkldnn::memory::format CreateNativeDataFormat(const ngraph::runtime::cpu::LayoutDescriptor& layout)
+                mkldnn::memory::format
+                    CreateNativeDataFormat(const ngraph::runtime::cpu::LayoutDescriptor& layout)
                 {
-                    switch(layout.get_shape().size())
+                    switch (layout.get_shape().size())
                     {
-                    case 1:
-                        return mkldnn::memory::format::x;
-                    case 2:
-                        return mkldnn::memory::format::nc;
-                    case 4:
-                        return mkldnn::memory::format::nchw;
-                    default:
-                        return mkldnn::memory::format::format_undef;
+                    case 1: return mkldnn::memory::format::x;
+                    case 2: return mkldnn::memory::format::nc;
+                    case 4: return mkldnn::memory::format::nchw;
+                    default: return mkldnn::memory::format::format_undef;
                     }
                 }
             }

src/ngraph/runtime/cpu/mkldnn_utils.hpp

@@ -32,7 +32,8 @@ namespace ngraph
             namespace MKLDNN
             {
                 bool IsMKLDNNOp(ngraph::Node& op);
-                mkldnn::memory::format CreateNativeDataFormat(const ngraph::runtime::cpu::LayoutDescriptor& layout);
+                mkldnn::memory::format
+                    CreateNativeDataFormat(const ngraph::runtime::cpu::LayoutDescriptor& layout);
             }
         }
     }

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

@@ -40,10 +40,11 @@ bool CPULayout::run_on_call_graph(const std::list<std::shared_ptr<Node>>& nodes)
             auto& tensor = tv->get_tensor();
             auto rank = tvt->get_shape().size();
 
-            auto native_axis_order = ngraph::runtime::cpu::LayoutDescriptor::create_native_axis_order(rank);
+            auto native_axis_order =
+                ngraph::runtime::cpu::LayoutDescriptor::create_native_axis_order(rank);
 
-            auto layout = std::make_shared<ngraph::runtime::cpu::LayoutDescriptor>(
-                *tv, native_axis_order);
+            auto layout =
+                std::make_shared<ngraph::runtime::cpu::LayoutDescriptor>(*tv, native_axis_order);
 
             if (tensor.is_output() || tensor.is_input() || tensor.is_constant())
             {

src/ngraph/runtime/tensor_view.hpp

@@ -19,8 +19,8 @@
 
 #include "ngraph/descriptor/tensor_view.hpp"
 #include "ngraph/shape.hpp"
-#include "ngraph/util.hpp"
 #include "ngraph/types/element_type.hpp"
+#include "ngraph/util.hpp"
 
 namespace ngraph
 {