fixed compiler errors

src/ngraph/runtime/aligned_buffer.cpp

@@ -17,6 +17,7 @@
 #include <memory>
 
 #include "ngraph/runtime/aligned_buffer.hpp"
+#include "ngraph/runtime/cpu/cpu_mkl_allocator.hpp"
 #include "ngraph/util.hpp"
 
 using namespace ngraph;
@@ -31,6 +32,7 @@ runtime::AlignedBuffer::AlignedBuffer()
 runtime::AlignedBuffer::AlignedBuffer(size_t byte_size, size_t alignment)
 {
     m_byte_size = byte_size;
+    auto cpu_allocator = ngraph::runtime::cpu::GetCPUAllocator();
     if (m_byte_size > 0)
     {
         size_t allocation_size = m_byte_size + alignment;

src/ngraph/runtime/cpu/cpu_mkl_allocator.cpp

@@ -15,16 +15,55 @@
 //*****************************************************************************
 
 #include "ngraph/runtime/cpu/cpu_mkl_allocator.hpp"
+#include <string>
+#include "ngraph/except.hpp"
 
-ngraph::runtime::cpu::CPUAllocator::CPUAllocator()
-    : m_buffer(nullptr)
-    , m_byte_size(0)
+ngraph::runtime::cpu::CPUAllocator::CPUAllocator(AllocateFunc allocator,
+                                                 DestroyFunc deallocator,
+                                                 size_t alignment)
+    : m_framework_allocator(allocator)
+    , m_framework_deallocator(deallocator)
+    , m_alignment(alignment)
 {
+    mkl::i_malloc = MallocHook;
+    mkl::i_free = FreeHook;
 }
 
-ngraph::runtime::cpu::CPUAllocator::CPUAllocator(size_t size)
+void* ngraph::runtime::cpu::CPUAllocator::cpu_malloc(size_t size)
 {
-    m_byte_size = size;
-    mkl::i_malloc = MallocHook;
-    mkl::i_free = FreeHook;
+    void* ptr;
+    if (m_framework_allocator != nullptr)
+    {
+        ptr = m_framework_allocator(nullptr, m_alignment, size);
+    }
+    else
+    {
+        ptr = malloc(size);
+    }
+
+    // check for exception
+    if (size != 0 && !ptr)
+    {
+        throw ngraph_error("malloc failed to allocate memory of size " + std::to_string(size));
+        throw std::bad_alloc();
+    }
+    return ptr;
+}
+
+void ngraph::runtime::cpu::CPUAllocator::cpu_free(void* ptr)
+{
+    if (m_framework_deallocator && ptr)
+    {
+        m_framework_deallocator(nullptr, ptr);
+    }
+    else if (ptr)
+    {
+        free(ptr);
+    }
+}
+
+ngraph::runtime::cpu::CPUAllocator& ngraph::runtime::cpu::GetCPUAllocator()
+{
+    static ngraph::runtime::cpu::CPUAllocator cpu_allocator(nullptr, nullptr, 4096);
+    return cpu_allocator;
 }

src/ngraph/runtime/cpu/cpu_mkl_allocator.hpp

@@ -22,6 +22,8 @@
 #include "ngraph/util.hpp"
 
 using namespace ngraph;
+using AllocateFunc = void* (*)(void*, size_t, size_t);
+using DestroyFunc = void (*)(void*, void*);
 
 namespace mkl
 {
@@ -45,6 +47,7 @@ namespace ngraph
         namespace cpu
         {
             class CPUAllocator;
+            extern CPUAllocator& GetCPUAllocator();
         }
     }
 }
@@ -52,18 +55,24 @@ namespace ngraph
 class ngraph::runtime::cpu::CPUAllocator
 {
 public:
-    CPUAllocator(size_t size);
-    CPUAllocator();
-    ~CPUAllocator();
+    CPUAllocator(AllocateFunc allocator, DestroyFunc deallocator, size_t alignment);
+    //~CPUAllocator();
+
+    void* cpu_malloc(size_t size);
+    void cpu_free(void* ptr);
 
 private:
-    void* m_buffer;
-    size_t m_byte_size;
+    AllocateFunc m_framework_allocator;
+    DestroyFunc m_framework_deallocator;
+    size_t m_alignment;
 
     static inline void* MallocHook(size_t size)
     {
-        void* ptr = static_cast<void*>(ngraph_malloc(size));
-        return ptr;
+        ngraph::runtime::cpu::GetCPUAllocator().cpu_malloc(size);
+    }
+
+    static inline void FreeHook(void* ptr)
+    {
+        ngraph::runtime::cpu::GetCPUAllocator().cpu_free(ptr);
     }
-    static inline void FreeHook(void* ptr) { ngraph_free(ptr); }
 };