From a1083d5124915d120bbfbb92652f0f06281be5c2 Mon Sep 17 00:00:00 2001
From: Chen Weihang <chenweihang@baidu.com>
Date: Thu, 13 Oct 2022 07:33:13 +0000
Subject: [PATCH] normalize conv2d kernel signature

---
 backends/mlu/kernels/conv_kernel.cc | 10 ++--------
 backends/npu/kernels/conv_kernel.cc | 10 ++--------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/backends/mlu/kernels/conv_kernel.cc b/backends/mlu/kernels/conv_kernel.cc
index 7af25e815..b9b360df8 100644
--- a/backends/mlu/kernels/conv_kernel.cc
+++ b/backends/mlu/kernels/conv_kernel.cc
@@ -23,12 +23,9 @@ void Conv2dKernel(const Context& dev_ctx,
                   const std::vector<int>& strides_t,
                   const std::vector<int>& paddings_t,
                   const std::string& padding_algorithm,
-                  int groups,
                   const std::vector<int>& dilations_t,
+                  int groups,
                   const std::string& data_format,
-                  bool use_addto,
-                  int workspace_size_MB,
-                  bool exhaustive_search,
                   phi::DenseTensor* output) {
   dev_ctx.template Alloc<T>(output);
   auto strides = strides_t;
@@ -127,12 +124,9 @@ void Conv2dGradKernel(const Context& dev_ctx,
                       const std::vector<int>& strides_t,
                       const std::vector<int>& paddings_t,
                       const std::string& padding_algorithm,
-                      int groups,
                       const std::vector<int>& dilations_t,
+                      int groups,
                       const std::string& data_format,
-                      bool use_addto,
-                      int workspace_size_MB,
-                      bool exhaustive_search,
                       phi::DenseTensor* input_grad,
                       phi::DenseTensor* filter_grad) {
   auto strides = strides_t;
diff --git a/backends/npu/kernels/conv_kernel.cc b/backends/npu/kernels/conv_kernel.cc
index 28bb550b9..888d79f15 100644
--- a/backends/npu/kernels/conv_kernel.cc
+++ b/backends/npu/kernels/conv_kernel.cc
@@ -53,12 +53,9 @@ void Conv2dKernel(const Context& dev_ctx,
                   const std::vector<int>& strides_t,
                   const std::vector<int>& paddings_t,
                   const std::string& padding_algorithm,
-                  int groups,
                   const std::vector<int>& dilations_t,
+                  int groups,
                   const std::string& data_format,
-                  bool use_addto,
-                  int workspace_size_MB,
-                  bool exhaustive_search,
                   phi::DenseTensor* output) {
   dev_ctx.template Alloc<T>(output);
   auto strides = strides_t;
@@ -126,12 +123,9 @@ void Conv2dGradKernel(const Context& dev_ctx,
                       const std::vector<int>& strides_t,
                       const std::vector<int>& paddings_t,
                       const std::string& padding_algorithm,
-                      int groups,
                       const std::vector<int>& dilations_t,
+                      int groups,
                       const std::string& data_format,
-                      bool use_addto,
-                      int workspace_size_MB,
-                      bool exhaustive_search,
                       phi::DenseTensor* input_grad,
                       phi::DenseTensor* filter_grad) {
   auto strides = strides_t;