@@ -128,7 +128,6 @@ template <typename LoaderDomain> class BaseLoader
128128 const OpIR *loadOperationTo (const Operator *op, ir::Graph &subg, Args &&...args);
129129
130130 void loadArgMinMax (const Operator *op, ir::Graph &subg, bool is_argmax);
131- void loadBatchMatMul (const Operator *op, ir::Graph &subg);
132131 void loadBinaryArithmetic (const Operator *op, ir::Graph &subg,
133132 ir::operation::BinaryArithmetic::ArithmeticType op_type);
134133 void loadComparison (const Operator *op, ir::Graph &subg);
@@ -1016,44 +1015,6 @@ void BaseLoader<LoaderDomain>::loadDetectionPostProcess(const Operator *op, ir::
10161015 loadOperationTo<ir::operation::DetectionPostProcess>(op, subg, param);
10171016}
10181017
1019- template <typename LoaderDomain>
1020- void BaseLoader<LoaderDomain>::loadBatchMatMul(const Operator *op, ir::Graph &subg)
1021- {
1022- ir::operation::BatchMatMul::Param param;
1023-
1024- const auto builtin_op = getBuiltinOperator (op);
1025-
1026- switch (builtin_op)
1027- {
1028- case BuiltinOperator::BuiltinOperator_BATCH_MATMUL:
1029- // Handled on each loader: different option name
1030- // Circle: adjoint_lhs, adjoint_rhs
1031- // TFLite: adj_x, adj_y
1032- throw std::runtime_error (
1033- std::string (" Cannot handle here: " ).append (EnumNameBuiltinOperator (builtin_op)) + " as " +
1034- EnumNameBuiltinOperator (BuiltinOperator::BuiltinOperator_BATCH_MATMUL));
1035- case BuiltinOperator::BuiltinOperator_CUSTOM:
1036- if (op->custom_options () == nullptr )
1037- {
1038- param.adj_x = false ;
1039- param.adj_y = false ;
1040- }
1041- else
1042- {
1043- const auto attr_map = getCustomOpAttrMap (op);
1044- param.adj_x = attr_map[" adj_x" ].AsBool ();
1045- param.adj_y = attr_map[" adj_y" ].AsBool ();
1046- }
1047- break ;
1048- default :
1049- throw std::runtime_error (
1050- std::string (" Wrong loaded operation: " ).append (EnumNameBuiltinOperator (builtin_op)) +
1051- " as " + EnumNameBuiltinOperator (BuiltinOperator::BuiltinOperator_BATCH_MATMUL));
1052- }
1053-
1054- loadOperationTo<ir::operation::BatchMatMul>(op, subg, param);
1055- }
1056-
10571018template <typename LoaderDomain>
10581019void BaseLoader<LoaderDomain>::loadSpaceToDepth(const Operator *op, ir::Graph &subg)
10591020{
@@ -1079,7 +1040,6 @@ void BaseLoader<LoaderDomain>::loadCustom(const Operator *op, ir::Graph &subg)
10791040 enum class BuiltinOP
10801041 {
10811042 MatrixBandPart,
1082- BatchMatMul,
10831043 FusedBatchNorm,
10841044 StatelessRandomUniform,
10851045 Erf,
@@ -1089,7 +1049,6 @@ void BaseLoader<LoaderDomain>::loadCustom(const Operator *op, ir::Graph &subg)
10891049 // Mapping from custom op name string to BuiltinOP enum
10901050 std::map<std::string, BuiltinOP> builtin_map = {
10911051 {" MatrixBandPart" , BuiltinOP::MatrixBandPart},
1092- {" BatchMatMulV2" , BuiltinOP::BatchMatMul},
10931052 {" FusedBatchNormV3" , BuiltinOP::FusedBatchNorm},
10941053 {" StatelessRandomUniform" , BuiltinOP::StatelessRandomUniform},
10951054 {" Erf" , BuiltinOP::Erf},
@@ -1105,9 +1064,6 @@ void BaseLoader<LoaderDomain>::loadCustom(const Operator *op, ir::Graph &subg)
11051064 case BuiltinOP::MatrixBandPart:
11061065 loadOperationTo<ir::operation::MatrixBandPart>(op, subg);
11071066 break ;
1108- case BuiltinOP::BatchMatMul:
1109- loadBatchMatMul (op, subg);
1110- break ;
11111067 case BuiltinOP::FusedBatchNorm:
11121068 loadFusedBatchNorm (op, subg);
11131069 break ;
@@ -1639,9 +1595,10 @@ void BaseLoader<LoaderDomain>::loadOperation(const Operator *op, ir::Graph &subg
16391595 case BuiltinOperator::BuiltinOperator_RANGE:
16401596 loadOperationTo<ir::operation::Range>(op, subg);
16411597 return ;
1642- case BuiltinOperator::BuiltinOperator_BATCH_MATMUL:
1643- loadBatchMatMul (op, subg);
1644- return ;
1598+ // case BuiltinOperator::BuiltinOperator_BATCH_MATMUL:
1599+ // Handled on each loader: different option name
1600+ // Circle: adjoint_lhs, adjoint_rhs
1601+ // TFLite: adj_x, adj_y
16451602 case BuiltinOperator::BuiltinOperator_BROADCAST_TO:
16461603 loadOperationTo<ir::operation::BroadcastTo>(op, subg);
16471604 return ;
0 commit comments