From c05a0659fd90f7990439e8e729cba0d2e32236fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Thu, 23 Aug 2018 17:33:25 +0900 Subject: [PATCH] [neurun] Change internal datatype enum name (#2435) Change enum name used for neurun internal data type Signed-off-by: Hyeongseok Oh --- runtimes/neurun/src/backend/cpu/InitializerGenerator.cc | 8 ++++---- runtimes/neurun/src/internal/operand/DataType.h | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/runtimes/neurun/src/backend/cpu/InitializerGenerator.cc b/runtimes/neurun/src/backend/cpu/InitializerGenerator.cc index eea0352..d626a1c 100644 --- a/runtimes/neurun/src/backend/cpu/InitializerGenerator.cc +++ b/runtimes/neurun/src/backend/cpu/InitializerGenerator.cc @@ -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) diff --git a/runtimes/neurun/src/internal/operand/DataType.h b/runtimes/neurun/src/internal/operand/DataType.h index ec257b7..cc23d7f 100644 --- a/runtimes/neurun/src/internal/operand/DataType.h +++ b/runtimes/neurun/src/internal/operand/DataType.h @@ -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 -- 2.7.4