[neurun] Change internal datatype enum name (#2435)
author오형석/동작제어Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com>
Thu, 23 Aug 2018 08:33:25 +0000 (17:33 +0900)
committerGitHub Enterprise <noreply-CODE@samsung.com>
Thu, 23 Aug 2018 08:33:25 +0000 (17:33 +0900)
Change enum name used for neurun internal data type

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
runtimes/neurun/src/backend/cpu/InitializerGenerator.cc
runtimes/neurun/src/internal/operand/DataType.h

index eea0352..d626a1c 100644 (file)
@@ -56,7 +56,7 @@ InitializerGenerator::generateWeight(const ::internal::tflite::op::FullyConnecte
 
   switch (weight_type)
   {
-    case ::neurun::internal::operand::DataType::NEURUN_TENSOR_FLOAT32:
+    case ::neurun::internal::operand::DataType::TENSOR_FLOAT32:
     {
       return [num_output, ifm_shape, weight_base, weight_size](::arm_compute::ITensor &tensor) {
         const ::nnfw::util::kernel::Shape ker_shape{num_output, ifm_shape.C, ifm_shape.H,
@@ -83,7 +83,7 @@ InitializerGenerator::generateWeight(const ::internal::tflite::op::FullyConnecte
                };
       };
     }
-    case ::neurun::internal::operand::DataType::NEURUN_TENSOR_QUANT8_ASYMM:
+    case ::neurun::internal::operand::DataType::TENSOR_QUANT8_ASYMM:
     {
       return [num_output, ifm_shape, weight_base, weight_size](::arm_compute::ITensor &tensor) {
         const ::nnfw::util::kernel::Shape ker_shape{num_output, ifm_shape.C, ifm_shape.H,
@@ -151,7 +151,7 @@ InitializerGenerator::generateBias(const ::internal::tflite::op::FullyConnected:
 
   switch (bias_type)
   {
-    case ::neurun::internal::operand::DataType::NEURUN_TENSOR_FLOAT32:
+    case ::neurun::internal::operand::DataType::TENSOR_FLOAT32:
     {
       return [bias_base, bias_size](::arm_compute::ITensor &tensor) {
         for (uint32_t n = 0; n < bias_size; ++n)
@@ -167,7 +167,7 @@ InitializerGenerator::generateBias(const ::internal::tflite::op::FullyConnected:
         }
       };
     }
-    case ::neurun::internal::operand::DataType::NEURUN_TENSOR_QUANT8_ASYMM:
+    case ::neurun::internal::operand::DataType::TENSOR_QUANT8_ASYMM:
     {
       return [bias_base, bias_size](::arm_compute::ITensor &tensor) {
         for (uint32_t n = 0; n < bias_size; ++n)
index ec257b7..cc23d7f 100644 (file)
@@ -10,14 +10,14 @@ namespace operand
 
 enum class DataType
 {
-  NEURUN_SCALAR_FLOAT32 = 0,
-  NEURUN_SCALAR_INT32 = 1,
-  NEURUN_SCALAR_UINT32 = 2,
+  SCALAR_FLOAT32 = 0,
+  SCALAR_INT32 = 1,
+  SCALAR_UINT32 = 2,
 
-  NEURUN_TENSOR_FLOAT32 = 3,
-  NEURUN_TENSOR_INT32 = 4,
+  TENSOR_FLOAT32 = 3,
+  TENSOR_INT32 = 4,
 
-  NEURUN_TENSOR_QUANT8_ASYMM = 5,
+  TENSOR_QUANT8_ASYMM = 5,
 };
 
 } // namespace operand