IVGCVSW-5815 Generalise ConstCpuTensorHandle

* Generalises ConstCpuTensorHandle and inherited
  classes by removing 'Cpu' from aliases.
* New renamed classes: ConstTensorHandle, TensorHandle,
  ScopedTensorHandle, PassthroughTensorHandle,
  ConstPassthroughTensorHandle.

Signed-off-by: James Conroy <james.conroy@arm.com>
Change-Id: I1824e0e134202735fb77051f20a7252f161dfe16

1 files changed, 0 insertions, 245 deletions

diff --git a/src/backends/backendsCommon/CpuTensorHandle.hpp b/src/backends/backendsCommon/CpuTensorHandle.hpp
deleted file mode 100644
index fdd2439b41..0000000000
--- a/src/backends/backendsCommon/CpuTensorHandle.hpp
+++ /dev/null
@@ -1,245 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#pragma once
-
-#include <armnn/backends/CpuTensorHandleFwd.hpp>
-#include <armnn/backends/ITensorHandle.hpp>
-
-#include <armnn/TypesUtils.hpp>
-
-#include <CompatibleTypes.hpp>
-
-#include <algorithm>
-
-#include <armnn/utility/Assert.hpp>
-
-namespace armnn
-{
-
-// Get a TensorShape representing the strides (in bytes) for each dimension
-// of a tensor, assuming fully packed data with no padding
-TensorShape GetUnpaddedTensorStrides(const TensorInfo& tensorInfo);
-
-// Abstract tensor handles wrapping a CPU-readable region of memory, interpreting it as tensor data.
-class ConstCpuTensorHandle : public ITensorHandle
-{
-public:
-    template <typename T>
-    const T* GetConstTensor() const
-    {
-        ARMNN_ASSERT(CompatibleTypes<T>(GetTensorInfo().GetDataType()));
-        return reinterpret_cast<const T*>(m_Memory);
-    }
-
-    const TensorInfo& GetTensorInfo() const
-    {
-        return m_TensorInfo;
-    }
-
-    virtual void Manage() override {}
-
-    virtual ITensorHandle* GetParent() const override { return nullptr; }
-
-    virtual const void* Map(bool /* blocking = true */) const override { return m_Memory; }
-    virtual void Unmap() const override {}
-
-    TensorShape GetStrides() const override
-    {
-        return GetUnpaddedTensorStrides(m_TensorInfo);
-    }
-    TensorShape GetShape() const override { return m_TensorInfo.GetShape(); }
-
-protected:
-    ConstCpuTensorHandle(const TensorInfo& tensorInfo);
-
-    void SetConstMemory(const void* mem) { m_Memory = mem; }
-
-private:
-    // Only used for testing
-    void CopyOutTo(void *) const override { ARMNN_ASSERT_MSG(false, "Unimplemented"); }
-    void CopyInFrom(const void*) override { ARMNN_ASSERT_MSG(false, "Unimplemented"); }
-
-    ConstCpuTensorHandle(const ConstCpuTensorHandle& other) = delete;
-    ConstCpuTensorHandle& operator=(const ConstCpuTensorHandle& other) = delete;
-
-    TensorInfo m_TensorInfo;
-    const void* m_Memory;
-};
-
-template<>
-const void* ConstCpuTensorHandle::GetConstTensor<void>() const;
-
-// Abstract specialization of ConstCpuTensorHandle that allows write access to the same data.
-class CpuTensorHandle : public ConstCpuTensorHandle
-{
-public:
-    template <typename T>
-    T* GetTensor() const
-    {
-        ARMNN_ASSERT(CompatibleTypes<T>(GetTensorInfo().GetDataType()));
-        return reinterpret_cast<T*>(m_MutableMemory);
-    }
-
-protected:
-    CpuTensorHandle(const TensorInfo& tensorInfo);
-
-    void SetMemory(void* mem)
-    {
-        m_MutableMemory = mem;
-        SetConstMemory(m_MutableMemory);
-    }
-
-private:
-
-    CpuTensorHandle(const CpuTensorHandle& other) = delete;
-    CpuTensorHandle& operator=(const CpuTensorHandle& other) = delete;
-    void* m_MutableMemory;
-};
-
-template <>
-void* CpuTensorHandle::GetTensor<void>() const;
-
-// A CpuTensorHandle that owns the wrapped memory region.
-class ScopedCpuTensorHandle : public CpuTensorHandle
-{
-public:
-    explicit ScopedCpuTensorHandle(const TensorInfo& tensorInfo);
-
-    // Copies contents from Tensor.
-    explicit ScopedCpuTensorHandle(const ConstTensor& tensor);
-
-    // Copies contents from ConstCpuTensorHandle
-    explicit ScopedCpuTensorHandle(const ConstCpuTensorHandle& tensorHandle);
-
-    ScopedCpuTensorHandle(const ScopedCpuTensorHandle& other);
-    ScopedCpuTensorHandle& operator=(const ScopedCpuTensorHandle& other);
-    ~ScopedCpuTensorHandle();
-
-    virtual void Allocate() override;
-
-private:
-    // Only used for testing
-    void CopyOutTo(void* memory) const override;
-    void CopyInFrom(const void* memory) override;
-
-    void CopyFrom(const ScopedCpuTensorHandle& other);
-    void CopyFrom(const void* srcMemory, unsigned int numBytes);
-};
-
-// A CpuTensorHandle that wraps an already allocated memory region.
-//
-// Clients must make sure the passed in memory region stays alive for the lifetime of
-// the PassthroughCpuTensorHandle instance.
-//
-// Note there is no polymorphism to/from ConstPassthroughCpuTensorHandle.
-class PassthroughCpuTensorHandle : public CpuTensorHandle
-{
-public:
-    PassthroughCpuTensorHandle(const TensorInfo& tensorInfo, void* mem)
-    :   CpuTensorHandle(tensorInfo)
-    {
-        SetMemory(mem);
-    }
-
-    virtual void Allocate() override;
-};
-
-// A ConstCpuTensorHandle that wraps an already allocated memory region.
-//
-// This allows users to pass in const memory to a network.
-// Clients must make sure the passed in memory region stays alive for the lifetime of
-// the PassthroughCpuTensorHandle instance.
-//
-// Note there is no polymorphism to/from PassthroughCpuTensorHandle.
-class ConstPassthroughCpuTensorHandle : public ConstCpuTensorHandle
-{
-public:
-    ConstPassthroughCpuTensorHandle(const TensorInfo& tensorInfo, const void* mem)
-    :   ConstCpuTensorHandle(tensorInfo)
-    {
-        SetConstMemory(mem);
-    }
-
-    virtual void Allocate() override;
-};
-
-
-// Template specializations.
-
-template <>
-const void* ConstCpuTensorHandle::GetConstTensor() const;
-
-template <>
-void* CpuTensorHandle::GetTensor() const;
-
-class ManagedConstTensorHandle
-{
-
-public:
-    explicit ManagedConstTensorHandle(std::shared_ptr<ConstCpuTensorHandle> ptr)
-        : m_Mapped(false)
-        , m_TensorHandle(std::move(ptr)) {};
-
-    /// RAII Managed resource Unmaps MemoryArea once out of scope
-    const void* Map(bool blocking = true)
-    {
-        if (m_TensorHandle)
-        {
-            auto pRet = m_TensorHandle->Map(blocking);
-            m_Mapped = true;
-            return pRet;
-        }
-        else
-        {
-            throw armnn::Exception("Attempting to Map null TensorHandle");
-        }
-
-    }
-
-    // Delete copy constructor as it's unnecessary
-    ManagedConstTensorHandle(const ConstCpuTensorHandle& other) = delete;
-
-    // Delete copy assignment as it's unnecessary
-    ManagedConstTensorHandle& operator=(const ManagedConstTensorHandle& other) = delete;
-
-    // Delete move assignment as it's unnecessary
-    ManagedConstTensorHandle& operator=(ManagedConstTensorHandle&& other) noexcept = delete;
-
-    ~ManagedConstTensorHandle()
-    {
-        // Bias tensor handles need to be initialized empty before entering scope of if statement checking if enabled
-        if (m_TensorHandle)
-        {
-            Unmap();
-        }
-    }
-
-    void Unmap()
-    {
-        // Only unmap if mapped and TensorHandle exists.
-        if (m_Mapped && m_TensorHandle)
-        {
-            m_TensorHandle->Unmap();
-            m_Mapped = false;
-        }
-    }
-
-    const TensorInfo& GetTensorInfo() const
-    {
-        return m_TensorHandle->GetTensorInfo();
-    }
-
-    bool IsMapped() const
-    {
-        return m_Mapped;
-    }
-
-private:
-    bool m_Mapped;
-    std::shared_ptr<ConstCpuTensorHandle> m_TensorHandle;
-};
-
-} // namespace armnn