Redefine HashTableLookup CPU implementation as SimpleHashTableLookup (#3804)

This patch redefines HashTableLookup CPU implementation as SimpleHashTableLookup.
Since we follow a naming convention for CPU implementation with prefix 'Simple'.

Signed-off-by: prasannar <prasanna.r@samsung.com>

diff --git a/runtimes/pure_arm_compute/src/compilation.cc b/runtimes/pure_arm_compute/src/compilation.cc
index 8b0457d..dbe925d 100644 (file)
--- a/runtimes/pure_arm_compute/src/compilation.cc
+++ b/runtimes/pure_arm_compute/src/compilation.cc
@@ -100,7 +100,7 @@
 #include "internal/layers/SimpleEmbeddingLookup.h"
 #include "internal/layers/SimpleDepthToSpace.h"
 #include "internal/layers/SimpleBatchToSpaceNd.h"
-#include "internal/layers/HashtableLookupLayer.h"
+#include "internal/layers/SimpleHashtableLookupLayer.h"
 #include "internal/layers/SimplePackLayer.h"
 #include "internal/layers/SimpleSpaceToBatchND.h"
 #include "internal/layers/SimpleNeg.h"
@@ -4928,7 +4928,7 @@ void Planner::visit(const ::internal::tflite::op::HashtableLookup::Node &node)
 
     if (from_env<bool>(std::getenv("USE_SIMPLE_HASHTABLELOOKUP")))
     {
-      auto fn = nnfw::make_unique<HashtableLookupLayer>();
+      auto fn = nnfw::make_unique<SimpleHashtableLookupLayer>();
 
       fn->configure(lookups_alloc, keys_alloc, values_alloc, output_alloc, hits_alloc);
 

diff --git a/runtimes/pure_arm_compute/src/internal/layers/HashtableLookupLayer.cc b/runtimes/pure_arm_compute/src/internal/layers/SimpleHashtableLookupLayer.cc
similarity index 90%
rename from runtimes/pure_arm_compute/src/internal/layers/HashtableLookupLayer.cc
rename to runtimes/pure_arm_compute/src/internal/layers/SimpleHashtableLookupLayer.cc
index 2293aed..7f8ae25 100644 (file)
--- a/runtimes/pure_arm_compute/src/internal/layers/HashtableLookupLayer.cc
+++ b/runtimes/pure_arm_compute/src/internal/layers/SimpleHashtableLookupLayer.cc
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-#include "internal/layers/HashtableLookupLayer.h"
+#include "internal/layers/SimpleHashtableLookupLayer.h"
 
 #include <arm_compute/runtime/CL/CLScheduler.h>
 
-void HashtableLookupLayer::configure(::arm_compute::ITensor *lookups, ::arm_compute::ITensor *keys,
-                                     ::arm_compute::ITensor *values, ::arm_compute::ITensor *output,
-                                     ::arm_compute::ITensor *hits)
+void SimpleHashtableLookupLayer::configure(::arm_compute::ITensor *lookups,
+                                           ::arm_compute::ITensor *keys,
+                                           ::arm_compute::ITensor *values,
+                                           ::arm_compute::ITensor *output,
+                                           ::arm_compute::ITensor *hits)
 {
   _lookups = lookups;
   _keys = keys;
@@ -30,7 +32,7 @@ void HashtableLookupLayer::configure(::arm_compute::ITensor *lookups, ::arm_comp
   _lookup_indices.resize(lookups->info()->dimension(0), -1);
 }
 
-void HashtableLookupLayer::run()
+void SimpleHashtableLookupLayer::run()
 {
   auto &queue = ::arm_compute::CLScheduler::get().queue();
   if (::internal::arm_compute::isGpuMode())

diff --git a/runtimes/pure_arm_compute/src/internal/layers/HashtableLookupLayer.h b/runtimes/pure_arm_compute/src/internal/layers/SimpleHashtableLookupLayer.h
similarity index 85%
rename from runtimes/pure_arm_compute/src/internal/layers/HashtableLookupLayer.h
rename to runtimes/pure_arm_compute/src/internal/layers/SimpleHashtableLookupLayer.h
index f8c28c2..ba9d2ec 100644 (file)
--- a/runtimes/pure_arm_compute/src/internal/layers/HashtableLookupLayer.h
+++ b/runtimes/pure_arm_compute/src/internal/layers/SimpleHashtableLookupLayer.h
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#ifndef __HASHTABLE_LOOKUP_H__
-#define __HASHTABLE_LOOKUP_H__
+#ifndef __SIMPLE_HASHTABLE_LOOKUP_H__
+#define __SIMPLE_HASHTABLE_LOOKUP_H__
 
 #include "internal/arm_compute.h"
 
-class HashtableLookupLayer : public ::arm_compute::IFunction
+class SimpleHashtableLookupLayer : public ::arm_compute::IFunction
 {
 public:
-  HashtableLookupLayer(void)
+  SimpleHashtableLookupLayer(void)
       : _lookups(nullptr), _keys(nullptr), _values(nullptr), _output(nullptr), _hits(nullptr)
   {
     // DO NOTHING
@@ -43,4 +43,4 @@ private:
   std::vector<int32_t> _lookup_indices;
 };
 
-#endif /*__HASHTABLE_LOOKUP_H__ */
+#endif /*__SIMPLE_HASHTABLE_LOOKUP_H__ */