Merge pull request #238 from NervanaSystems/bob/compile_cleanup

cleanup headers used by generated code

src/ngraph/runtime/cpu/cpu_kernels.hpp

@@ -14,7 +14,8 @@
 
 #pragma once
 
-#include "ngraph/types/element_type.hpp"
+#include <cinttypes>
+#include <cstddef>
 
 // CBLAS types and wrappers
 
@@ -73,17 +74,17 @@ namespace cblas
     void cblas_sgemm(const Layout layout,
                      const Transpose TransA,
                      const Transpose TransB,
-                     const ngraph::element::Int64::type M,
-                     const ngraph::element::Int64::type N,
-                     const ngraph::element::Int64::type K,
-                     const ngraph::element::Float32::type alpha,
-                     const ngraph::element::Float32::type* A,
-                     const ngraph::element::Int64::type lda,
-                     const ngraph::element::Float32::type* B,
-                     const ngraph::element::Int64::type ldb,
-                     const ngraph::element::Float32::type beta,
-                     ngraph::element::Float32::type* C,
-                     const ngraph::element::Int64::type ldc);
+                     const int64_t M,
+                     const int64_t N,
+                     const int64_t K,
+                     const float alpha,
+                     const float* A,
+                     const int64_t lda,
+                     const float* B,
+                     const int64_t ldb,
+                     const float beta,
+                     float* C,
+                     const int64_t ldc);
     }
 }
 
@@ -94,10 +95,10 @@ namespace mkl
                        char trans,
                        size_t rows,
                        size_t cols,
-                       const ngraph::element::Float32::type alpha,
-                       const ngraph::element::Float32::type* A,
+                       const float alpha,
+                       const float* A,
                        size_t lda,
-                       ngraph::element::Float32::type* B,
+                       float* B,
                        size_t ldb);
     }
 }

src/ngraph/runtime/cpu/eigen_utils.hpp

@@ -14,13 +14,9 @@
 
 #pragma once
 
-#include <memory>
-
 #include <Eigen/Dense>
 
-#include "ngraph/descriptor/layout/dense_tensor_view_layout.hpp"
-#include "ngraph/runtime/cpu/call_frame.hpp"
-#include "ngraph/runtime/tensor_view_info.hpp"
+#include "ngraph/common.hpp"
 
 namespace ngraph
 {
@@ -62,14 +58,6 @@ namespace ngraph
                     class V
                     {
                     public:
-                        V(const TensorViewInfo& tensor_view_info)
-                            : l0(tensor_view_info
-                                     .get_layout<
-                                         ngraph::descriptor::layout::DenseTensorViewLayout>()
-                                     ->get_size())
-                        {
-                        }
-
                         V(size_t s)
                             : l0(s)
                         {
@@ -84,12 +72,6 @@ namespace ngraph
 
                     class M
                     {
-                        M(const std::shared_ptr<ngraph::descriptor::layout::DenseTensorViewLayout>&
-                              layout)
-                            : M(layout->get_shape(), layout->get_strides())
-                        {
-                        }
-
                     public:
                         M(const Shape& shape, const Strides& strides)
                             : l0(shape.at(0))
@@ -99,12 +81,6 @@ namespace ngraph
                         {
                         }
 
-                        M(const TensorViewInfo& tensor_view_info)
-                            : M(tensor_view_info.get_layout<
-                                  ngraph::descriptor::layout::DenseTensorViewLayout>())
-                        {
-                        }
-
                     public:
                         size_t l0;
                         size_t l1;
@@ -113,7 +89,7 @@ namespace ngraph
                     };
                 }
 
-                // T element type
+                // ET element type
                 // FMT array format (fmt::V for vector, etc.)
                 // BASE select array/matrix
                 template <typename T,
@@ -130,14 +106,6 @@ namespace ngraph
                     {
                     }
 
-                    EigenWrapper(
-                        T* t,
-                        const std::shared_ptr<ngraph::descriptor::layout::DenseTensorViewLayout>&
-                            layout)
-                        : base(t, layout->get_size(), 1, DynamicStrides(1, 1))
-                    {
-                    }
-
                     template <typename U>
                     EigenWrapper& operator=(const U& other)
                     {
@@ -160,4 +128,4 @@ namespace ngraph
             }
         }
     }
-}
+}
\ No newline at end of file

src/ngraph/runtime/cpu/external_function.cpp

@@ -199,14 +199,9 @@ void ExternalFunction::compile()
 
 #include <Eigen/Dense>
 
-#include "ngraph/descriptor/layout/dense_tensor_view_layout.hpp"
-#include "ngraph/runtime/cpu/call_frame.hpp"
 #include "ngraph/runtime/cpu/cpu_kernels.hpp"
 #include "ngraph/runtime/cpu/eigen_utils.hpp"
-#include "ngraph/runtime/utils.hpp"
 
-using namespace ngraph::element;
-using namespace ngraph::runtime;
 using namespace ngraph::runtime::cpu::eigen;
 
 extern "C" void allocate_aligned_buffer(