Add support for move semantics to AlignedBuffer (#2956)

* Add move operations to AlignedBuffer

* unit test

src/ngraph/runtime/aligned_buffer.cpp

@@ -43,6 +43,16 @@ runtime::AlignedBuffer::AlignedBuffer(size_t byte_size, size_t alignment)
     }
 }
 
+runtime::AlignedBuffer::AlignedBuffer(AlignedBuffer&& other)
+    : m_allocated_buffer(other.m_allocated_buffer)
+    , m_aligned_buffer(other.m_aligned_buffer)
+    , m_byte_size(other.m_byte_size)
+{
+    other.m_allocated_buffer = nullptr;
+    other.m_aligned_buffer = nullptr;
+    other.m_byte_size = 0;
+}
+
 runtime::AlignedBuffer::~AlignedBuffer()
 {
     if (m_allocated_buffer != nullptr)
@@ -50,3 +60,17 @@ runtime::AlignedBuffer::~AlignedBuffer()
         ngraph_free(m_allocated_buffer);
     }
 }
+
+runtime::AlignedBuffer& runtime::AlignedBuffer::operator=(AlignedBuffer&& other)
+{
+    if (this != &other)
+    {
+        m_allocated_buffer = other.m_allocated_buffer;
+        m_aligned_buffer = other.m_aligned_buffer;
+        m_byte_size = other.m_byte_size;
+        other.m_allocated_buffer = nullptr;
+        other.m_aligned_buffer = nullptr;
+        other.m_byte_size = 0;
+    }
+    return *this;
+}

src/ngraph/runtime/aligned_buffer.hpp

@@ -36,12 +36,14 @@ public:
     AlignedBuffer();
     ~AlignedBuffer();
 
+    AlignedBuffer(AlignedBuffer&& other);
+    AlignedBuffer& operator=(AlignedBuffer&& other);
+
     size_t size() const { return m_byte_size; }
     void* get_ptr(size_t offset) const { return m_aligned_buffer + offset; }
     void* get_ptr() const { return m_aligned_buffer; }
 private:
     AlignedBuffer(const AlignedBuffer&) = delete;
-    AlignedBuffer(AlignedBuffer&&) = delete;
     AlignedBuffer& operator=(const AlignedBuffer&) = delete;
 
     char* m_allocated_buffer;

test/CMakeLists.txt

@@ -28,6 +28,7 @@ endif()
 
 set(SRC
     algebraic_simplification.cpp
+    aligned_buffer.cpp
     all_close_f.cpp
     assertion.cpp
     bfloat16.cpp

test/aligned_buffer.cpp

+//*****************************************************************************
+// Copyright 2017-2019 Intel Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//*****************************************************************************
+
+#include "gtest/gtest.h"
+
+#include "ngraph/runtime/aligned_buffer.hpp"
+
+using namespace std;
+using namespace ngraph;
+
+TEST(aligned_buffer, alignment)
+{
+    runtime::AlignedBuffer buffer(100, 64);
+    size_t addr = reinterpret_cast<size_t>(buffer.get_ptr()) % 64;
+    EXPECT_EQ(addr, 0);
+}
+
+TEST(aligned_buffer, move)
+{
+    {
+        runtime::AlignedBuffer buffer1(100, 64);
+        runtime::AlignedBuffer buffer2(move(buffer1));
+        EXPECT_EQ(buffer1.size(), 0);
+        EXPECT_EQ(buffer1.get_ptr(), nullptr);
+        EXPECT_EQ(buffer2.size(), 100);
+        EXPECT_NE(buffer2.get_ptr(), nullptr);
+    }
+    {
+        runtime::AlignedBuffer buffer1(100, 64);
+        runtime::AlignedBuffer buffer2;
+        buffer2 = move(buffer1);
+        EXPECT_EQ(buffer1.size(), 0);
+        EXPECT_EQ(buffer1.get_ptr(), nullptr);
+        EXPECT_EQ(buffer2.size(), 100);
+        EXPECT_NE(buffer2.get_ptr(), nullptr);
+    }
+}