[onert] Remove Einsum support

runtime/compute/cker/include/cker/operation/FusedBatchNorm.h

@@ -23,7 +23,6 @@
 #include "cker/Utils.h"
 
 #include "cker/operation/Helper/Tensor.h"
-#include "cker/operation/Helper/MatmulBCast.h"
 
 #include "Transpose.h"
 #include "BatchMatMul.h"
@@ -146,7 +145,7 @@ class FusedBatchNorm
     if (output->copyFrom(input, shape))
       return;
 
-    throw std::runtime_error{"Einsum: Encountered error while reshaping a Tensor"};
+    throw std::runtime_error{"FusedBatchNorm: Encountered error while reshaping a Tensor"};
   }
 
 private:

runtime/compute/cker/include/cker/operation/Helper/BCast.h

@@ -18,12 +18,6 @@
 #ifndef __NNFW_CKER_HELPER_BCAST_H__
 #define __NNFW_CKER_HELPER_BCAST_H__
 
-/**
- * ToDo : This file will be moved into upper folder when integrate with other
- *        custom operations.
- *        And It should merged with EinsumHelper's BCast.
- **/
-
 #include "cker/Shape.h"
 #include "cker/eigen/EigenSupport.h"
 

runtime/onert/backend/cpu/KernelGenerator.cc

@@ -25,7 +25,6 @@
 #include "ops/ConvolutionLayer.h"
 #include "ops/DepthToSpaceLayer.h"
 #include "ops/DepthwiseConvolutionLayer.h"
-#include "ops/EinsumLayer.h"
 #include "ops/ElementwiseActivationLayer.h"
 #include "ops/ElementwiseBinaryLayer.h"
 #include "ops/ElementwiseUnaryLayer.h"
@@ -602,24 +601,6 @@ void KernelGenerator::visit(const ir::operation::OneHot &node)
   _return_fn = std::move(fn);
 }
 
-void KernelGenerator::visit(const ir::operation::Einsum &node)
-{
-  const auto ofm_index{node.getOutputs().at(0)};
-
-  auto output_tensor = _tensor_reg->getPortableTensor(ofm_index);
-  std::vector<const IPortableTensor *> input_tensors;
-  for (const auto &ifm_idx : node.getInputs())
-    input_tensors.emplace_back(_tensor_reg->getPortableTensor(ifm_idx));
-
-  const auto &equation = node.param().equation;
-
-  auto fn = std::make_unique<ops::EinsumLayer>();
-
-  fn->configure(input_tensors, equation, output_tensor);
-
-  _return_fn = std::move(fn);
-}
-
 void KernelGenerator::visit(const ir::operation::Custom &node)
 {
   auto fill_op_info = [&](const ir::OperandIndexSequence &opSeq,

runtime/onert/backend/cpu/KernelGenerator.h

@@ -52,7 +52,6 @@ class KernelGenerator : public basic::KernelGeneratorBase
   void visit(const ir::operation::Custom &node) override;
   void visit(const ir::operation::DepthToSpace &) override;
   void visit(const ir::operation::DepthwiseConv2D &) override;
-  void visit(const ir::operation::Einsum &) override;
   void visit(const ir::operation::ElementwiseActivation &) override;
   void visit(const ir::operation::ElementwiseBinary &) override;
   void visit(const ir::operation::ElementwiseUnary &) override;

runtime/onert/core/include/ir/Operations.Include.h

@@ -33,7 +33,6 @@
 #include "ir/operation/Custom.h"
 #include "ir/operation/DepthToSpace.h"
 #include "ir/operation/DepthwiseConv2D.h"
-#include "ir/operation/Einsum.h"
 #include "ir/operation/ElementwiseActivation.h"
 #include "ir/operation/ElementwiseBinary.h"
 #include "ir/operation/ElementwiseUnary.h"

runtime/onert/core/include/ir/Operations.lst

@@ -36,7 +36,6 @@ OP(ConvertFp32ToFp16)
 OP(Custom)
 OP(DepthToSpace)
 OP(DepthwiseConv2D)
-OP(Einsum)
 OP(ElementwiseActivation)
 OP(ElementwiseBinary)
 OP(ElementwiseUnary)