diff options
author | Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> | 2019-03-26 11:03:26 +0000 |
---|---|---|
committer | nattapat.chaimanowong <nattapat.chaimanowong@arm.com> | 2019-03-26 17:15:21 +0000 |
commit | 964e955d8962590d3ccbaba9784962e895ca656f (patch) | |
tree | 802213a507152d23fec932dfc6405540b97b7ccf /src/backends/reference | |
parent | 44db7c36c8cf0fc608d3edc2ee0eb04428085218 (diff) | |
download | armnn-964e955d8962590d3ccbaba9784962e895ca656f.tar.gz |
IVGCVSW-2881 Remove DebugDescriptor
* Also update Debug layer to use layer guid information
Change-Id: I9ec1f639299c3f855b670ff031a0e88d685cfc6b
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
Diffstat (limited to 'src/backends/reference')
-rw-r--r-- | src/backends/reference/RefLayerSupport.cpp | 2 | ||||
-rw-r--r-- | src/backends/reference/RefLayerSupport.hpp | 1 | ||||
-rw-r--r-- | src/backends/reference/workloads/Debug.cpp | 24 | ||||
-rw-r--r-- | src/backends/reference/workloads/Debug.hpp | 7 | ||||
-rw-r--r-- | src/backends/reference/workloads/RefDebugWorkload.cpp | 2 |
5 files changed, 21 insertions, 15 deletions
diff --git a/src/backends/reference/RefLayerSupport.cpp b/src/backends/reference/RefLayerSupport.cpp index d89e548323..820f36b7ac 100644 --- a/src/backends/reference/RefLayerSupport.cpp +++ b/src/backends/reference/RefLayerSupport.cpp @@ -354,11 +354,9 @@ bool RefLayerSupport::IsConvolution2dSupported(const TensorInfo& input, bool RefLayerSupport::IsDebugSupported(const TensorInfo& input, const TensorInfo& output, - const DebugDescriptor& descriptor, Optional<std::string&> reasonIfUnsupported) const { ignore_unused(output); - ignore_unused(descriptor); return IsSupportedForDataTypeRef(reasonIfUnsupported, input.GetDataType(), &TrueFunc<>, diff --git a/src/backends/reference/RefLayerSupport.hpp b/src/backends/reference/RefLayerSupport.hpp index 3b73f22927..c0d7fcf4aa 100644 --- a/src/backends/reference/RefLayerSupport.hpp +++ b/src/backends/reference/RefLayerSupport.hpp @@ -56,7 +56,6 @@ public: bool IsDebugSupported(const TensorInfo& input, const TensorInfo& output, - const DebugDescriptor& descriptor, Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const override; bool IsDepthwiseConvolutionSupported(const TensorInfo& input, diff --git a/src/backends/reference/workloads/Debug.cpp b/src/backends/reference/workloads/Debug.cpp index cc83c7b4ee..b263db67cf 100644 --- a/src/backends/reference/workloads/Debug.cpp +++ b/src/backends/reference/workloads/Debug.cpp @@ -16,9 +16,11 @@ namespace armnn template <typename T> void Debug(const TensorInfo& inputInfo, const TensorInfo& outputInfo, - const DebugDescriptor& descriptor, const T* inputData, - T* outputData) + T* outputData, + LayerGuid guid, + const std::string& layerName, + unsigned int slotIndex) { const unsigned int numDims = inputInfo.GetNumDimensions(); const unsigned int numElements = inputInfo.GetNumElements(); @@ -33,8 +35,9 @@ void Debug(const TensorInfo& inputInfo, } std::cout << "{ "; - std::cout << "\"layer\": \"" << descriptor.m_LayerName << "\", "; - std::cout << "\"outputSlot\": " << descriptor.m_SlotIndex << ", "; + std::cout << "\"layerGuid\": " << guid << ", "; + std::cout << "\"layerName\": \"" << layerName << "\", "; + std::cout << "\"outputSlot\": " << slotIndex << ", "; std::cout << "\"shape\": "; std::cout << "["; @@ -89,13 +92,18 @@ void Debug(const TensorInfo& inputInfo, template void Debug<float>(const TensorInfo& inputInfo, const TensorInfo& outputInfo, - const DebugDescriptor& descriptor, const float* inputData, - float* outputData); + float* outputData, + LayerGuid guid, + const std::string& layerName, + unsigned int slotIndex); template void Debug<uint8_t>(const TensorInfo& inputInfo, const TensorInfo& outputInfo, - const DebugDescriptor& descriptor, const uint8_t* inputData, - uint8_t* outputData); + uint8_t* outputData, + LayerGuid guid, + const std::string& layerName, + unsigned int slotIndex); + } // namespace armnn diff --git a/src/backends/reference/workloads/Debug.hpp b/src/backends/reference/workloads/Debug.hpp index 682f0bd31b..29a7d40662 100644 --- a/src/backends/reference/workloads/Debug.hpp +++ b/src/backends/reference/workloads/Debug.hpp @@ -4,7 +4,6 @@ // #pragma once -#include <armnn/Descriptors.hpp> #include <armnn/Tensor.hpp> namespace armnn @@ -13,8 +12,10 @@ namespace armnn template <typename T> void Debug(const TensorInfo& inputInfo, const TensorInfo& outputInfo, - const DebugDescriptor& descriptor, const T* inputData, - T* outputData); + T* outputData, + LayerGuid guid, + const std::string& layerName, + unsigned int slotIndex); } //namespace armnn diff --git a/src/backends/reference/workloads/RefDebugWorkload.cpp b/src/backends/reference/workloads/RefDebugWorkload.cpp index d9a47c0596..412d399adc 100644 --- a/src/backends/reference/workloads/RefDebugWorkload.cpp +++ b/src/backends/reference/workloads/RefDebugWorkload.cpp @@ -25,7 +25,7 @@ void RefDebugWorkload<DataType>::Execute() const const T* inputData = GetInputTensorData<T>(0, m_Data); T* outputData = GetOutputTensorData<T>(0, m_Data); - Debug(inputInfo, outputInfo, m_Data.m_Parameters, inputData, outputData); + Debug(inputInfo, outputInfo, inputData, outputData, m_Data.m_Guid, m_Data.m_LayerName, m_Data.m_SlotIndex); } template class RefDebugWorkload<DataType::Float32>; |