Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[onert-micro] SISOHeader helper for I/O #13872

Merged
merged 2 commits into from
Sep 3, 2024
Merged

[onert-micro] SISOHeader helper for I/O #13872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
575f277
SISOHeader helper for I/O
chunseoklee Aug 30, 2024
aa3a722
format fix
chunseoklee Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions onert-micro/onert-micro/include/execute/OMUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
#include "core/OMRuntimeShape.h"
#include "core/OMKernelData.h"

#include "execute/OMKernelExecutionBuilder.h"
#include "execute/OMRuntimeKernel.h"

namespace onert_micro
{
namespace execute
Expand Down Expand Up @@ -157,6 +160,9 @@ void calculateQuantParams(core::ArithmeticQuantParams &params, const circle::Ten
const circle::Tensor *input2, const circle::Tensor *output,
circle::ActivationFunctionType act);

OMStatus SISOHeader(const OMExecuteArgs &execute_args, const circle::Tensor **input,
const circle::Tensor **output, uint8_t **input_data, uint8_t **output_data);

} // namespace execute
} // namespace onert_micro

Expand Down
35 changes: 35 additions & 0 deletions onert-micro/onert-micro/src/execute/OMUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,41 @@ void onert_micro::execute::readQuantParams(const circle::Tensor *tensor, long &z
scale = tensor->quantization()->scale()->operator[](0);
}

OMStatus onert_micro::execute::SISOHeader(const OMExecuteArgs &execute_args,
const circle::Tensor **input,
const circle::Tensor **output, uint8_t **input_data,
uint8_t **output_data)
{
OMStatus status;

core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
uint16_t op_index = execute_args.kernel_index;

{
OMRuntimeKernel runtime_kernel;
runtime_kernel.readKernel(op_index, runtime_context);

*input = runtime_kernel.inputs[0];
*output = runtime_kernel.outputs[0];

assert(*input != nullptr);
assert(*output != nullptr);

status = runtime_kernel.getDataFromStorage(op_index, runtime_storage, runtime_context);
if (status != Ok)
return status;

*input_data = runtime_kernel.inputs_data[0];
*output_data = runtime_kernel.outputs_data[0];
}

assert(*input_data != nullptr);
assert(*output_data != nullptr);

return status;
}

void onert_micro::execute::calculateQuantParams(core::ArithmeticQuantParams &params,
const circle::Tensor *input1,
const circle::Tensor *input2,
Expand Down
27 changes: 2 additions & 25 deletions onert-micro/onert-micro/src/execute/kernels/Cast.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,38 +40,15 @@ constexpr uint32_t outputTensorIdx = 0;
// NOTE: doesnt currently support dynamic shapes
OMStatus onert_micro::execute::execute_kernel_CircleCast(const OMExecuteArgs &execute_args)
{
core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
uint16_t op_index = execute_args.kernel_index;

const circle::Tensor *input = nullptr;
const circle::Tensor *output = nullptr;

uint8_t *input_data = nullptr;
uint8_t *output_data = nullptr;

OMStatus status = Ok;

{
OMRuntimeKernel runtime_kernel;
runtime_kernel.readKernel(op_index, runtime_context);

input = runtime_kernel.inputs[inputTensorIdx];
output = runtime_kernel.outputs[outputTensorIdx];

assert(input != nullptr);
assert(output != nullptr);

status = runtime_kernel.getDataFromStorage(op_index, runtime_storage, runtime_context);
if (status != Ok)
return status;

input_data = runtime_kernel.inputs_data[inputTensorIdx];
output_data = runtime_kernel.outputs_data[outputTensorIdx];
}
SISOHeader(execute_args, &input, &output, &input_data, &output_data);

assert(input_data != nullptr);
assert(output_data != nullptr);
OMStatus status;

switch (input->type())
{
Expand Down
28 changes: 3 additions & 25 deletions onert-micro/onert-micro/src/execute/kernels/L2Normalize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "execute/OMKernelExecutionBuilder.h"
#include "execute/OMRuntimeKernel.h"

#include "execute/OMUtils.h"
#include "PALL2Normalize.h"

using namespace onert_micro;
Expand All @@ -37,38 +38,15 @@ constexpr uint32_t outputTensorIdx = 0;
// NOTE: doesnt currently support dynamic shapes
OMStatus onert_micro::execute::execute_kernel_CircleL2Normalize(const OMExecuteArgs &execute_args)
{
core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
uint16_t op_index = execute_args.kernel_index;

const circle::Tensor *input = nullptr;
const circle::Tensor *output = nullptr;

uint8_t *input_data = nullptr;
uint8_t *output_data = nullptr;

OMStatus status = Ok;

{
OMRuntimeKernel runtime_kernel;
runtime_kernel.readKernel(op_index, runtime_context);

input = runtime_kernel.inputs[inputTensorIdx];
output = runtime_kernel.outputs[outputTensorIdx];

assert(input != nullptr);
assert(output != nullptr);

status = runtime_kernel.getDataFromStorage(op_index, runtime_storage, runtime_context);
if (status != Ok)
return status;

input_data = runtime_kernel.inputs_data[inputTensorIdx];
output_data = runtime_kernel.outputs_data[outputTensorIdx];
}
SISOHeader(execute_args, &input, &output, &input_data, &output_data);

assert(input_data != nullptr);
assert(output_data != nullptr);
OMStatus status;

switch (input->type())
{
Expand Down
28 changes: 3 additions & 25 deletions onert-micro/onert-micro/src/execute/kernels/LogSoftmax.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "execute/OMKernelExecutionBuilder.h"
#include "execute/OMRuntimeKernel.h"

#include "execute/OMUtils.h"
#include "PALLogSoftmax.h"

using namespace onert_micro;
Expand All @@ -37,38 +38,15 @@ constexpr uint32_t outputTensorIdx = 0;
// NOTE: doesnt currently support dynamic shapes
OMStatus onert_micro::execute::execute_kernel_CircleLogSoftmax(const OMExecuteArgs &execute_args)
{
core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
uint16_t op_index = execute_args.kernel_index;

const circle::Tensor *input = nullptr;
const circle::Tensor *output = nullptr;

uint8_t *input_data = nullptr;
uint8_t *output_data = nullptr;

OMStatus status = Ok;

{
OMRuntimeKernel runtime_kernel;
runtime_kernel.readKernel(op_index, runtime_context);

input = runtime_kernel.inputs[inputTensorIdx];
output = runtime_kernel.outputs[outputTensorIdx];

assert(input != nullptr);
assert(output != nullptr);

status = runtime_kernel.getDataFromStorage(op_index, runtime_storage, runtime_context);
if (status != Ok)
return status;

input_data = runtime_kernel.inputs_data[inputTensorIdx];
output_data = runtime_kernel.outputs_data[outputTensorIdx];
}
SISOHeader(execute_args, &input, &output, &input_data, &output_data);

assert(input_data != nullptr);
assert(output_data != nullptr);
OMStatus status;

switch (input->type())
{
Expand Down
29 changes: 4 additions & 25 deletions onert-micro/onert-micro/src/execute/kernels/Logistic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include "execute/OMKernelExecutionBuilder.h"
#include "execute/OMRuntimeKernel.h"

#include "execute/OMUtils.h"

#include "PALLogistic.h"

using namespace onert_micro;
Expand All @@ -37,38 +39,15 @@ constexpr uint32_t outputTensorIdx = 0;
// NOTE: doesnt currently support dynamic shapes
OMStatus onert_micro::execute::execute_kernel_CircleLogistic(const OMExecuteArgs &execute_args)
{
core::OMRuntimeContext &runtime_context = execute_args.runtime_context;
core::OMRuntimeStorage &runtime_storage = execute_args.runtime_storage;
uint16_t op_index = execute_args.kernel_index;

const circle::Tensor *input = nullptr;
const circle::Tensor *output = nullptr;

uint8_t *input_data = nullptr;
uint8_t *output_data = nullptr;

OMStatus status = Ok;

{
OMRuntimeKernel runtime_kernel;
runtime_kernel.readKernel(op_index, runtime_context);

input = runtime_kernel.inputs[inputTensorIdx];
output = runtime_kernel.outputs[outputTensorIdx];

assert(input != nullptr);
assert(output != nullptr);

status = runtime_kernel.getDataFromStorage(op_index, runtime_storage, runtime_context);
if (status != Ok)
return status;

input_data = runtime_kernel.inputs_data[inputTensorIdx];
output_data = runtime_kernel.outputs_data[outputTensorIdx];
}
SISOHeader(execute_args, &input, &output, &input_data, &output_data);

assert(input_data != nullptr);
assert(output_data != nullptr);
OMStatus status;

switch (input->type())
{
Expand Down