diff --git a/runtime/onert/core/src/loader/BaseLoader.h b/runtime/onert/core/src/loader/BaseLoader.h index 49b0d3f7ac8..5fb65319f14 100644 --- a/runtime/onert/core/src/loader/BaseLoader.h +++ b/runtime/onert/core/src/loader/BaseLoader.h @@ -128,7 +128,6 @@ template 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); @@ -1016,44 +1015,6 @@ void BaseLoader::loadDetectionPostProcess(const Operator *op, ir:: loadOperationTo(op, subg, param); } -template -void BaseLoader::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(op, subg, param); -} - template void BaseLoader::loadSpaceToDepth(const Operator *op, ir::Graph &subg) { @@ -1079,7 +1040,6 @@ void BaseLoader::loadCustom(const Operator *op, ir::Graph &subg) enum class BuiltinOP { MatrixBandPart, - BatchMatMul, FusedBatchNorm, StatelessRandomUniform, Erf, @@ -1089,7 +1049,6 @@ void BaseLoader::loadCustom(const Operator *op, ir::Graph &subg) // Mapping from custom op name string to BuiltinOP enum std::map builtin_map = { {"MatrixBandPart", BuiltinOP::MatrixBandPart}, - {"BatchMatMulV2", BuiltinOP::BatchMatMul}, {"FusedBatchNormV3", BuiltinOP::FusedBatchNorm}, {"StatelessRandomUniform", BuiltinOP::StatelessRandomUniform}, {"Erf", BuiltinOP::Erf}, @@ -1105,9 +1064,6 @@ void BaseLoader::loadCustom(const Operator *op, ir::Graph &subg) case BuiltinOP::MatrixBandPart: loadOperationTo(op, subg); break; - case BuiltinOP::BatchMatMul: - loadBatchMatMul(op, subg); - break; case BuiltinOP::FusedBatchNorm: loadFusedBatchNorm(op, subg); break; @@ -1639,9 +1595,10 @@ void BaseLoader::loadOperation(const Operator *op, ir::Graph &subg case BuiltinOperator::BuiltinOperator_RANGE: loadOperationTo(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(op, subg); return;