From dfdd669b501875a8f5c8cf609094ba1401b0e8e9 Mon Sep 17 00:00:00 2001 From: Chunseok Lee Date: Tue, 24 Dec 2024 16:50:38 +0900 Subject: [PATCH] [onert-micro] fix wrong namespace use in execute ns - fix strange namespace in onert_micro::execute ONE-DCO-1.0-Signed-off-by: Chunseok Lee --- .../onert-micro/src/execute/kernels/Abs.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Add.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/AddN.cpp | 10 +++++++++- .../src/execute/kernels/ArgCommon.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/ArgMax.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/ArgMin.cpp | 10 +++++++++- .../src/execute/kernels/AveragePool2D.cpp | 10 +++++++++- .../src/execute/kernels/BatchToSpaceND.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Cast.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Ceil.cpp | 10 +++++++++- .../src/execute/kernels/Concatenation.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Conv2D.cpp | 10 +++++++++- .../src/execute/kernels/ConvolutionCommon.cpp | 16 +++++++++++----- .../onert-micro/src/execute/kernels/Cos.cpp | 10 +++++++++- .../src/execute/kernels/DepthwiseConv2D.cpp | 11 +++++++++-- .../src/execute/kernels/Dequantize.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Div.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Elu.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Equal.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Exp.cpp | 10 +++++++++- .../src/execute/kernels/ExpandDims.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Fill.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Floor.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/FloorDiv.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/FloorMod.cpp | 10 +++++++++- .../src/execute/kernels/FullyConnected.cpp | 11 +++++++++-- .../onert-micro/src/execute/kernels/GRU.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Gather.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/GatherND.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Greater.cpp | 10 +++++++++- .../src/execute/kernels/GreaterEqual.cpp | 10 +++++++++- .../src/execute/kernels/L2Normalize.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/L2Pool2D.cpp | 10 +++++++++- .../src/execute/kernels/LeakyRelu.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Less.cpp | 10 +++++++++- .../src/execute/kernels/LessEqual.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Log.cpp | 10 +++++++++- .../src/execute/kernels/LogSoftmax.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Logistic.cpp | 10 +++++++++- .../src/execute/kernels/MathCommon.cpp | 10 +++++++++- .../src/execute/kernels/MaxPool2D.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Maximum.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Minimum.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Mul.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Neg.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/NotEqual.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Pack.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Pad.cpp | 10 +++++++++- .../src/execute/kernels/PoolingCommon.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Quantize.cpp | 10 +++++++++- .../src/execute/kernels/ReadKernelDataCommon.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Relu.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Relu6.cpp | 10 +++++++++- .../src/execute/kernels/ReluCommon.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Reshape.cpp | 10 +++++++++- .../src/execute/kernels/ReshapeCommon.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Round.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Rsqrt.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/SVDF.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Shape.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Sin.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Slice.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Softmax.cpp | 10 +++++++++- .../src/execute/kernels/SpaceToBatchND.cpp | 10 +++++++++- .../src/execute/kernels/SpaceToDepth.cpp | 10 +++++++++- .../execute/kernels/SpacesBatchesNDCommon.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Split.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/SplitV.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Sqrt.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Square.cpp | 10 +++++++++- .../src/execute/kernels/SquaredDifference.cpp | 11 +++++++++-- .../src/execute/kernels/StridedSlice.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Sub.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Tanh.cpp | 10 +++++++++- .../src/execute/kernels/Transpose.cpp | 10 +++++++++- .../src/execute/kernels/TransposeConv.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/Unpack.cpp | 10 +++++++++- .../onert-micro/src/execute/kernels/While.cpp | 10 +++++++++- 78 files changed, 704 insertions(+), 85 deletions(-) diff --git a/onert-micro/onert-micro/src/execute/kernels/Abs.cpp b/onert-micro/onert-micro/src/execute/kernels/Abs.cpp index 4d861061fc3..146befec474 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Abs.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Abs.cpp @@ -21,7 +21,12 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleAbs(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleAbs(const OMExecuteArgs &execute_args) { auto abs_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data, const core::OMRuntimeShape &output_shape, float *output_data) { @@ -31,3 +36,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleAbs(const OMExecuteArgs &exe return execute_math_common(execute_args, abs_float_lambda); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Add.cpp b/onert-micro/onert-micro/src/execute/kernels/Add.cpp index b8ee5502afa..03abe6e05d9 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Add.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Add.cpp @@ -37,7 +37,12 @@ constexpr uint32_t outputTensorIdx = 0; // NOTE: doesnt currently support dynamic shapes // TODO: reduce code duplication with Mul, Sub -OMStatus onert_micro::execute::execute_kernel_CircleAdd(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleAdd(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -204,3 +209,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleAdd(const OMExecuteArgs &exe return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/AddN.cpp b/onert-micro/onert-micro/src/execute/kernels/AddN.cpp index 5ab32415b01..a8f5fa58e45 100644 --- a/onert-micro/onert-micro/src/execute/kernels/AddN.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/AddN.cpp @@ -29,7 +29,12 @@ namespace constexpr uint32_t outputTensorIdx = 0; } // namespace -OMStatus onert_micro::execute::execute_kernel_CircleAddN(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleAddN(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -72,3 +77,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleAddN(const OMExecuteArgs &ex } return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/ArgCommon.cpp b/onert-micro/onert-micro/src/execute/kernels/ArgCommon.cpp index eb82073a0b2..361d7a9a446 100644 --- a/onert-micro/onert-micro/src/execute/kernels/ArgCommon.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/ArgCommon.cpp @@ -29,7 +29,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace -OMStatus onert_micro::execute::execute_arg_common( +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_arg_common( const OMExecuteArgs &execute_args, const std::function OMStatus evalGeneric(OMRuntimeKernel &runtime_kernel) } // namespace -OMStatus onert_micro::execute::execute_kernel_CircleConcatenation(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleConcatenation(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -115,3 +120,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleConcatenation(const OMExecut return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Conv2D.cpp b/onert-micro/onert-micro/src/execute/kernels/Conv2D.cpp index 63a4f3f22f0..7e82b2b77de 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Conv2D.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Conv2D.cpp @@ -42,7 +42,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace // NOTE: doesn't currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleConv2D(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleConv2D(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -174,3 +179,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleConv2D(const OMExecuteArgs & return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/ConvolutionCommon.cpp b/onert-micro/onert-micro/src/execute/kernels/ConvolutionCommon.cpp index b670ed1e088..7c0b678b4f6 100644 --- a/onert-micro/onert-micro/src/execute/kernels/ConvolutionCommon.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/ConvolutionCommon.cpp @@ -20,11 +20,14 @@ using namespace onert_micro; using namespace onert_micro::core; -OMStatus onert_micro::execute::createConvParams(core::ConvQuant ¶ms, - const circle::Tensor *input, - const circle::Tensor *filter, - const circle::Tensor *output, - circle::ActivationFunctionType act_type) +namespace onert_micro +{ +namespace execute +{ + +OMStatus createConvParams(core::ConvQuant ¶ms, const circle::Tensor *input, + const circle::Tensor *filter, const circle::Tensor *output, + circle::ActivationFunctionType act_type) { assert(input->quantization() != nullptr); // Fix caller assert(filter->quantization() != nullptr); // Fix caller @@ -93,3 +96,6 @@ OMStatus onert_micro::execute::createConvParams(core::ConvQuant ¶ms, return Ok; } + +} // namespace execute +} // namespace onert_micro diff --git a/onert-micro/onert-micro/src/execute/kernels/Cos.cpp b/onert-micro/onert-micro/src/execute/kernels/Cos.cpp index ac14f8e7f8b..a04787732e8 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Cos.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Cos.cpp @@ -21,7 +21,12 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleCos(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleCos(const OMExecuteArgs &execute_args) { auto cos_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data, const core::OMRuntimeShape &output_shape, float *output_data) { @@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleCos(const OMExecuteArgs &exe return execute_math_common(execute_args, cos_float_lambda); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/DepthwiseConv2D.cpp b/onert-micro/onert-micro/src/execute/kernels/DepthwiseConv2D.cpp index 23c6e9dea3f..e6fea15c869 100644 --- a/onert-micro/onert-micro/src/execute/kernels/DepthwiseConv2D.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/DepthwiseConv2D.cpp @@ -41,9 +41,13 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace +namespace onert_micro +{ +namespace execute +{ + // NOTE: doesn't currently support dynamic shapes -OMStatus -onert_micro::execute::execute_kernel_CircleDepthwiseConv2D(const OMExecuteArgs &execute_args) +OMStatus execute_kernel_CircleDepthwiseConv2D(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -180,3 +184,6 @@ onert_micro::execute::execute_kernel_CircleDepthwiseConv2D(const OMExecuteArgs & return status; } + +} // namespace execute +} // namespace onert_micro diff --git a/onert-micro/onert-micro/src/execute/kernels/Dequantize.cpp b/onert-micro/onert-micro/src/execute/kernels/Dequantize.cpp index 5a44d635980..f32fee33603 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Dequantize.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Dequantize.cpp @@ -35,7 +35,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleDequantize(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleDequantize(const OMExecuteArgs &execute_args) { const circle::Tensor *input = nullptr; const circle::Tensor *output = nullptr; @@ -77,3 +82,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleDequantize(const OMExecuteAr return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Div.cpp b/onert-micro/onert-micro/src/execute/kernels/Div.cpp index 03958782a66..ec52bd10892 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Div.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Div.cpp @@ -37,7 +37,12 @@ constexpr uint32_t outputTensorIdx = 0; // NOTE: doesnt currently support dynamic shapes // TODO: reduce code duplication with Add, Sub -OMStatus onert_micro::execute::execute_kernel_CircleDiv(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleDiv(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -164,3 +169,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleDiv(const OMExecuteArgs &exe return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Elu.cpp b/onert-micro/onert-micro/src/execute/kernels/Elu.cpp index 6501950a2aa..79952ba7fa7 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Elu.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Elu.cpp @@ -34,7 +34,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleElu(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleElu(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -95,3 +100,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleElu(const OMExecuteArgs &exe return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Equal.cpp b/onert-micro/onert-micro/src/execute/kernels/Equal.cpp index 4c7a6177176..bde2d64cc93 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Equal.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Equal.cpp @@ -36,7 +36,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace -OMStatus onert_micro::execute::execute_kernel_CircleEqual(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleEqual(const OMExecuteArgs &execute_args) { OMStatus status = Ok; @@ -71,3 +76,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleEqual(const OMExecuteArgs &e return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Exp.cpp b/onert-micro/onert-micro/src/execute/kernels/Exp.cpp index cc9d319dc3d..cb34c098847 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Exp.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Exp.cpp @@ -21,7 +21,12 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleExp(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleExp(const OMExecuteArgs &execute_args) { auto exp_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data, const core::OMRuntimeShape &output_shape, float *output_data) { @@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleExp(const OMExecuteArgs &exe return execute_math_common(execute_args, exp_float_lambda); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/ExpandDims.cpp b/onert-micro/onert-micro/src/execute/kernels/ExpandDims.cpp index ee52d5bb50c..983b4e9d05b 100644 --- a/onert-micro/onert-micro/src/execute/kernels/ExpandDims.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/ExpandDims.cpp @@ -20,7 +20,15 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleExpandDims(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleExpandDims(const OMExecuteArgs &execute_args) { return execute_reshape_common(execute_args); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Fill.cpp b/onert-micro/onert-micro/src/execute/kernels/Fill.cpp index 89faeccf82c..f35f802e941 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Fill.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Fill.cpp @@ -36,7 +36,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace // NOTE: doesn't currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleFill(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleFill(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -101,3 +106,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleFill(const OMExecuteArgs &ex return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Floor.cpp b/onert-micro/onert-micro/src/execute/kernels/Floor.cpp index 7bdd1ddf388..cfb2bba433f 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Floor.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Floor.cpp @@ -21,7 +21,12 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleFloor(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleFloor(const OMExecuteArgs &execute_args) { auto floor_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data, const core::OMRuntimeShape &output_shape, float *output_data) { @@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleFloor(const OMExecuteArgs &e return execute_math_common(execute_args, floor_float_lambda); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/FloorDiv.cpp b/onert-micro/onert-micro/src/execute/kernels/FloorDiv.cpp index ccff542e23e..4c32bec3943 100644 --- a/onert-micro/onert-micro/src/execute/kernels/FloorDiv.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/FloorDiv.cpp @@ -26,7 +26,12 @@ using namespace onert_micro; using namespace onert_micro::core; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleFloorDiv(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleFloorDiv(const OMExecuteArgs &execute_args) { uint8_t *input_data1; uint8_t *input_data2; @@ -77,3 +82,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleFloorDiv(const OMExecuteArgs return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/FloorMod.cpp b/onert-micro/onert-micro/src/execute/kernels/FloorMod.cpp index 73b3c8b95e8..dd2ab653fe0 100644 --- a/onert-micro/onert-micro/src/execute/kernels/FloorMod.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/FloorMod.cpp @@ -25,7 +25,12 @@ using namespace onert_micro; using namespace onert_micro::core; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleFloorMod(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleFloorMod(const OMExecuteArgs &execute_args) { uint8_t *input_data1; uint8_t *input_data2; @@ -74,3 +79,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleFloorMod(const OMExecuteArgs return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/FullyConnected.cpp b/onert-micro/onert-micro/src/execute/kernels/FullyConnected.cpp index 89d3482a3fc..cd8f0ddc6be 100644 --- a/onert-micro/onert-micro/src/execute/kernels/FullyConnected.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/FullyConnected.cpp @@ -89,9 +89,13 @@ void calculateOpDataFullyConnected(const circle::Tensor *input, const circle::Te } // namespace +namespace onert_micro +{ +namespace execute +{ + // NOTE: doesnt currently support dynamic shapes -OMStatus -onert_micro::execute::execute_kernel_CircleFullyConnected(const OMExecuteArgs &execute_args) +OMStatus execute_kernel_CircleFullyConnected(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -218,3 +222,6 @@ onert_micro::execute::execute_kernel_CircleFullyConnected(const OMExecuteArgs &e return status; } + +} // namespace execute +} // namespace onert_micro diff --git a/onert-micro/onert-micro/src/execute/kernels/GRU.cpp b/onert-micro/onert-micro/src/execute/kernels/GRU.cpp index 0a86e6c188e..33de8e51d1b 100644 --- a/onert-micro/onert-micro/src/execute/kernels/GRU.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/GRU.cpp @@ -46,7 +46,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleGRU(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleGRU(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -205,3 +210,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleGRU(const OMExecuteArgs &exe return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Gather.cpp b/onert-micro/onert-micro/src/execute/kernels/Gather.cpp index 5b220ba5444..14018609c20 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Gather.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Gather.cpp @@ -62,7 +62,12 @@ void gather(const InputT *input_data, const CoordsT *coords_data, InputT *output } // namespace // NOTE: doesn't currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleGather(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleGather(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -188,3 +193,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleGather(const OMExecuteArgs & return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/GatherND.cpp b/onert-micro/onert-micro/src/execute/kernels/GatherND.cpp index e5f3571c828..c92a9e0b8e1 100644 --- a/onert-micro/onert-micro/src/execute/kernels/GatherND.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/GatherND.cpp @@ -31,7 +31,12 @@ using namespace onert_micro::core; using namespace onert_micro::execute; // NOTE: doesn't currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleGatherND(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleGatherND(const OMExecuteArgs &execute_args) { uint8_t *input_data; @@ -68,3 +73,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleGatherND(const OMExecuteArgs return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Greater.cpp b/onert-micro/onert-micro/src/execute/kernels/Greater.cpp index 82feefc148f..30a06f5099b 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Greater.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Greater.cpp @@ -36,7 +36,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace -OMStatus onert_micro::execute::execute_kernel_CircleGreater(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleGreater(const OMExecuteArgs &execute_args) { OMStatus status = Ok; @@ -70,3 +75,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleGreater(const OMExecuteArgs return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/GreaterEqual.cpp b/onert-micro/onert-micro/src/execute/kernels/GreaterEqual.cpp index 70255d919f2..997f64b1aa3 100644 --- a/onert-micro/onert-micro/src/execute/kernels/GreaterEqual.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/GreaterEqual.cpp @@ -36,7 +36,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace -OMStatus onert_micro::execute::execute_kernel_CircleGreaterEqual(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleGreaterEqual(const OMExecuteArgs &execute_args) { OMStatus status = Ok; @@ -70,3 +75,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleGreaterEqual(const OMExecute return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/L2Normalize.cpp b/onert-micro/onert-micro/src/execute/kernels/L2Normalize.cpp index a0a46c53b75..25f13d91350 100644 --- a/onert-micro/onert-micro/src/execute/kernels/L2Normalize.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/L2Normalize.cpp @@ -36,7 +36,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleL2Normalize(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleL2Normalize(const OMExecuteArgs &execute_args) { const circle::Tensor *input = nullptr; const circle::Tensor *output = nullptr; @@ -80,3 +85,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleL2Normalize(const OMExecuteA return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/L2Pool2D.cpp b/onert-micro/onert-micro/src/execute/kernels/L2Pool2D.cpp index 032652a2fb6..12e4b8f62bb 100644 --- a/onert-micro/onert-micro/src/execute/kernels/L2Pool2D.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/L2Pool2D.cpp @@ -21,7 +21,12 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleL2Pool2D(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleL2Pool2D(const OMExecuteArgs &execute_args) { auto l2_pool_float_lambda = [](const core::Pool2DParams ¶ms, const core::OMRuntimeShape &input_shape, const float *input_data, @@ -43,3 +48,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleL2Pool2D(const OMExecuteArgs return execute_pooling_common(execute_args, l2_pool_float_lambda, l2_pool_int8_lambda); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/LeakyRelu.cpp b/onert-micro/onert-micro/src/execute/kernels/LeakyRelu.cpp index d2b6467ca52..ff593bd5b56 100644 --- a/onert-micro/onert-micro/src/execute/kernels/LeakyRelu.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/LeakyRelu.cpp @@ -20,8 +20,16 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleLeakyRelu(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleLeakyRelu(const OMExecuteArgs &execute_args) { bool is_relu_6 = false; return execute_relu_common(execute_args, is_relu_6); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Less.cpp b/onert-micro/onert-micro/src/execute/kernels/Less.cpp index a7a3b2f9d9b..1cf881e216e 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Less.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Less.cpp @@ -36,7 +36,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace -OMStatus onert_micro::execute::execute_kernel_CircleLess(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleLess(const OMExecuteArgs &execute_args) { OMStatus status = Ok; @@ -81,3 +86,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleLess(const OMExecuteArgs &ex return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/LessEqual.cpp b/onert-micro/onert-micro/src/execute/kernels/LessEqual.cpp index a45b0cf3d0c..c0d64822117 100644 --- a/onert-micro/onert-micro/src/execute/kernels/LessEqual.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/LessEqual.cpp @@ -34,7 +34,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace -OMStatus onert_micro::execute::execute_kernel_CircleLessEqual(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleLessEqual(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -84,3 +89,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleLessEqual(const OMExecuteArg return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Log.cpp b/onert-micro/onert-micro/src/execute/kernels/Log.cpp index 93c862ea6e2..c6b2853563a 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Log.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Log.cpp @@ -21,7 +21,12 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleLog(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleLog(const OMExecuteArgs &execute_args) { auto log_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data, const core::OMRuntimeShape &output_shape, float *output_data) { @@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleLog(const OMExecuteArgs &exe return execute_math_common(execute_args, log_float_lambda); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/LogSoftmax.cpp b/onert-micro/onert-micro/src/execute/kernels/LogSoftmax.cpp index decec3f3d04..13799102100 100644 --- a/onert-micro/onert-micro/src/execute/kernels/LogSoftmax.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/LogSoftmax.cpp @@ -36,7 +36,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleLogSoftmax(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleLogSoftmax(const OMExecuteArgs &execute_args) { const circle::Tensor *input = nullptr; const circle::Tensor *output = nullptr; @@ -87,3 +92,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleLogSoftmax(const OMExecuteAr return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Logistic.cpp b/onert-micro/onert-micro/src/execute/kernels/Logistic.cpp index a5f93de6edb..e4b534751d9 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Logistic.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Logistic.cpp @@ -37,7 +37,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleLogistic(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleLogistic(const OMExecuteArgs &execute_args) { const circle::Tensor *input = nullptr; const circle::Tensor *output = nullptr; @@ -96,3 +101,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleLogistic(const OMExecuteArgs return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/MathCommon.cpp b/onert-micro/onert-micro/src/execute/kernels/MathCommon.cpp index 0f604dfd13f..705b7848851 100644 --- a/onert-micro/onert-micro/src/execute/kernels/MathCommon.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/MathCommon.cpp @@ -30,7 +30,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_math_common( +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_math_common( const OMExecuteArgs &execute_args, const std::function &f_float) @@ -63,3 +68,6 @@ OMStatus onert_micro::execute::execute_math_common( return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/MaxPool2D.cpp b/onert-micro/onert-micro/src/execute/kernels/MaxPool2D.cpp index b27e3fcb659..28b24a8ccd2 100644 --- a/onert-micro/onert-micro/src/execute/kernels/MaxPool2D.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/MaxPool2D.cpp @@ -21,7 +21,12 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleMaxPool2D(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleMaxPool2D(const OMExecuteArgs &execute_args) { auto max_pool_float_lambda = [](const core::Pool2DParams ¶ms, const core::OMRuntimeShape &input_shape, const float *input_data, @@ -44,3 +49,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleMaxPool2D(const OMExecuteArg return execute_pooling_common(execute_args, max_pool_float_lambda, max_pool_int8_lambda); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Maximum.cpp b/onert-micro/onert-micro/src/execute/kernels/Maximum.cpp index 73a10b6091f..b2ae39de609 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Maximum.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Maximum.cpp @@ -25,7 +25,12 @@ using namespace onert_micro; using namespace onert_micro::core; using namespace onert_micro::execute; -OMStatus onert_micro::execute::execute_kernel_CircleMaximum(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleMaximum(const OMExecuteArgs &execute_args) { uint8_t *input_data1; @@ -71,3 +76,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleMaximum(const OMExecuteArgs return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Minimum.cpp b/onert-micro/onert-micro/src/execute/kernels/Minimum.cpp index e5c4e7ce471..6964678b007 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Minimum.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Minimum.cpp @@ -25,7 +25,12 @@ using namespace onert_micro; using namespace onert_micro::core; using namespace onert_micro::execute; -OMStatus onert_micro::execute::execute_kernel_CircleMinimum(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleMinimum(const OMExecuteArgs &execute_args) { uint8_t *input_data1; @@ -71,3 +76,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleMinimum(const OMExecuteArgs return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Mul.cpp b/onert-micro/onert-micro/src/execute/kernels/Mul.cpp index 089c7b5ee1e..1ea3261dfa2 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Mul.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Mul.cpp @@ -72,7 +72,12 @@ void calculateQuantParamsForMul(core::ArithmeticQuantParams ¶ms, const circl // NOTE: doesnt currently support dynamic shapes // TODO: reduce code duplication with Add, Sub -OMStatus onert_micro::execute::execute_kernel_CircleMul(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleMul(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -226,3 +231,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleMul(const OMExecuteArgs &exe return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Neg.cpp b/onert-micro/onert-micro/src/execute/kernels/Neg.cpp index 53c1b0c7eb5..bf23ba746e6 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Neg.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Neg.cpp @@ -21,7 +21,12 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleNeg(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleNeg(const OMExecuteArgs &execute_args) { auto neg_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data, const core::OMRuntimeShape &output_shape, float *output_data) { @@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleNeg(const OMExecuteArgs &exe return execute_math_common(execute_args, neg_float_lambda); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/NotEqual.cpp b/onert-micro/onert-micro/src/execute/kernels/NotEqual.cpp index b2c8bc97ad2..84161645c6c 100644 --- a/onert-micro/onert-micro/src/execute/kernels/NotEqual.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/NotEqual.cpp @@ -36,7 +36,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace -OMStatus onert_micro::execute::execute_kernel_CircleNotEqual(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleNotEqual(const OMExecuteArgs &execute_args) { OMStatus status = Ok; @@ -71,3 +76,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleNotEqual(const OMExecuteArgs return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Pack.cpp b/onert-micro/onert-micro/src/execute/kernels/Pack.cpp index 91db95fa717..d57f5bd6f6a 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Pack.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Pack.cpp @@ -78,7 +78,12 @@ template void packImpl(OMRuntimeKernel &runtime_kernel) } // namespace -OMStatus onert_micro::execute::execute_kernel_CirclePack(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CirclePack(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -120,3 +125,6 @@ OMStatus onert_micro::execute::execute_kernel_CirclePack(const OMExecuteArgs &ex return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Pad.cpp b/onert-micro/onert-micro/src/execute/kernels/Pad.cpp index 586d2e4a372..9d84934e58f 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Pad.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Pad.cpp @@ -37,7 +37,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace -OMStatus onert_micro::execute::execute_kernel_CirclePad(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CirclePad(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -126,3 +131,6 @@ OMStatus onert_micro::execute::execute_kernel_CirclePad(const OMExecuteArgs &exe return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/PoolingCommon.cpp b/onert-micro/onert-micro/src/execute/kernels/PoolingCommon.cpp index be762b9b9f1..dbe79bf94a0 100644 --- a/onert-micro/onert-micro/src/execute/kernels/PoolingCommon.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/PoolingCommon.cpp @@ -28,7 +28,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace -OMStatus onert_micro::execute::execute_pooling_common( +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_pooling_common( const OMExecuteArgs &execute_args, const std::function &f_float, @@ -135,3 +140,6 @@ OMStatus onert_micro::execute::execute_pooling_common( return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Quantize.cpp b/onert-micro/onert-micro/src/execute/kernels/Quantize.cpp index 9220b781ef0..5d6b9e2be9e 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Quantize.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Quantize.cpp @@ -36,7 +36,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleQuantize(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleQuantize(const OMExecuteArgs &execute_args) { const circle::Tensor *input = nullptr; const circle::Tensor *output = nullptr; @@ -79,3 +84,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleQuantize(const OMExecuteArgs return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/ReadKernelDataCommon.cpp b/onert-micro/onert-micro/src/execute/kernels/ReadKernelDataCommon.cpp index 791fc97f16a..61a09dcb032 100644 --- a/onert-micro/onert-micro/src/execute/kernels/ReadKernelDataCommon.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/ReadKernelDataCommon.cpp @@ -29,7 +29,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace TensorIndexTISO -OMStatus onert_micro::execute::readKernelDataTISO(const OMExecuteArgs &execute_args, +namespace onert_micro +{ +namespace execute +{ + +OMStatus readKernelDataTISO(const OMExecuteArgs &execute_args, uint8_t *&input_data1, uint8_t *&input_data2, uint8_t *&output_data, core::OMRuntimeShape &input1_shape_ref, @@ -76,3 +81,6 @@ OMStatus onert_micro::execute::readKernelDataTISO(const OMExecuteArgs &execute_a return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Relu.cpp b/onert-micro/onert-micro/src/execute/kernels/Relu.cpp index 2c8fbb923c4..80b97db4858 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Relu.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Relu.cpp @@ -20,8 +20,16 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleRelu(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleRelu(const OMExecuteArgs &execute_args) { bool is_relu_6 = false; return execute_relu_common(execute_args, is_relu_6); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Relu6.cpp b/onert-micro/onert-micro/src/execute/kernels/Relu6.cpp index f501ad348bb..39f393aeda2 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Relu6.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Relu6.cpp @@ -20,8 +20,16 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleRelu6(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleRelu6(const OMExecuteArgs &execute_args) { bool is_relu_6 = true; return execute_relu_common(execute_args, is_relu_6); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/ReluCommon.cpp b/onert-micro/onert-micro/src/execute/kernels/ReluCommon.cpp index 3393c72e5c9..7d9dc308bf5 100644 --- a/onert-micro/onert-micro/src/execute/kernels/ReluCommon.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/ReluCommon.cpp @@ -29,7 +29,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_relu_common(const OMExecuteArgs &execute_args, +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_relu_common(const OMExecuteArgs &execute_args, bool is_relu_6) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; @@ -113,3 +118,6 @@ OMStatus onert_micro::execute::execute_relu_common(const OMExecuteArgs &execute_ return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Reshape.cpp b/onert-micro/onert-micro/src/execute/kernels/Reshape.cpp index 5ddc9b050a1..160da8ef876 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Reshape.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Reshape.cpp @@ -28,7 +28,15 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleReshape(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleReshape(const OMExecuteArgs &execute_args) { return execute_reshape_common(execute_args); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/ReshapeCommon.cpp b/onert-micro/onert-micro/src/execute/kernels/ReshapeCommon.cpp index ad15cce6f6a..2c85ec95037 100644 --- a/onert-micro/onert-micro/src/execute/kernels/ReshapeCommon.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/ReshapeCommon.cpp @@ -28,7 +28,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_reshape_common(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_reshape_common(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -68,3 +73,6 @@ OMStatus onert_micro::execute::execute_reshape_common(const OMExecuteArgs &execu return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Round.cpp b/onert-micro/onert-micro/src/execute/kernels/Round.cpp index 753d7cceca3..3f6f0565d89 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Round.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Round.cpp @@ -21,7 +21,12 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleRound(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleRound(const OMExecuteArgs &execute_args) { auto round_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data, const core::OMRuntimeShape &output_shape, float *output_data) { @@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleRound(const OMExecuteArgs &e return execute_math_common(execute_args, round_float_lambda); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Rsqrt.cpp b/onert-micro/onert-micro/src/execute/kernels/Rsqrt.cpp index 3e757b4f0dd..a81c340e469 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Rsqrt.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Rsqrt.cpp @@ -21,7 +21,12 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleRsqrt(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleRsqrt(const OMExecuteArgs &execute_args) { auto rsqrt_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data, const core::OMRuntimeShape &output_shape, float *output_data) { @@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleRsqrt(const OMExecuteArgs &e return execute_math_common(execute_args, rsqrt_float_lambda); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/SVDF.cpp b/onert-micro/onert-micro/src/execute/kernels/SVDF.cpp index d1a7a2e6072..19f932c6e0d 100644 --- a/onert-micro/onert-micro/src/execute/kernels/SVDF.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/SVDF.cpp @@ -76,7 +76,12 @@ void prepareQuantParams(core::SVDFQuantParams ¶ms, const circle::Tensor *inp } // namespace -OMStatus onert_micro::execute::execute_kernel_CircleSVDF(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleSVDF(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -219,3 +224,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSVDF(const OMExecuteArgs &ex return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Shape.cpp b/onert-micro/onert-micro/src/execute/kernels/Shape.cpp index 1838a762c32..cb0eceaf284 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Shape.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Shape.cpp @@ -33,7 +33,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleShape(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleShape(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -73,3 +78,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleShape(const OMExecuteArgs &e return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Sin.cpp b/onert-micro/onert-micro/src/execute/kernels/Sin.cpp index 7134bb087e6..30c019d3277 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Sin.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Sin.cpp @@ -21,7 +21,12 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleSin(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleSin(const OMExecuteArgs &execute_args) { auto sin_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data, const core::OMRuntimeShape &output_shape, float *output_data) { @@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSin(const OMExecuteArgs &exe return execute_math_common(execute_args, sin_float_lambda); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Slice.cpp b/onert-micro/onert-micro/src/execute/kernels/Slice.cpp index c675a152fe7..4906555200c 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Slice.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Slice.cpp @@ -54,7 +54,12 @@ void getBeginAndSizeVectors(int dimensions, const int32_t *begin_data, const int } // namespace // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleSlice(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleSlice(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -150,3 +155,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSlice(const OMExecuteArgs &e return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Softmax.cpp b/onert-micro/onert-micro/src/execute/kernels/Softmax.cpp index 78b750eb703..c5e9a00e8ba 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Softmax.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Softmax.cpp @@ -49,7 +49,12 @@ void preprocessSoftmaxScaling(double beta, double input_scale, int input_integer } // namespace // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleSoftmax(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleSoftmax(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -162,3 +167,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSoftmax(const OMExecuteArgs return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/SpaceToBatchND.cpp b/onert-micro/onert-micro/src/execute/kernels/SpaceToBatchND.cpp index dfa1934e56a..17c7ab8b29e 100644 --- a/onert-micro/onert-micro/src/execute/kernels/SpaceToBatchND.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/SpaceToBatchND.cpp @@ -20,7 +20,12 @@ using namespace onert_micro; using namespace onert_micro::execute; -OMStatus onert_micro::execute::execute_kernel_CircleSpaceToBatchND( +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleSpaceToBatchND( const onert_micro::execute::OMExecuteArgs &execute_args) { auto batch_to_space_float_lambda = @@ -34,3 +39,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSpaceToBatchND( return execute_spaces_batches_nd_common(execute_args, batch_to_space_float_lambda); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/SpaceToDepth.cpp b/onert-micro/onert-micro/src/execute/kernels/SpaceToDepth.cpp index 9eef7a22f61..ec6d6d74696 100644 --- a/onert-micro/onert-micro/src/execute/kernels/SpaceToDepth.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/SpaceToDepth.cpp @@ -30,7 +30,12 @@ constexpr uint32_t inputTensorIdx = 0; constexpr uint32_t outputTensorIdx = 0; } // namespace -OMStatus onert_micro::execute::execute_kernel_CircleSpaceToDepth( +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleSpaceToDepth( const onert_micro::execute::OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; @@ -95,3 +100,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSpaceToDepth( return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/SpacesBatchesNDCommon.cpp b/onert-micro/onert-micro/src/execute/kernels/SpacesBatchesNDCommon.cpp index d93c4d06c21..f909dde05c2 100644 --- a/onert-micro/onert-micro/src/execute/kernels/SpacesBatchesNDCommon.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/SpacesBatchesNDCommon.cpp @@ -30,7 +30,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace -OMStatus onert_micro::execute::execute_spaces_batches_nd_common( +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_spaces_batches_nd_common( const OMExecuteArgs &execute_args, const std::function< OMStatus(const core::OMRuntimeShape &unextended_input1_shape, const float *input1_data, @@ -107,3 +112,6 @@ OMStatus onert_micro::execute::execute_spaces_batches_nd_common( return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Split.cpp b/onert-micro/onert-micro/src/execute/kernels/Split.cpp index 982566b7026..f6959535fa8 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Split.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Split.cpp @@ -38,7 +38,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace -OMStatus onert_micro::execute::execute_kernel_CircleSplit(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleSplit(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -113,3 +118,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSplit(const OMExecuteArgs &e return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/SplitV.cpp b/onert-micro/onert-micro/src/execute/kernels/SplitV.cpp index c3da0afeb35..bd56a54abd0 100644 --- a/onert-micro/onert-micro/src/execute/kernels/SplitV.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/SplitV.cpp @@ -38,7 +38,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace -OMStatus onert_micro::execute::execute_kernel_CircleSplitV(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleSplitV(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -110,3 +115,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSplitV(const OMExecuteArgs & return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Sqrt.cpp b/onert-micro/onert-micro/src/execute/kernels/Sqrt.cpp index f2fe8b8ac10..35e361c1134 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Sqrt.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Sqrt.cpp @@ -21,7 +21,12 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleSqrt(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleSqrt(const OMExecuteArgs &execute_args) { auto sqrt_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data, const core::OMRuntimeShape &output_shape, float *output_data) { @@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSqrt(const OMExecuteArgs &ex return execute_math_common(execute_args, sqrt_float_lambda); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Square.cpp b/onert-micro/onert-micro/src/execute/kernels/Square.cpp index 776552bf2ee..b174ae81ed2 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Square.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Square.cpp @@ -21,7 +21,12 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleSquare(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleSquare(const OMExecuteArgs &execute_args) { auto square_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data, const core::OMRuntimeShape &output_shape, float *output_data) { @@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSquare(const OMExecuteArgs & return execute_math_common(execute_args, square_float_lambda); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/SquaredDifference.cpp b/onert-micro/onert-micro/src/execute/kernels/SquaredDifference.cpp index 6ccb2fafa5c..a332da9d505 100644 --- a/onert-micro/onert-micro/src/execute/kernels/SquaredDifference.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/SquaredDifference.cpp @@ -40,10 +40,14 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace +namespace onert_micro +{ +namespace execute +{ + // NOTE: doesnt currently support dynamic shapes // TODO: reduce code duplication with Add, Mul -OMStatus -onert_micro::execute::execute_kernel_CircleSquaredDifference(const OMExecuteArgs &execute_args) +OMStatus execute_kernel_CircleSquaredDifference(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -122,3 +126,6 @@ onert_micro::execute::execute_kernel_CircleSquaredDifference(const OMExecuteArgs return status; } + +} // namespace execute +} // namespace onert_micro diff --git a/onert-micro/onert-micro/src/execute/kernels/StridedSlice.cpp b/onert-micro/onert-micro/src/execute/kernels/StridedSlice.cpp index b814586dc6b..1cc99421f4a 100644 --- a/onert-micro/onert-micro/src/execute/kernels/StridedSlice.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/StridedSlice.cpp @@ -66,7 +66,12 @@ core::StridedSliceParams buildStridedSliceParams(int32_t dims, const int32_t *be } // namespace // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleStridedSlice(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleStridedSlice(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -161,3 +166,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleStridedSlice(const OMExecute return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Sub.cpp b/onert-micro/onert-micro/src/execute/kernels/Sub.cpp index 10cfc5a43ce..5fbd6fe1b39 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Sub.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Sub.cpp @@ -42,7 +42,12 @@ constexpr uint32_t outputTensorIdx = 0; // NOTE: doesnt currently support dynamic shapes // TODO: reduce code duplication with Add, Mul -OMStatus onert_micro::execute::execute_kernel_CircleSub(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleSub(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -194,3 +199,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleSub(const OMExecuteArgs &exe return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Tanh.cpp b/onert-micro/onert-micro/src/execute/kernels/Tanh.cpp index 52d4954ac0c..e5c4f97811e 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Tanh.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Tanh.cpp @@ -21,7 +21,12 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleTanh(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleTanh(const OMExecuteArgs &execute_args) { auto tanh_float_lambda = [](const core::OMRuntimeShape &input_shape, const float *input_data, const core::OMRuntimeShape &output_shape, float *output_data) { @@ -30,3 +35,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleTanh(const OMExecuteArgs &ex return execute_math_common(execute_args, tanh_float_lambda); } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Transpose.cpp b/onert-micro/onert-micro/src/execute/kernels/Transpose.cpp index cc11c4f662e..5890ebf32b8 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Transpose.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Transpose.cpp @@ -37,7 +37,12 @@ constexpr int kOutputTensorIdx = 0; } // namespace -OMStatus onert_micro::execute::execute_kernel_CircleTranspose(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleTranspose(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -107,3 +112,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleTranspose(const OMExecuteArg return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/TransposeConv.cpp b/onert-micro/onert-micro/src/execute/kernels/TransposeConv.cpp index d780328b8b6..2e23b122bff 100644 --- a/onert-micro/onert-micro/src/execute/kernels/TransposeConv.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/TransposeConv.cpp @@ -45,7 +45,12 @@ constexpr int kOutputTensorIdx = 0; } // namespace // NOTE: doesn't currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleTransposeConv(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleTransposeConv(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -147,3 +152,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleTransposeConv(const OMExecut return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/Unpack.cpp b/onert-micro/onert-micro/src/execute/kernels/Unpack.cpp index ecb0b01e721..0db553ca2e8 100644 --- a/onert-micro/onert-micro/src/execute/kernels/Unpack.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/Unpack.cpp @@ -37,7 +37,12 @@ constexpr uint32_t outputTensorIdx = 0; } // namespace -OMStatus onert_micro::execute::execute_kernel_CircleUnpack(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleUnpack(const OMExecuteArgs &execute_args) { core::OMRuntimeContext &runtime_context = execute_args.runtime_context; core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage; @@ -109,3 +114,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleUnpack(const OMExecuteArgs & return status; } + +} +} diff --git a/onert-micro/onert-micro/src/execute/kernels/While.cpp b/onert-micro/onert-micro/src/execute/kernels/While.cpp index d59fa82383d..eca79aafcd2 100644 --- a/onert-micro/onert-micro/src/execute/kernels/While.cpp +++ b/onert-micro/onert-micro/src/execute/kernels/While.cpp @@ -25,7 +25,12 @@ using namespace onert_micro; using namespace onert_micro::execute; // NOTE: doesnt currently support dynamic shapes -OMStatus onert_micro::execute::execute_kernel_CircleWhile(const OMExecuteArgs &execute_args) +namespace onert_micro +{ +namespace execute +{ + +OMStatus execute_kernel_CircleWhile(const OMExecuteArgs &execute_args) { core::OMRuntimeModule &runtime_module = execute_args.runtime_module; core::OMRuntimeContext &runtime_context = execute_args.runtime_context; @@ -144,3 +149,6 @@ OMStatus onert_micro::execute::execute_kernel_CircleWhile(const OMExecuteArgs &e return status; } + +} +}