Skip to content

[onert] Remove BatchMatMul custom OP #15314

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

Merged
hseok-oh merged 1 commit into from
May 7, 2025
Merged

[onert] Remove BatchMatMul custom OP #15314

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 4 additions & 47 deletions runtime/onert/core/src/loader/BaseLoader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ template <typename LoaderDomain> class BaseLoader
const OpIR *loadOperationTo(const Operator *op, ir::Graph &subg, Args &&...args);

void loadArgMinMax(const Operator *op, ir::Graph &subg, bool is_argmax);
void loadBatchMatMul(const Operator *op, ir::Graph &subg);
void loadBinaryArithmetic(const Operator *op, ir::Graph &subg,
ir::operation::BinaryArithmetic::ArithmeticType op_type);
void loadComparison(const Operator *op, ir::Graph &subg);
Expand Down Expand Up @@ -1016,44 +1015,6 @@ void BaseLoader<LoaderDomain>::loadDetectionPostProcess(const Operator *op, ir::
loadOperationTo<ir::operation::DetectionPostProcess>(op, subg, param);
}

template <typename LoaderDomain>
void BaseLoader<LoaderDomain>::loadBatchMatMul(const Operator *op, ir::Graph &subg)
{
ir::operation::BatchMatMul::Param param;

const auto builtin_op = getBuiltinOperator(op);

switch (builtin_op)
{
case BuiltinOperator::BuiltinOperator_BATCH_MATMUL:
// Handled on each loader: different option name
// Circle: adjoint_lhs, adjoint_rhs
// TFLite: adj_x, adj_y
throw std::runtime_error(
std::string("Cannot handle here: ").append(EnumNameBuiltinOperator(builtin_op)) + " as " +
EnumNameBuiltinOperator(BuiltinOperator::BuiltinOperator_BATCH_MATMUL));
case BuiltinOperator::BuiltinOperator_CUSTOM:
if (op->custom_options() == nullptr)
{
param.adj_x = false;
param.adj_y = false;
}
else
{
const auto attr_map = getCustomOpAttrMap(op);
param.adj_x = attr_map["adj_x"].AsBool();
param.adj_y = attr_map["adj_y"].AsBool();
}
break;
default:
throw std::runtime_error(
std::string("Wrong loaded operation: ").append(EnumNameBuiltinOperator(builtin_op)) +
" as " + EnumNameBuiltinOperator(BuiltinOperator::BuiltinOperator_BATCH_MATMUL));
}

loadOperationTo<ir::operation::BatchMatMul>(op, subg, param);
}

template <typename LoaderDomain>
void BaseLoader<LoaderDomain>::loadSpaceToDepth(const Operator *op, ir::Graph &subg)
{
Expand All @@ -1079,7 +1040,6 @@ void BaseLoader<LoaderDomain>::loadCustom(const Operator *op, ir::Graph &subg)
enum class BuiltinOP
{
MatrixBandPart,
BatchMatMul,
FusedBatchNorm,
StatelessRandomUniform,
Erf,
Expand All @@ -1089,7 +1049,6 @@ void BaseLoader<LoaderDomain>::loadCustom(const Operator *op, ir::Graph &subg)
// Mapping from custom op name string to BuiltinOP enum
std::map<std::string, BuiltinOP> builtin_map = {
{"MatrixBandPart", BuiltinOP::MatrixBandPart},
{"BatchMatMulV2", BuiltinOP::BatchMatMul},
{"FusedBatchNormV3", BuiltinOP::FusedBatchNorm},
{"StatelessRandomUniform", BuiltinOP::StatelessRandomUniform},
{"Erf", BuiltinOP::Erf},
Expand All @@ -1105,9 +1064,6 @@ void BaseLoader<LoaderDomain>::loadCustom(const Operator *op, ir::Graph &subg)
case BuiltinOP::MatrixBandPart:
loadOperationTo<ir::operation::MatrixBandPart>(op, subg);
break;
case BuiltinOP::BatchMatMul:
loadBatchMatMul(op, subg);
break;
case BuiltinOP::FusedBatchNorm:
loadFusedBatchNorm(op, subg);
break;
Expand Down Expand Up @@ -1639,9 +1595,10 @@ void BaseLoader<LoaderDomain>::loadOperation(const Operator *op, ir::Graph &subg
case BuiltinOperator::BuiltinOperator_RANGE:
loadOperationTo<ir::operation::Range>(op, subg);
return;
case BuiltinOperator::BuiltinOperator_BATCH_MATMUL:
loadBatchMatMul(op, subg);
return;
// case BuiltinOperator::BuiltinOperator_BATCH_MATMUL:
// Handled on each loader: different option name
// Circle: adjoint_lhs, adjoint_rhs
// TFLite: adj_x, adj_y
case BuiltinOperator::BuiltinOperator_BROADCAST_TO:
loadOperationTo<ir::operation::BroadcastTo>(op, subg);
return;
Expand Down