[Host] move beam_search (#5759)

PaddlePaddle · Mar 23, 2021 · 22fca16 · 22fca16
1 parent 6c76f3c
commit 22fca16
Show file tree

Hide file tree

Showing 14 changed files with 78 additions and 658 deletions.
diff --git a/lite/backends/arm/math/CMakeLists.txt b/lite/backends/arm/math/CMakeLists.txt
@@ -127,7 +127,6 @@ if (NOT HAS_ARM_MATH_LIB_DIR)
       norm.cc
       pad2d.cc
       negative.cc
-      beam_search.cc
       reduce_max.cc
       reduce_min.cc
       reduce_max_min.cc

diff --git a/lite/backends/arm/math/funcs.h b/lite/backends/arm/math/funcs.h
@@ -24,7 +24,6 @@
 #include "lite/backends/arm/math/anchor_generator.h"
 #include "lite/backends/arm/math/argmax.h"
 #include "lite/backends/arm/math/axpy.h"
-#include "lite/backends/arm/math/beam_search.h"
 #include "lite/backends/arm/math/box_coder.h"
 #include "lite/backends/arm/math/clip.h"
 #include "lite/backends/arm/math/col_im_transform.h"

diff --git a/lite/backends/host/math/CMakeLists.txt b/lite/backends/host/math/CMakeLists.txt
@@ -1,4 +1,5 @@
 lite_cc_library(math_host SRCS
+    beam_search.cc
     sequence_padding.cc
     slice.cc
     pad3d.cc

diff --git a/lite/backends/arm/math/beam_search.cc → lite/backends/host/math/beam_search.cc b/lite/backends/arm/math/beam_search.cc → lite/backends/host/math/beam_search.cc
@@ -12,16 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "lite/backends/arm/math/beam_search.h"
-#include <arm_neon.h>
+#include "lite/backends/host/math/beam_search.h"
 #include <cmath>
 #include <string>
 #include <vector>
-#include "lite/utils/cp_logging.h"
 
 namespace paddle {
 namespace lite {
-namespace arm {
+namespace host {
 namespace math {
 /*
 * The basic items help to sort.
@@ -207,9 +205,7 @@ void beam_search(const Tensor *pre_ids,
                  int level,
                  int beam_size,
                  int end_id,
-                 bool is_accumulated,
-                 Context<TARGET(kARM)> *ctx) {
-  // auto abs_lod = framework::ToAbsOffset(scores->lod());
+                 bool is_accumulated) {
   auto abs_lod = scores->lod();
   auto &high_level = abs_lod[level];
   auto items = SelectTopBeamSizeItems(pre_ids,
@@ -266,6 +262,6 @@ void beam_search(const Tensor *pre_ids,
 }
 
 }  // namespace math
-}  // namespace arm
+}  // namespace host
 }  // namespace lite
 }  // namespace paddle
diff --git a/lite/backends/arm/math/beam_search.h → lite/backends/host/math/beam_search.h b/lite/backends/arm/math/beam_search.h → lite/backends/host/math/beam_search.h
@@ -13,13 +13,11 @@
 // limitations under the License.
 
 #pragma once
-
-#include <cmath>
 #include "lite/core/context.h"
 
 namespace paddle {
 namespace lite {
-namespace arm {
+namespace host {
 namespace math {
 
 void beam_search(const Tensor* pre_ids,
@@ -32,10 +30,9 @@ void beam_search(const Tensor* pre_ids,
                  int level,
                  int beam_size,
                  int end_id,
-                 bool is_accumulated,
-                 Context<TARGET(kARM)>* ctx);
+                 bool is_accumulated);
 
 }  // namespace math
-}  // namespace arm
+}  // namespace host
 }  // namespace lite
 }  // namespace paddle
diff --git a/lite/backends/x86/math/CMakeLists.txt b/lite/backends/x86/math/CMakeLists.txt
@@ -70,7 +70,6 @@ math_library(sequence2batch)
 math_library(sequence_pooling DEPS math_function jit_kernel_helper)
 math_library(sequence_scale)
 math_library(softmax DEPS math_function jit_kernel_helper)
-math_library(beam_search DEPS math_function)
 #
 ## math_library(matrix_bit_code)
 #
@@ -90,7 +89,6 @@ endif()
 # cc_test(vol2col_test SRCS vol2col_test.cc DEPS vol2col)
 # cc_test(sequence_padding_test SRCS sequence_padding_test.cc DEPS sequence_padding)
 # cc_test(sequence_pooling_test SRCS sequence_pooling_test.cc DEPS sequence_pooling)
-# cc_test(beam_search_test SRCS beam_search_test.cc DEPS beam_search)
 # cc_test(concat_test SRCS concat_test.cc DEPS concat_and_split)
 # cc_test(cpu_vec_test SRCS cpu_vec_test.cc DEPS blas cpu_info)
 math_library(box_coder DEPS math_function)