resolve merge conflict

c6f500fd · chonwhite · 92787a39 · 9f72a71a · c6f500fd · 92787a39
24 changed file
--- a/lite/api/CMakeLists.txt
+++ b/lite/api/CMakeLists.txt
--- a/lite/backends/arm/math/dotprod/gemm_sdot.h
+++ b/lite/backends/arm/math/dotprod/gemm_sdot.h
--- a/lite/backends/fpga/CMakeLists.txt
+++ b/lite/backends/fpga/CMakeLists.txt
--- a/lite/backends/fpga/KD/alignment.h
+++ b/lite/backends/fpga/KD/alignment.h
--- a/lite/backends/fpga/KD/context.hpp
+++ b/lite/backends/fpga/KD/context.hpp
--- a/lite/backends/fpga/KD/pe.hpp
+++ b/lite/backends/fpga/KD/pe.hpp
--- a/lite/backends/fpga/KD/pes/batchnorm_pe.hpp
+++ b/lite/backends/fpga/KD/pes/batchnorm_pe.hpp
--- a/lite/backends/fpga/KD/pes/concat_pe.hpp
+++ b/lite/backends/fpga/KD/pes/concat_pe.hpp
--- a/lite/backends/fpga/KD/pes/crop_pe.cpp
+++ b/lite/backends/fpga/KD/pes/crop_pe.cpp
--- a/lite/backends/fpga/KD/pes/norm_pe.hpp
+++ b/lite/backends/fpga/KD/pes/norm_pe.hpp
--- a/lite/backends/fpga/KD/pes/prior_box_pe.cpp
+++ b/lite/backends/fpga/KD/pes/prior_box_pe.cpp
--- a/lite/backends/fpga/KD/pes/resize.hpp
+++ b/lite/backends/fpga/KD/pes/resize.hpp
--- a/lite/backends/fpga/KD/pes/softmax_pe.hpp
+++ b/lite/backends/fpga/KD/pes/softmax_pe.hpp
--- a/lite/backends/fpga/KD/pes/split_pe.hpp
+++ b/lite/backends/fpga/KD/pes/split_pe.hpp
--- a/lite/backends/fpga/KD/tensor_util.cpp
+++ b/lite/backends/fpga/KD/tensor_util.cpp
--- a/lite/backends/fpga/KD/tensor_util.hpp
+++ b/lite/backends/fpga/KD/tensor_util.hpp
--- a/lite/backends/fpga/target_wrapper.cc
+++ b/lite/backends/fpga/target_wrapper.cc
--- a/lite/kernels/fpga/activation_compute.cc
+++ b/lite/kernels/fpga/activation_compute.cc
--- a/lite/kernels/fpga/activation_compute.h
+++ b/lite/kernels/fpga/activation_compute.h
--- a/lite/kernels/fpga/activation_compute_test.cc
+++ b/lite/kernels/fpga/activation_compute_test.cc
--- a/lite/kernels/fpga/elementwise_compute_test.cc
+++ b/lite/kernels/fpga/elementwise_compute_test.cc
--- a/lite/kernels/fpga/fc_compute_test.cc
+++ b/lite/kernels/fpga/fc_compute_test.cc
--- a/lite/kernels/fpga/pooling_compute.h
+++ b/lite/kernels/fpga/pooling_compute.h
--- a/lite/kernels/fpga/softmax_compute_test.cc
+++ b/lite/kernels/fpga/softmax_compute_test.cc