From f9426b338018550ec77c2339eb98a0ea0ff8e063 Mon Sep 17 00:00:00 2001
From: ruoyan01 <ruomei.yan@arm.com>
Date: Thu, 3 Jan 2019 15:10:00 +0000
Subject: [PATCH] IVGCVSW-2370 Code clean up after Equal operator
 implementation where necessary

StringMapping was located in the backendsCommon

Change-Id: I1c4a0bfca986722c721fcb2b460c03d6e1cd4568
---
 src/backends/backendsCommon/CMakeLists.txt                             | 2 --
 src/backends/backendsCommon/common.mk                                  | 1 -
 src/backends/reference/backend.mk                                      | 1 +
 src/backends/reference/workloads/CMakeLists.txt                        | 2 ++
 src/backends/reference/workloads/RefElementwiseWorkload.hpp            | 2 +-
 src/backends/{backendsCommon => reference/workloads}/StringMapping.cpp | 0
 src/backends/{backendsCommon => reference/workloads}/StringMapping.hpp | 0
 7 files changed, 4 insertions(+), 4 deletions(-)
 rename src/backends/{backendsCommon => reference/workloads}/StringMapping.cpp (100%)
 rename src/backends/{backendsCommon => reference/workloads}/StringMapping.hpp (100%)

diff --git a/src/backends/backendsCommon/CMakeLists.txt b/src/backends/backendsCommon/CMakeLists.txt
index 1fe9888..f295630 100644
--- a/src/backends/backendsCommon/CMakeLists.txt
+++ b/src/backends/backendsCommon/CMakeLists.txt
@@ -19,8 +19,6 @@ list(APPEND armnnBackendsCommon_sources
     MemCopyWorkload.hpp
     OutputHandler.cpp
     OutputHandler.hpp
-    StringMapping.cpp
-    StringMapping.hpp
     WorkloadDataCollector.hpp
     WorkloadData.cpp
     WorkloadDataFwd.hpp
diff --git a/src/backends/backendsCommon/common.mk b/src/backends/backendsCommon/common.mk
index 9c3d507..a66b5c4 100644
--- a/src/backends/backendsCommon/common.mk
+++ b/src/backends/backendsCommon/common.mk
@@ -13,7 +13,6 @@ COMMON_SOURCES := \
     ILayerSupport.cpp \
     MemCopyWorkload.cpp \
     OutputHandler.cpp \
-    StringMapping.cpp \
     WorkloadData.cpp \
     WorkloadFactory.cpp
 
diff --git a/src/backends/reference/backend.mk b/src/backends/reference/backend.mk
index d868069..b23c752 100644
--- a/src/backends/reference/backend.mk
+++ b/src/backends/reference/backend.mk
@@ -66,6 +66,7 @@ BACKEND_SOURCES := \
         workloads/ResizeBilinear.cpp \
         workloads/SpaceToBatchNd.cpp \
         workloads/StridedSlice.cpp \
+        workloads/StringMapping.cpp \
         workloads/Softmax.cpp
 
 # BACKEND_TEST_SOURCES contains the list of files to be included
diff --git a/src/backends/reference/workloads/CMakeLists.txt b/src/backends/reference/workloads/CMakeLists.txt
index 14d6ca9..d71e6ea 100644
--- a/src/backends/reference/workloads/CMakeLists.txt
+++ b/src/backends/reference/workloads/CMakeLists.txt
@@ -117,6 +117,8 @@ list(APPEND armnnRefBackendWorkloads_sources
     Splitter.hpp
     StridedSlice.hpp
     StridedSlice.cpp
+    StringMapping.cpp
+    StringMapping.hpp
     TensorBufferArrayView.hpp
     Mean.cpp
     Mean.hpp
diff --git a/src/backends/reference/workloads/RefElementwiseWorkload.hpp b/src/backends/reference/workloads/RefElementwiseWorkload.hpp
index 1b3200f..6dd6865 100644
--- a/src/backends/reference/workloads/RefElementwiseWorkload.hpp
+++ b/src/backends/reference/workloads/RefElementwiseWorkload.hpp
@@ -6,11 +6,11 @@
 #pragma once
 
 #include <armnn/Types.hpp>
-#include <backendsCommon/StringMapping.hpp>
 #include <backendsCommon/Workload.hpp>
 #include <backendsCommon/WorkloadData.hpp>
 #include "Maximum.hpp"
 #include "Minimum.hpp"
+#include "StringMapping.hpp"
 
 namespace armnn
 {
diff --git a/src/backends/backendsCommon/StringMapping.cpp b/src/backends/reference/workloads/StringMapping.cpp
similarity index 100%
rename from src/backends/backendsCommon/StringMapping.cpp
rename to src/backends/reference/workloads/StringMapping.cpp
diff --git a/src/backends/backendsCommon/StringMapping.hpp b/src/backends/reference/workloads/StringMapping.hpp
similarity index 100%
rename from src/backends/backendsCommon/StringMapping.hpp
rename to src/backends/reference/workloads/StringMapping.hpp
-- 
2.7.4