diff --git a/lite/CMakeLists.txt b/lite/CMakeLists.txt index c77d70a7f31976ccb37c2968c5cf5be8575c7da9..10d94f7b5a2635efb80f526c55cf899c8198c3cc 100644 --- a/lite/CMakeLists.txt +++ b/lite/CMakeLists.txt @@ -17,15 +17,10 @@ add_subdirectory(operators) add_subdirectory(kernels) add_subdirectory(npu) add_subdirectory(core) -add_subdirectory(x86) -add_subdirectory(arm) -add_subdirectory(host) -add_subdirectory(cuda) -add_subdirectory(opencl) -add_subdirectory(fpga) add_subdirectory(model_parser) add_subdirectory(api) add_subdirectory(fluid) +add_subdirectory(backends) if (NOT LITE_ON_TINY_PUBLISH) add_subdirectory(tests) @@ -158,7 +153,7 @@ if (LITE_WITH_LIGHT_WEIGHT_FRAMEWORK AND LITE_WITH_ARM) if (LITE_WITH_OPENCL) add_custom_target(publish_inference_opencl ${TARGET} COMMAND mkdir -p "${INFER_LITE_PUBLISH_ROOT}/opencl" - COMMAND cp -r "${CMAKE_SOURCE_DIR}/lite/opencl/cl_kernel" "${INFER_LITE_PUBLISH_ROOT}/opencl" + COMMAND cp -r "${CMAKE_SOURCE_DIR}/lite/backends/opencl/cl_kernel" "${INFER_LITE_PUBLISH_ROOT}/opencl" ) add_dependencies(publish_inference_cxx_lib publish_inference_opencl) endif() diff --git a/lite/api/CMakeLists.txt b/lite/api/CMakeLists.txt index 4a9a6463b6e621298e81a42c827555b4f5173080..dc31164c0eed754c6599abd25a46a1b8c83eaea6 100644 --- a/lite/api/CMakeLists.txt +++ b/lite/api/CMakeLists.txt @@ -100,7 +100,7 @@ if(LITE_WITH_LIGHT_WEIGHT_FRAMEWORK AND WITH_TESTING) lite_cc_test(test_mobilenetv1_int8 SRCS mobilenetv1_int8_test.cc DEPS ${lite_model_test_DEPS} CL_DEPS ${opencl_kernels} - ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/opencl + ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/backends/opencl --model_dir=${LITE_MODEL_DIR}/MobilenetV1_quant SERIAL) add_dependencies(test_mobilenetv1_int8 extern_lite_download_MobileNetV1_quant_tar_gz) @@ -108,7 +108,7 @@ if(LITE_WITH_LIGHT_WEIGHT_FRAMEWORK AND WITH_TESTING) DEPS ${lite_model_test_DEPS} CL_DEPS ${opencl_kernels} NPU_DEPS ${npu_kernels} ${npu_bridges} - ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/opencl + ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/backends/opencl --model_dir=${LITE_MODEL_DIR}/mobilenet_v1 SERIAL) add_dependencies(test_mobilenetv1 extern_lite_download_mobilenet_v1_tar_gz) set(LINK_FLAGS "-Wl,--version-script ${PADDLE_SOURCE_DIR}/lite/core/lite.map") @@ -117,7 +117,7 @@ if(LITE_WITH_LIGHT_WEIGHT_FRAMEWORK AND WITH_TESTING) lite_cc_test(test_mobilenetv2 SRCS mobilenetv2_test.cc DEPS ${lite_model_test_DEPS} CL_DEPS ${opencl_kernels} - ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/opencl + ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/backends/opencl --model_dir=${LITE_MODEL_DIR}/mobilenet_v2_relu SERIAL) add_dependencies(test_mobilenetv2 extern_lite_download_mobilenet_v2_relu_tar_gz) set_target_properties(test_mobilenetv2 PROPERTIES LINK_FLAGS "${LINK_FLAGS}") @@ -126,7 +126,7 @@ if(LITE_WITH_LIGHT_WEIGHT_FRAMEWORK AND WITH_TESTING) DEPS ${lite_model_test_DEPS} paddle_api_light CL_DEPS ${opencl_kernels} FPGA_DEPS ${fpga_kernels} - ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/opencl + ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/backends/opencl --model_dir=${LITE_MODEL_DIR}/resnet50 SERIAL) add_dependencies(test_resnet50 extern_lite_download_resnet50_tar_gz) @@ -138,7 +138,7 @@ if(LITE_WITH_LIGHT_WEIGHT_FRAMEWORK AND WITH_TESTING) lite_cc_test(test_inceptionv4 SRCS inceptionv4_test.cc DEPS ${lite_model_test_DEPS} CL_DEPS ${opencl_kernels} - ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/opencl + ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/backends/opencl --model_dir=${LITE_MODEL_DIR}/inception_v4 SERIAL) add_dependencies(test_inceptionv4 extern_lite_download_inception_v4_simple_tar_gz) # lite_cc_test(test_ocr_attention SRCS ocr_attention_test.cc diff --git a/lite/backends/CMakeLists.txt b/lite/backends/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..77b04b54f4916c3add52839c2b98b6a2a0c323b3 --- /dev/null +++ b/lite/backends/CMakeLists.txt @@ -0,0 +1,6 @@ +add_subdirectory(x86) +add_subdirectory(cuda) +add_subdirectory(fpga) +add_subdirectory(host) +add_subdirectory(arm) +add_subdirectory(opencl) diff --git a/lite/arm/CMakeLists.txt b/lite/backends/arm/CMakeLists.txt similarity index 100% rename from lite/arm/CMakeLists.txt rename to lite/backends/arm/CMakeLists.txt diff --git a/lite/arm/math/CMakeLists.txt b/lite/backends/arm/math/CMakeLists.txt similarity index 100% rename from lite/arm/math/CMakeLists.txt rename to lite/backends/arm/math/CMakeLists.txt diff --git a/lite/arm/math/activation.cc b/lite/backends/arm/math/activation.cc similarity index 99% rename from lite/arm/math/activation.cc rename to lite/backends/arm/math/activation.cc index 4a6b216311c6a53e39f9f15d46d4b6eea4bfcd0a..938057ce9d8bb52614477689fba0d819c3ea3eda 100644 --- a/lite/arm/math/activation.cc +++ b/lite/backends/arm/math/activation.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/activation.h" +#include "lite/backends/arm/math/activation.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/activation.h b/lite/backends/arm/math/activation.h similarity index 100% rename from lite/arm/math/activation.h rename to lite/backends/arm/math/activation.h diff --git a/lite/arm/math/affine_channel.cc b/lite/backends/arm/math/affine_channel.cc similarity index 92% rename from lite/arm/math/affine_channel.cc rename to lite/backends/arm/math/affine_channel.cc index ceac3f78164e2be44e3e04d6eaf227f69b93e844..a2c735afccb2f25f2f8d0c5808cec138e1627c7f 100644 --- a/lite/arm/math/affine_channel.cc +++ b/lite/backends/arm/math/affine_channel.cc @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/affine_channel.h" +#include "lite/backends/arm/math/affine_channel.h" #include #include #include -#include "lite/arm/math/axpy.h" -#include "lite/arm/math/funcs.h" -#include "lite/arm/math/saturate.h" +#include "lite/backends/arm/math/axpy.h" +#include "lite/backends/arm/math/funcs.h" +#include "lite/backends/arm/math/saturate.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/affine_channel.h b/lite/backends/arm/math/affine_channel.h similarity index 100% rename from lite/arm/math/affine_channel.h rename to lite/backends/arm/math/affine_channel.h diff --git a/lite/arm/math/anchor_generator.cc b/lite/backends/arm/math/anchor_generator.cc similarity index 95% rename from lite/arm/math/anchor_generator.cc rename to lite/backends/arm/math/anchor_generator.cc index 00f4d51c49a59c3b3349f4706bba8c9b9911a55d..2f8a738fbf5b70164682a572b340c836ead8398b 100644 --- a/lite/arm/math/anchor_generator.cc +++ b/lite/backends/arm/math/anchor_generator.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/anchor_generator.h" +#include "lite/backends/arm/math/anchor_generator.h" #include #include #include -#include "lite/arm/math/funcs.h" -#include "lite/arm/math/saturate.h" +#include "lite/backends/arm/math/funcs.h" +#include "lite/backends/arm/math/saturate.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/anchor_generator.h b/lite/backends/arm/math/anchor_generator.h similarity index 100% rename from lite/arm/math/anchor_generator.h rename to lite/backends/arm/math/anchor_generator.h diff --git a/lite/arm/math/argmax.cc b/lite/backends/arm/math/argmax.cc similarity index 96% rename from lite/arm/math/argmax.cc rename to lite/backends/arm/math/argmax.cc index 878f807e1c2710eccb66b2cdfea52f79519b106e..3ca6d97c4d8ab97ca58e9859bfd753f7bf7f05ad 100644 --- a/lite/arm/math/argmax.cc +++ b/lite/backends/arm/math/argmax.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/argmax.h" +#include "lite/backends/arm/math/argmax.h" #include #include #include #include #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/argmax.h b/lite/backends/arm/math/argmax.h similarity index 100% rename from lite/arm/math/argmax.h rename to lite/backends/arm/math/argmax.h diff --git a/lite/arm/math/axpy.cc b/lite/backends/arm/math/axpy.cc similarity index 98% rename from lite/arm/math/axpy.cc rename to lite/backends/arm/math/axpy.cc index ad4db7a2fa99119f09452c51a2832722c9ceca5d..0863cc009c68e53ba50e998b8910879900a548a7 100644 --- a/lite/arm/math/axpy.cc +++ b/lite/backends/arm/math/axpy.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/axpy.h" +#include "lite/backends/arm/math/axpy.h" #include #include #include -#include "lite/arm/math/funcs.h" -#include "lite/arm/math/saturate.h" +#include "lite/backends/arm/math/funcs.h" +#include "lite/backends/arm/math/saturate.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/axpy.h b/lite/backends/arm/math/axpy.h similarity index 100% rename from lite/arm/math/axpy.h rename to lite/backends/arm/math/axpy.h diff --git a/lite/arm/math/beam_search.cc b/lite/backends/arm/math/beam_search.cc similarity index 99% rename from lite/arm/math/beam_search.cc rename to lite/backends/arm/math/beam_search.cc index 932db0e2c1fd3c96b8b674da477d2f28a266cf88..f93fcc0d601cc076163e4d6fb1e31fc58e7035a8 100644 --- a/lite/arm/math/beam_search.cc +++ b/lite/backends/arm/math/beam_search.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/beam_search.h" +#include "lite/backends/arm/math/beam_search.h" #include #include #include diff --git a/lite/arm/math/beam_search.h b/lite/backends/arm/math/beam_search.h similarity index 100% rename from lite/arm/math/beam_search.h rename to lite/backends/arm/math/beam_search.h diff --git a/lite/arm/math/box_coder.cc b/lite/backends/arm/math/box_coder.cc similarity index 97% rename from lite/arm/math/box_coder.cc rename to lite/backends/arm/math/box_coder.cc index 9b3f32b56e279d0ee6176c8a8b1ff24ba7c32bb7..7cb904a8ee93ede3e39ec8cfac6486ca9544162b 100644 --- a/lite/arm/math/box_coder.cc +++ b/lite/backends/arm/math/box_coder.cc @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/box_coder.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/box_coder.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/box_coder.h b/lite/backends/arm/math/box_coder.h similarity index 100% rename from lite/arm/math/box_coder.h rename to lite/backends/arm/math/box_coder.h diff --git a/lite/arm/math/col_im_transform.cc b/lite/backends/arm/math/col_im_transform.cc similarity index 96% rename from lite/arm/math/col_im_transform.cc rename to lite/backends/arm/math/col_im_transform.cc index d909d4247d885fe47899129e6bfe2bb8b0dcbee8..b5d2c6af13cc1dd864eaac6cb6589cc879f029fe 100644 --- a/lite/arm/math/col_im_transform.cc +++ b/lite/backends/arm/math/col_im_transform.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/col_im_transform.h" +#include "lite/backends/arm/math/col_im_transform.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/col_im_transform.h b/lite/backends/arm/math/col_im_transform.h similarity index 100% rename from lite/arm/math/col_im_transform.h rename to lite/backends/arm/math/col_im_transform.h diff --git a/lite/arm/math/concat.cc b/lite/backends/arm/math/concat.cc similarity index 95% rename from lite/arm/math/concat.cc rename to lite/backends/arm/math/concat.cc index 8dd156e2622164372b2ca447885cda34eaa1d039..9b94cefa16bca0dd487ad0e4f6b88e604b694416 100644 --- a/lite/arm/math/concat.cc +++ b/lite/backends/arm/math/concat.cc @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/concat.h" +#include "lite/backends/arm/math/concat.h" #include #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/concat.h b/lite/backends/arm/math/concat.h similarity index 100% rename from lite/arm/math/concat.h rename to lite/backends/arm/math/concat.h diff --git a/lite/arm/math/conv3x3s1_direct_int8.cc b/lite/backends/arm/math/conv3x3s1_direct_int8.cc similarity index 99% rename from lite/arm/math/conv3x3s1_direct_int8.cc rename to lite/backends/arm/math/conv3x3s1_direct_int8.cc index c34dffca29b7d0b0eb936bc4f0595274f32ce1f8..d44d911131dd7c096acfe9b59003b00655505ec0 100644 --- a/lite/arm/math/conv3x3s1_direct_int8.cc +++ b/lite/backends/arm/math/conv3x3s1_direct_int8.cc @@ -13,8 +13,8 @@ // limitations under the License. #include -#include "lite/arm/math/conv_block_utils.h" -#include "lite/arm/math/conv_impl.h" +#include "lite/backends/arm/math/conv_block_utils.h" +#include "lite/backends/arm/math/conv_impl.h" #include "lite/core/context.h" #include "lite/operators/op_params.h" #ifdef ARM_WITH_OMP diff --git a/lite/arm/math/conv3x3s2_direct_int8.cc b/lite/backends/arm/math/conv3x3s2_direct_int8.cc similarity index 99% rename from lite/arm/math/conv3x3s2_direct_int8.cc rename to lite/backends/arm/math/conv3x3s2_direct_int8.cc index a73f685283c7d48c98783998b39cd9b3ccc599e3..6169ad5d12f131d93fa1244a70d92ee827cbeb0e 100644 --- a/lite/arm/math/conv3x3s2_direct_int8.cc +++ b/lite/backends/arm/math/conv3x3s2_direct_int8.cc @@ -13,8 +13,8 @@ // limitations under the License. #include -#include "lite/arm/math/conv_block_utils.h" -#include "lite/arm/math/conv_impl.h" +#include "lite/backends/arm/math/conv_block_utils.h" +#include "lite/backends/arm/math/conv_impl.h" #include "lite/core/context.h" #include "lite/operators/op_params.h" #ifdef ARM_WITH_OMP diff --git a/lite/arm/math/conv_block_utils.h b/lite/backends/arm/math/conv_block_utils.h similarity index 99% rename from lite/arm/math/conv_block_utils.h rename to lite/backends/arm/math/conv_block_utils.h index 8d8a390712524394f5e443faf102ff3d47132d30..3deb6bcb5ff716405ce113a26072d6fefb1b2ebd 100644 --- a/lite/arm/math/conv_block_utils.h +++ b/lite/backends/arm/math/conv_block_utils.h @@ -15,8 +15,8 @@ #pragma once #include #include -#include "lite/arm/math/saturate.h" -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/saturate.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/target_wrapper.h" #include "lite/utils/cp_logging.h" diff --git a/lite/arm/math/conv_depthwise.cc b/lite/backends/arm/math/conv_depthwise.cc similarity index 97% rename from lite/arm/math/conv_depthwise.cc rename to lite/backends/arm/math/conv_depthwise.cc index f04de2178c57b310dd9850f3bcc862bf7e619dce..79b8cec57161668a5e7e8e66ab18d328a1c1ca23 100644 --- a/lite/arm/math/conv_depthwise.cc +++ b/lite/backends/arm/math/conv_depthwise.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/conv_depthwise.h" -#include "lite/arm/math/conv_block_utils.h" -#include "lite/arm/math/conv_impl.h" +#include "lite/backends/arm/math/conv_depthwise.h" +#include "lite/backends/arm/math/conv_block_utils.h" +#include "lite/backends/arm/math/conv_impl.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/conv_depthwise.h b/lite/backends/arm/math/conv_depthwise.h similarity index 98% rename from lite/arm/math/conv_depthwise.h rename to lite/backends/arm/math/conv_depthwise.h index 15e3b36e305032d69261510c6b962277a6cfc12c..cdddda79d1277190f7fc1371e271f3cc0d137530 100644 --- a/lite/arm/math/conv_depthwise.h +++ b/lite/backends/arm/math/conv_depthwise.h @@ -16,7 +16,7 @@ #include #include -#include "lite/arm/math/conv_impl.h" +#include "lite/backends/arm/math/conv_impl.h" #include "lite/core/context.h" #include "lite/core/target_wrapper.h" diff --git a/lite/arm/math/conv_depthwise_3x3_int8.cc b/lite/backends/arm/math/conv_depthwise_3x3_int8.cc similarity index 99% rename from lite/arm/math/conv_depthwise_3x3_int8.cc rename to lite/backends/arm/math/conv_depthwise_3x3_int8.cc index f8b14359a612a13e5dbacfe55cf037ba63f83245..d1eedd9557db397ea97ae33d006c2919ba39c91b 100644 --- a/lite/arm/math/conv_depthwise_3x3_int8.cc +++ b/lite/backends/arm/math/conv_depthwise_3x3_int8.cc @@ -13,7 +13,7 @@ // limitations under the License. #include -#include "lite/arm/math/conv_impl.h" +#include "lite/backends/arm/math/conv_impl.h" #include "lite/core/context.h" #include "lite/operators/op_params.h" diff --git a/lite/arm/math/conv_depthwise_3x3p0.cc b/lite/backends/arm/math/conv_depthwise_3x3p0.cc similarity index 99% rename from lite/arm/math/conv_depthwise_3x3p0.cc rename to lite/backends/arm/math/conv_depthwise_3x3p0.cc index 9eb45514d233a4bf08f20b5837bac5db9f93efb7..ec7f3cfb843af57767a4a97213bfc75a326fabaa 100644 --- a/lite/arm/math/conv_depthwise_3x3p0.cc +++ b/lite/backends/arm/math/conv_depthwise_3x3p0.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/conv_depthwise.h" +#include "lite/backends/arm/math/conv_depthwise.h" #include namespace paddle { diff --git a/lite/arm/math/conv_depthwise_3x3p1.cc b/lite/backends/arm/math/conv_depthwise_3x3p1.cc similarity index 99% rename from lite/arm/math/conv_depthwise_3x3p1.cc rename to lite/backends/arm/math/conv_depthwise_3x3p1.cc index 86b2075bad7b476bd4285396212caa6e55da7bc7..b5de99d7f5c1f96cdb934ee5038882b8770d6c7f 100644 --- a/lite/arm/math/conv_depthwise_3x3p1.cc +++ b/lite/backends/arm/math/conv_depthwise_3x3p1.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/conv_depthwise.h" +#include "lite/backends/arm/math/conv_depthwise.h" #include namespace paddle { diff --git a/lite/arm/math/conv_depthwise_5x5s1.cc b/lite/backends/arm/math/conv_depthwise_5x5s1.cc similarity index 99% rename from lite/arm/math/conv_depthwise_5x5s1.cc rename to lite/backends/arm/math/conv_depthwise_5x5s1.cc index ac0fa08c8a2556dcb1b3901df94827b3fd924233..2b9744665c504323551b2e9d6ba164eb6b75d0fc 100644 --- a/lite/arm/math/conv_depthwise_5x5s1.cc +++ b/lite/backends/arm/math/conv_depthwise_5x5s1.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/conv_depthwise.h" +#include "lite/backends/arm/math/conv_depthwise.h" #include namespace paddle { diff --git a/lite/arm/math/conv_depthwise_5x5s1_int8.cc b/lite/backends/arm/math/conv_depthwise_5x5s1_int8.cc similarity index 99% rename from lite/arm/math/conv_depthwise_5x5s1_int8.cc rename to lite/backends/arm/math/conv_depthwise_5x5s1_int8.cc index 47563c542c712501e2ef7012df09ac88ac4bb303..0d0034dd85e200cf7902bf997c688d4d69668278 100644 --- a/lite/arm/math/conv_depthwise_5x5s1_int8.cc +++ b/lite/backends/arm/math/conv_depthwise_5x5s1_int8.cc @@ -13,8 +13,8 @@ // limitations under the License. #include -#include "lite/arm/math/conv_block_utils.h" -#include "lite/arm/math/conv_impl.h" +#include "lite/backends/arm/math/conv_block_utils.h" +#include "lite/backends/arm/math/conv_impl.h" #include "lite/core/context.h" #include "lite/operators/op_params.h" #ifdef ARM_WITH_OMP diff --git a/lite/arm/math/conv_depthwise_5x5s2.cc b/lite/backends/arm/math/conv_depthwise_5x5s2.cc similarity index 99% rename from lite/arm/math/conv_depthwise_5x5s2.cc rename to lite/backends/arm/math/conv_depthwise_5x5s2.cc index 17ac1d87e50b25aba6965c127011e0d7fc085ad8..dd715fd5345c20380de9a93e035243bcabbd1fb0 100644 --- a/lite/arm/math/conv_depthwise_5x5s2.cc +++ b/lite/backends/arm/math/conv_depthwise_5x5s2.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/conv_depthwise.h" +#include "lite/backends/arm/math/conv_depthwise.h" #include namespace paddle { diff --git a/lite/arm/math/conv_direct.cc b/lite/backends/arm/math/conv_direct.cc similarity index 98% rename from lite/arm/math/conv_direct.cc rename to lite/backends/arm/math/conv_direct.cc index 5e61aa4367ed400843c1b5419f9dbed6b6789c38..51526aa2b3ce3e08afe41c9b1a150963fffebde1 100644 --- a/lite/arm/math/conv_direct.cc +++ b/lite/backends/arm/math/conv_direct.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/conv_direct.h" -#include "lite/arm/math/conv_block_utils.h" -#include "lite/arm/math/conv_impl.h" +#include "lite/backends/arm/math/conv_direct.h" +#include "lite/backends/arm/math/conv_block_utils.h" +#include "lite/backends/arm/math/conv_impl.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/conv_direct.h b/lite/backends/arm/math/conv_direct.h similarity index 98% rename from lite/arm/math/conv_direct.h rename to lite/backends/arm/math/conv_direct.h index b2883cd7e99787bf7d8eb2ea9b200bc02dbaf330..e6132dca5e6f5899160c90cf03c3ece7c105c0e9 100644 --- a/lite/arm/math/conv_direct.h +++ b/lite/backends/arm/math/conv_direct.h @@ -16,7 +16,7 @@ #include #include -#include "lite/arm/math/conv_impl.h" +#include "lite/backends/arm/math/conv_impl.h" #include "lite/core/context.h" #include "lite/core/target_wrapper.h" diff --git a/lite/arm/math/conv_direct_3x3s1.cc b/lite/backends/arm/math/conv_direct_3x3s1.cc similarity index 99% rename from lite/arm/math/conv_direct_3x3s1.cc rename to lite/backends/arm/math/conv_direct_3x3s1.cc index d1973705ecd6331782b5056d7982c674b32f8a52..6991481ee10b0d2f54c8cec12958674dc9b51369 100644 --- a/lite/arm/math/conv_direct_3x3s1.cc +++ b/lite/backends/arm/math/conv_direct_3x3s1.cc @@ -13,8 +13,8 @@ // limitations under the License. #include -#include "lite/arm/math/conv_block_utils.h" -#include "lite/arm/math/conv_impl.h" +#include "lite/backends/arm/math/conv_block_utils.h" +#include "lite/backends/arm/math/conv_impl.h" #include "lite/core/context.h" #include "lite/operators/op_params.h" #ifdef ARM_WITH_OMP diff --git a/lite/arm/math/conv_direct_3x3s2.cc b/lite/backends/arm/math/conv_direct_3x3s2.cc similarity index 99% rename from lite/arm/math/conv_direct_3x3s2.cc rename to lite/backends/arm/math/conv_direct_3x3s2.cc index b048f61877d929a69ce56a439c48904c1fd3ab8d..4bc9c5d25bd455c9a3dc802790ec99d30804238c 100644 --- a/lite/arm/math/conv_direct_3x3s2.cc +++ b/lite/backends/arm/math/conv_direct_3x3s2.cc @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/conv_block_utils.h" -#include "lite/arm/math/conv_impl.h" +#include "lite/backends/arm/math/conv_block_utils.h" +#include "lite/backends/arm/math/conv_impl.h" #include "lite/core/context.h" #ifdef ARM_WITH_OMP #include diff --git a/lite/arm/math/conv_gemmlike.cc b/lite/backends/arm/math/conv_gemmlike.cc similarity index 98% rename from lite/arm/math/conv_gemmlike.cc rename to lite/backends/arm/math/conv_gemmlike.cc index f78c366d0f93c31ad709b6be48cf51e5689000cd..1dd102db1e96efff89a7df678fcb35cf01890191 100644 --- a/lite/arm/math/conv_gemmlike.cc +++ b/lite/backends/arm/math/conv_gemmlike.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/conv_gemmlike.h" +#include "lite/backends/arm/math/conv_gemmlike.h" #include -#include "lite/arm/math/gemm_prepacked_int8.h" -#include "lite/arm/math/packed_sgemm.h" +#include "lite/backends/arm/math/gemm_prepacked_int8.h" +#include "lite/backends/arm/math/packed_sgemm.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/conv_gemmlike.h b/lite/backends/arm/math/conv_gemmlike.h similarity index 98% rename from lite/arm/math/conv_gemmlike.h rename to lite/backends/arm/math/conv_gemmlike.h index 872af2b7cbfeca50f9f1754d06d6f78860dee5b5..5986b5c2c818e9c7f81fe78d5bf69cb0496fcd20 100644 --- a/lite/arm/math/conv_gemmlike.h +++ b/lite/backends/arm/math/conv_gemmlike.h @@ -16,7 +16,7 @@ #include #include -#include "lite/arm/math/conv_impl.h" +#include "lite/backends/arm/math/conv_impl.h" #include "lite/core/context.h" #include "lite/core/target_wrapper.h" diff --git a/lite/arm/math/conv_impl.cc b/lite/backends/arm/math/conv_impl.cc similarity index 99% rename from lite/arm/math/conv_impl.cc rename to lite/backends/arm/math/conv_impl.cc index 7b4ac255680edc444f44587a9383d9605bdab355..dbea9d643ee12a8583f1c19aa5a20f35b2da70c6 100644 --- a/lite/arm/math/conv_impl.cc +++ b/lite/backends/arm/math/conv_impl.cc @@ -18,12 +18,12 @@ // #include "saber/funcs/impl/arm/neon/impl/gemv_arm_int8.h" // #include "saber/funcs/impl/arm/neon/impl/sgemv_arm.h" -#include "lite/arm/math/conv_impl.h" +#include "lite/backends/arm/math/conv_impl.h" #include -#include "lite/arm/math/gemm_prepacked_int8.h" -#include "lite/arm/math/gemv_arm_int8.h" -#include "lite/arm/math/packed_sgemm.h" -#include "lite/arm/math/sgemv.h" +#include "lite/backends/arm/math/gemm_prepacked_int8.h" +#include "lite/backends/arm/math/gemv_arm_int8.h" +#include "lite/backends/arm/math/packed_sgemm.h" +#include "lite/backends/arm/math/sgemv.h" #include "lite/core/context.h" #include "lite/core/target_wrapper.h" #include "lite/operators/op_params.h" diff --git a/lite/arm/math/conv_impl.h b/lite/backends/arm/math/conv_impl.h similarity index 100% rename from lite/arm/math/conv_impl.h rename to lite/backends/arm/math/conv_impl.h diff --git a/lite/arm/math/conv_winograd.cc b/lite/backends/arm/math/conv_winograd.cc similarity index 96% rename from lite/arm/math/conv_winograd.cc rename to lite/backends/arm/math/conv_winograd.cc index ac2f2aeab4625f8735a49f2e8e0ae08e78799419..43ad9e2cd8a60edd02ba20ac02c30512ce8b5eb9 100644 --- a/lite/arm/math/conv_winograd.cc +++ b/lite/backends/arm/math/conv_winograd.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/conv_winograd.h" +#include "lite/backends/arm/math/conv_winograd.h" #include -#include "lite/arm/math/conv_impl.h" -#include "lite/arm/math/packed_sgemm.h" +#include "lite/backends/arm/math/conv_impl.h" +#include "lite/backends/arm/math/packed_sgemm.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/conv_winograd.h b/lite/backends/arm/math/conv_winograd.h similarity index 97% rename from lite/arm/math/conv_winograd.h rename to lite/backends/arm/math/conv_winograd.h index 6533727a939272c5650dc354492e0de1aa898231..1ae5edb0aacd7e6a1f12192ab2ad598f2755b590 100644 --- a/lite/arm/math/conv_winograd.h +++ b/lite/backends/arm/math/conv_winograd.h @@ -15,7 +15,7 @@ #pragma once #include -#include "lite/arm/math/conv_impl.h" +#include "lite/backends/arm/math/conv_impl.h" #include "lite/core/context.h" #include "lite/core/target_wrapper.h" diff --git a/lite/arm/math/conv_winograd_3x3.cc b/lite/backends/arm/math/conv_winograd_3x3.cc similarity index 99% rename from lite/arm/math/conv_winograd_3x3.cc rename to lite/backends/arm/math/conv_winograd_3x3.cc index 30b029b42a2e111e0879ca49bfcd1b2171b0ab22..87f51381e6e5d4705befba3deadfa76e053d448c 100644 --- a/lite/arm/math/conv_winograd_3x3.cc +++ b/lite/backends/arm/math/conv_winograd_3x3.cc @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/conv_impl.h" -#include "lite/arm/math/packed_sgemm.h" +#include "lite/backends/arm/math/conv_impl.h" +#include "lite/backends/arm/math/packed_sgemm.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/decode_bboxes.cc b/lite/backends/arm/math/decode_bboxes.cc similarity index 99% rename from lite/arm/math/decode_bboxes.cc rename to lite/backends/arm/math/decode_bboxes.cc index 2c6c7f186e6687bca8367c15f2e644def5c6ccd1..12ee42ebb363571d4b32c5ed0c9749884f1e53b3 100644 --- a/lite/arm/math/decode_bboxes.cc +++ b/lite/backends/arm/math/decode_bboxes.cc @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/decode_bboxes.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/decode_bboxes.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/decode_bboxes.h b/lite/backends/arm/math/decode_bboxes.h similarity index 100% rename from lite/arm/math/decode_bboxes.h rename to lite/backends/arm/math/decode_bboxes.h diff --git a/lite/arm/math/dot_toolchain_support.h b/lite/backends/arm/math/dot_toolchain_support.h similarity index 100% rename from lite/arm/math/dot_toolchain_support.h rename to lite/backends/arm/math/dot_toolchain_support.h diff --git a/lite/arm/math/dropout.cc b/lite/backends/arm/math/dropout.cc similarity index 96% rename from lite/arm/math/dropout.cc rename to lite/backends/arm/math/dropout.cc index 1944dbb882e539884c15bbcd68dce27f7a0df4a8..406c850ef5ea53605dd1f5a8011d15263497c116 100644 --- a/lite/arm/math/dropout.cc +++ b/lite/backends/arm/math/dropout.cc @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/dropout.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/dropout.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/dropout.h b/lite/backends/arm/math/dropout.h similarity index 100% rename from lite/arm/math/dropout.h rename to lite/backends/arm/math/dropout.h diff --git a/lite/arm/math/elementwise.cc b/lite/backends/arm/math/elementwise.cc similarity index 99% rename from lite/arm/math/elementwise.cc rename to lite/backends/arm/math/elementwise.cc index 35098bba87d79533c763da1951b97e1f482d3bc2..28ae1ee4ca97b96ca55ab60eb4c62d69f00ad302 100644 --- a/lite/arm/math/elementwise.cc +++ b/lite/backends/arm/math/elementwise.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/elementwise.h" +#include "lite/backends/arm/math/elementwise.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/elementwise.h b/lite/backends/arm/math/elementwise.h similarity index 100% rename from lite/arm/math/elementwise.h rename to lite/backends/arm/math/elementwise.h diff --git a/lite/arm/math/fill_bias_relu.cc b/lite/backends/arm/math/fill_bias_relu.cc similarity index 97% rename from lite/arm/math/fill_bias_relu.cc rename to lite/backends/arm/math/fill_bias_relu.cc index b4cf2d876a2bb1ac6414166d311b40ae2436ea9b..7137a0363ba42b9c6416c6f98b0d4a6b5a1687fb 100644 --- a/lite/arm/math/fill_bias_relu.cc +++ b/lite/backends/arm/math/fill_bias_relu.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/fill_bias_relu.h" +#include "lite/backends/arm/math/fill_bias_relu.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/fill_bias_relu.h b/lite/backends/arm/math/fill_bias_relu.h similarity index 100% rename from lite/arm/math/fill_bias_relu.h rename to lite/backends/arm/math/fill_bias_relu.h diff --git a/lite/arm/math/funcs.cc b/lite/backends/arm/math/funcs.cc similarity index 99% rename from lite/arm/math/funcs.cc rename to lite/backends/arm/math/funcs.cc index edc5fe7fdcce7e144b757859b150656fd95c624a..e4425ade2efebdaad9136f75c39493f2bd3df4ca 100644 --- a/lite/arm/math/funcs.cc +++ b/lite/backends/arm/math/funcs.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include namespace paddle { diff --git a/lite/arm/math/funcs.h b/lite/backends/arm/math/funcs.h similarity index 85% rename from lite/arm/math/funcs.h rename to lite/backends/arm/math/funcs.h index 18a9d950411ad99124e4ec323cd88bb5dff391fa..9438a997b6752f3d496d65911a192c69dd2f13c0 100644 --- a/lite/arm/math/funcs.h +++ b/lite/backends/arm/math/funcs.h @@ -18,49 +18,49 @@ #include #include -#include "lite/arm/math/activation.h" -#include "lite/arm/math/affine_channel.h" -#include "lite/arm/math/anchor_generator.h" -#include "lite/arm/math/argmax.h" -#include "lite/arm/math/axpy.h" -#include "lite/arm/math/beam_search.h" -#include "lite/arm/math/box_coder.h" -#include "lite/arm/math/col_im_transform.h" -#include "lite/arm/math/concat.h" -#include "lite/arm/math/conv_depthwise.h" -#include "lite/arm/math/conv_direct.h" -#include "lite/arm/math/conv_gemmlike.h" -#include "lite/arm/math/conv_winograd.h" -#include "lite/arm/math/decode_bboxes.h" -#include "lite/arm/math/dropout.h" -#include "lite/arm/math/elementwise.h" -#include "lite/arm/math/fill_bias_relu.h" -#include "lite/arm/math/im2sequence.h" -#include "lite/arm/math/increment.h" -#include "lite/arm/math/interpolate.h" -#include "lite/arm/math/lrn.h" -#include "lite/arm/math/negative.h" -#include "lite/arm/math/norm.h" -#include "lite/arm/math/packed_sgemm.h" -#include "lite/arm/math/pad2d.h" -#include "lite/arm/math/pooling.h" -#include "lite/arm/math/power.h" -#include "lite/arm/math/prior_box.h" -#include "lite/arm/math/reduce_max.h" -#include "lite/arm/math/reduce_mean.h" -#include "lite/arm/math/scale.h" -#include "lite/arm/math/sequence_expand.h" -#include "lite/arm/math/sequence_pool.h" -#include "lite/arm/math/sequence_softmax.h" -#include "lite/arm/math/sgemm.h" -#include "lite/arm/math/sgemv.h" -#include "lite/arm/math/shuffle_channel.h" -#include "lite/arm/math/slice.h" -#include "lite/arm/math/softmax.h" -#include "lite/arm/math/split.h" -#include "lite/arm/math/stack.h" -#include "lite/arm/math/topk.h" -#include "lite/arm/math/yolo_box.h" +#include "lite/backends/arm/math/activation.h" +#include "lite/backends/arm/math/affine_channel.h" +#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/col_im_transform.h" +#include "lite/backends/arm/math/concat.h" +#include "lite/backends/arm/math/conv_depthwise.h" +#include "lite/backends/arm/math/conv_direct.h" +#include "lite/backends/arm/math/conv_gemmlike.h" +#include "lite/backends/arm/math/conv_winograd.h" +#include "lite/backends/arm/math/decode_bboxes.h" +#include "lite/backends/arm/math/dropout.h" +#include "lite/backends/arm/math/elementwise.h" +#include "lite/backends/arm/math/fill_bias_relu.h" +#include "lite/backends/arm/math/im2sequence.h" +#include "lite/backends/arm/math/increment.h" +#include "lite/backends/arm/math/interpolate.h" +#include "lite/backends/arm/math/lrn.h" +#include "lite/backends/arm/math/negative.h" +#include "lite/backends/arm/math/norm.h" +#include "lite/backends/arm/math/packed_sgemm.h" +#include "lite/backends/arm/math/pad2d.h" +#include "lite/backends/arm/math/pooling.h" +#include "lite/backends/arm/math/power.h" +#include "lite/backends/arm/math/prior_box.h" +#include "lite/backends/arm/math/reduce_max.h" +#include "lite/backends/arm/math/reduce_mean.h" +#include "lite/backends/arm/math/scale.h" +#include "lite/backends/arm/math/sequence_expand.h" +#include "lite/backends/arm/math/sequence_pool.h" +#include "lite/backends/arm/math/sequence_softmax.h" +#include "lite/backends/arm/math/sgemm.h" +#include "lite/backends/arm/math/sgemv.h" +#include "lite/backends/arm/math/shuffle_channel.h" +#include "lite/backends/arm/math/slice.h" +#include "lite/backends/arm/math/softmax.h" +#include "lite/backends/arm/math/split.h" +#include "lite/backends/arm/math/stack.h" +#include "lite/backends/arm/math/topk.h" +#include "lite/backends/arm/math/yolo_box.h" namespace paddle { namespace lite { namespace arm { diff --git a/lite/arm/math/gemm_prepacked_int8.cc b/lite/backends/arm/math/gemm_prepacked_int8.cc similarity index 99% rename from lite/arm/math/gemm_prepacked_int8.cc rename to lite/backends/arm/math/gemm_prepacked_int8.cc index ded4e97c0165a4edaeaefa29bd7a659026b7afe0..9efae1115772a17b73565ffd886dd0dcbda5df34 100644 --- a/lite/arm/math/gemm_prepacked_int8.cc +++ b/lite/backends/arm/math/gemm_prepacked_int8.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/gemm_prepacked_int8.h" +#include "lite/backends/arm/math/gemm_prepacked_int8.h" #include -#include "lite/arm/math/dot_toolchain_support.h" +#include "lite/backends/arm/math/dot_toolchain_support.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/gemm_prepacked_int8.h b/lite/backends/arm/math/gemm_prepacked_int8.h similarity index 100% rename from lite/arm/math/gemm_prepacked_int8.h rename to lite/backends/arm/math/gemm_prepacked_int8.h diff --git a/lite/arm/math/gemv_arm_int8.cc b/lite/backends/arm/math/gemv_arm_int8.cc similarity index 99% rename from lite/arm/math/gemv_arm_int8.cc rename to lite/backends/arm/math/gemv_arm_int8.cc index 568ee0a9d9b712c9e6250a3bb467ef84f3da95e5..dff3024ba452b507e30578b417911353bef097d8 100644 --- a/lite/arm/math/gemv_arm_int8.cc +++ b/lite/backends/arm/math/gemv_arm_int8.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/gemv_arm_int8.h" +#include "lite/backends/arm/math/gemv_arm_int8.h" #include -#include "lite/arm/math/saturate.h" +#include "lite/backends/arm/math/saturate.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/gemv_arm_int8.h b/lite/backends/arm/math/gemv_arm_int8.h similarity index 100% rename from lite/arm/math/gemv_arm_int8.h rename to lite/backends/arm/math/gemv_arm_int8.h diff --git a/lite/arm/math/gru_utils.h b/lite/backends/arm/math/gru_utils.h similarity index 99% rename from lite/arm/math/gru_utils.h rename to lite/backends/arm/math/gru_utils.h index 47e5d62aa1d9d9781e274b365f2292e47da9d5a1..9bef1889b83d1e212c928562f777ba4706c3436a 100644 --- a/lite/arm/math/gru_utils.h +++ b/lite/backends/arm/math/gru_utils.h @@ -14,7 +14,7 @@ #pragma once -#include "lite/arm/math/sgemm.h" +#include "lite/backends/arm/math/sgemm.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/im2sequence.cc b/lite/backends/arm/math/im2sequence.cc similarity index 98% rename from lite/arm/math/im2sequence.cc rename to lite/backends/arm/math/im2sequence.cc index 046339ccd708b23e61fa5cc526dd7bf97a3512d7..39fb9b477ef2c73b9e2def7aae9eaacc7946a2e6 100644 --- a/lite/arm/math/im2sequence.cc +++ b/lite/backends/arm/math/im2sequence.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/im2sequence.h" +#include "lite/backends/arm/math/im2sequence.h" #include #include "lite/utils/cp_logging.h" diff --git a/lite/arm/math/im2sequence.h b/lite/backends/arm/math/im2sequence.h similarity index 100% rename from lite/arm/math/im2sequence.h rename to lite/backends/arm/math/im2sequence.h diff --git a/lite/arm/math/increment.cc b/lite/backends/arm/math/increment.cc similarity index 95% rename from lite/arm/math/increment.cc rename to lite/backends/arm/math/increment.cc index d44cb38ac99cf66585485defa2d65f97ad3c09fd..094fe78de9cbb66445dc2e486e246d5503b06869 100644 --- a/lite/arm/math/increment.cc +++ b/lite/backends/arm/math/increment.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/increment.h" +#include "lite/backends/arm/math/increment.h" #include #include #include "lite/utils/cp_logging.h" diff --git a/lite/arm/math/increment.h b/lite/backends/arm/math/increment.h similarity index 100% rename from lite/arm/math/increment.h rename to lite/backends/arm/math/increment.h diff --git a/lite/arm/math/interpolate.cc b/lite/backends/arm/math/interpolate.cc similarity index 99% rename from lite/arm/math/interpolate.cc rename to lite/backends/arm/math/interpolate.cc index 0e4dbdca694cfe1bfb6176b9aaa9b29a1719e311..9770ee3d90ae2c13fb0fc0a48f9bd3aca320eb34 100644 --- a/lite/arm/math/interpolate.cc +++ b/lite/backends/arm/math/interpolate.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/interpolate.h" +#include "lite/backends/arm/math/interpolate.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/interpolate.h b/lite/backends/arm/math/interpolate.h similarity index 100% rename from lite/arm/math/interpolate.h rename to lite/backends/arm/math/interpolate.h diff --git a/lite/arm/math/lrn.cc b/lite/backends/arm/math/lrn.cc similarity index 97% rename from lite/arm/math/lrn.cc rename to lite/backends/arm/math/lrn.cc index 4297c221eab19cf557ccfc6653deb3582645ea99..7c89e9fed3cde692d3cc9c6ea91cc20bfc4f48f7 100644 --- a/lite/arm/math/lrn.cc +++ b/lite/backends/arm/math/lrn.cc @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/lrn.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/lrn.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/lrn.h b/lite/backends/arm/math/lrn.h similarity index 100% rename from lite/arm/math/lrn.h rename to lite/backends/arm/math/lrn.h diff --git a/lite/arm/math/negative.cc b/lite/backends/arm/math/negative.cc similarity index 92% rename from lite/arm/math/negative.cc rename to lite/backends/arm/math/negative.cc index 5da2b8e2855dd1591f9bf67fdd33622783970fd1..30eba11e35bebe38faabd1e51682e42b5cdb69c9 100644 --- a/lite/arm/math/negative.cc +++ b/lite/backends/arm/math/negative.cc @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/negative.h" +#include "lite/backends/arm/math/negative.h" #include #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/negative.h b/lite/backends/arm/math/negative.h similarity index 100% rename from lite/arm/math/negative.h rename to lite/backends/arm/math/negative.h diff --git a/lite/arm/math/norm.cc b/lite/backends/arm/math/norm.cc similarity index 97% rename from lite/arm/math/norm.cc rename to lite/backends/arm/math/norm.cc index 978a147c59ea38f2deef62e6f5842e18307e457d..4780ef68c131ab1de2fcd028006dd5707ebd2e60 100644 --- a/lite/arm/math/norm.cc +++ b/lite/backends/arm/math/norm.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/norm.h" +#include "lite/backends/arm/math/norm.h" #include #include #include "lite/utils/cp_logging.h" diff --git a/lite/arm/math/norm.h b/lite/backends/arm/math/norm.h similarity index 100% rename from lite/arm/math/norm.h rename to lite/backends/arm/math/norm.h diff --git a/lite/arm/math/packed_sgemm.cc b/lite/backends/arm/math/packed_sgemm.cc similarity index 99% rename from lite/arm/math/packed_sgemm.cc rename to lite/backends/arm/math/packed_sgemm.cc index c0c5c76c0f28670acd9cea0dbbc85d0ff0f92487..77b3beae80b92d000c257c637e6211c5da646fc1 100644 --- a/lite/arm/math/packed_sgemm.cc +++ b/lite/backends/arm/math/packed_sgemm.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/packed_sgemm.h" +#include "lite/backends/arm/math/packed_sgemm.h" #include namespace paddle { diff --git a/lite/arm/math/packed_sgemm.h b/lite/backends/arm/math/packed_sgemm.h similarity index 100% rename from lite/arm/math/packed_sgemm.h rename to lite/backends/arm/math/packed_sgemm.h diff --git a/lite/arm/math/pad2d.cc b/lite/backends/arm/math/pad2d.cc similarity index 99% rename from lite/arm/math/pad2d.cc rename to lite/backends/arm/math/pad2d.cc index 66f91f3744667106e50c9feaad7cdc9829aa669d..35c4fafb77ffde7b83b5958d4d045a03644258ca 100644 --- a/lite/arm/math/pad2d.cc +++ b/lite/backends/arm/math/pad2d.cc @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/pad2d.h" +#include "lite/backends/arm/math/pad2d.h" #include #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/pad2d.h b/lite/backends/arm/math/pad2d.h similarity index 100% rename from lite/arm/math/pad2d.h rename to lite/backends/arm/math/pad2d.h diff --git a/lite/arm/math/pooling.cc b/lite/backends/arm/math/pooling.cc similarity index 99% rename from lite/arm/math/pooling.cc rename to lite/backends/arm/math/pooling.cc index d90da0edf057a1fa24560d387baf8a10c3d57309..38078580c2d69d641a8a4b83025fa969fa1756d0 100644 --- a/lite/arm/math/pooling.cc +++ b/lite/backends/arm/math/pooling.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/pooling.h" +#include "lite/backends/arm/math/pooling.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/pooling.h b/lite/backends/arm/math/pooling.h similarity index 100% rename from lite/arm/math/pooling.h rename to lite/backends/arm/math/pooling.h diff --git a/lite/arm/math/power.cc b/lite/backends/arm/math/power.cc similarity index 96% rename from lite/arm/math/power.cc rename to lite/backends/arm/math/power.cc index 33a5a64ede1692a72d10c524eaa4d1b91d595f77..752c63d9170a6758631045b0ed8f4952bfc12c9b 100644 --- a/lite/arm/math/power.cc +++ b/lite/backends/arm/math/power.cc @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/power.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/power.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/power.h b/lite/backends/arm/math/power.h similarity index 100% rename from lite/arm/math/power.h rename to lite/backends/arm/math/power.h diff --git a/lite/arm/math/prior_box.cc b/lite/backends/arm/math/prior_box.cc similarity index 99% rename from lite/arm/math/prior_box.cc rename to lite/backends/arm/math/prior_box.cc index 6ec312796578863dc9c7a046950aa4dcf79d38fa..f262e6e1d7318e6c42e8b666239be4ae500788fe 100644 --- a/lite/arm/math/prior_box.cc +++ b/lite/backends/arm/math/prior_box.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/prior_box.h" +#include "lite/backends/arm/math/prior_box.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/prior_box.h b/lite/backends/arm/math/prior_box.h similarity index 100% rename from lite/arm/math/prior_box.h rename to lite/backends/arm/math/prior_box.h diff --git a/lite/arm/math/reduce_max.cc b/lite/backends/arm/math/reduce_max.cc similarity index 98% rename from lite/arm/math/reduce_max.cc rename to lite/backends/arm/math/reduce_max.cc index 7175a6709ba88e3eb0abdb3d4f4c63112b922e89..5c75960d727d9dc1219d5ffebba624e275e9c161 100644 --- a/lite/arm/math/reduce_max.cc +++ b/lite/backends/arm/math/reduce_max.cc @@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/arm/math/reduce_max.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/reduce_max.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/tensor.h" namespace paddle { diff --git a/lite/arm/math/reduce_max.h b/lite/backends/arm/math/reduce_max.h similarity index 100% rename from lite/arm/math/reduce_max.h rename to lite/backends/arm/math/reduce_max.h diff --git a/lite/arm/math/reduce_mean.cc b/lite/backends/arm/math/reduce_mean.cc similarity index 98% rename from lite/arm/math/reduce_mean.cc rename to lite/backends/arm/math/reduce_mean.cc index a139d825b732e8c03eb492de2099da717f720696..56104550d8d68e53ad9a2ac3148887d67480d6f6 100644 --- a/lite/arm/math/reduce_mean.cc +++ b/lite/backends/arm/math/reduce_mean.cc @@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/arm/math/reduce_mean.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/reduce_mean.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/tensor.h" namespace paddle { diff --git a/lite/arm/math/reduce_mean.h b/lite/backends/arm/math/reduce_mean.h similarity index 100% rename from lite/arm/math/reduce_mean.h rename to lite/backends/arm/math/reduce_mean.h diff --git a/lite/arm/math/saturate.h b/lite/backends/arm/math/saturate.h similarity index 100% rename from lite/arm/math/saturate.h rename to lite/backends/arm/math/saturate.h diff --git a/lite/arm/math/scale.cc b/lite/backends/arm/math/scale.cc similarity index 98% rename from lite/arm/math/scale.cc rename to lite/backends/arm/math/scale.cc index 23036a7e1d15c18061f4af4c05829828d85f136c..7f2169a6456bb04bda228cf62b89a125e4e2bb2f 100644 --- a/lite/arm/math/scale.cc +++ b/lite/backends/arm/math/scale.cc @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/scale.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/scale.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/scale.h b/lite/backends/arm/math/scale.h similarity index 100% rename from lite/arm/math/scale.h rename to lite/backends/arm/math/scale.h diff --git a/lite/arm/math/sequence2batch.h b/lite/backends/arm/math/sequence2batch.h similarity index 100% rename from lite/arm/math/sequence2batch.h rename to lite/backends/arm/math/sequence2batch.h diff --git a/lite/arm/math/sequence_expand.cc b/lite/backends/arm/math/sequence_expand.cc similarity index 97% rename from lite/arm/math/sequence_expand.cc rename to lite/backends/arm/math/sequence_expand.cc index 0048ad74e303364713201bb31743175fb12c5fd7..63a2e91793172b98de66cca31e083e21151dc347 100644 --- a/lite/arm/math/sequence_expand.cc +++ b/lite/backends/arm/math/sequence_expand.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/sequence_expand.h" +#include "lite/backends/arm/math/sequence_expand.h" #include #include #include "lite/core/tensor.h" diff --git a/lite/arm/math/sequence_expand.h b/lite/backends/arm/math/sequence_expand.h similarity index 100% rename from lite/arm/math/sequence_expand.h rename to lite/backends/arm/math/sequence_expand.h diff --git a/lite/arm/math/sequence_pool.cc b/lite/backends/arm/math/sequence_pool.cc similarity index 98% rename from lite/arm/math/sequence_pool.cc rename to lite/backends/arm/math/sequence_pool.cc index a03721010414e1396d3eb18950ec76358d57ee01..b8f9ab0a1a842a59971ad4c165d4c1be3426059a 100644 --- a/lite/arm/math/sequence_pool.cc +++ b/lite/backends/arm/math/sequence_pool.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/sequence_pool.h" +#include "lite/backends/arm/math/sequence_pool.h" #include #include #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" #include "lite/core/type_system.h" diff --git a/lite/arm/math/sequence_pool.h b/lite/backends/arm/math/sequence_pool.h similarity index 100% rename from lite/arm/math/sequence_pool.h rename to lite/backends/arm/math/sequence_pool.h diff --git a/lite/arm/math/sequence_softmax.cc b/lite/backends/arm/math/sequence_softmax.cc similarity index 96% rename from lite/arm/math/sequence_softmax.cc rename to lite/backends/arm/math/sequence_softmax.cc index d2be72639eed50ea6916f5aaa99e8fa2575b600b..fcbb1a353d3ebf28d438f430bfe650b072f66906 100644 --- a/lite/arm/math/sequence_softmax.cc +++ b/lite/backends/arm/math/sequence_softmax.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/sequence_softmax.h" +#include "lite/backends/arm/math/sequence_softmax.h" #include #include #include diff --git a/lite/arm/math/sequence_softmax.h b/lite/backends/arm/math/sequence_softmax.h similarity index 100% rename from lite/arm/math/sequence_softmax.h rename to lite/backends/arm/math/sequence_softmax.h diff --git a/lite/arm/math/sgemm.cc b/lite/backends/arm/math/sgemm.cc similarity index 97% rename from lite/arm/math/sgemm.cc rename to lite/backends/arm/math/sgemm.cc index bea1ac633ae93d9240124f0cbd4a33e72026b948..93f64445e289dcfd17bf2de48e89fcb2c907a7a9 100644 --- a/lite/arm/math/sgemm.cc +++ b/lite/backends/arm/math/sgemm.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/sgemm.h" +#include "lite/backends/arm/math/sgemm.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/sgemm.h b/lite/backends/arm/math/sgemm.h similarity index 96% rename from lite/arm/math/sgemm.h rename to lite/backends/arm/math/sgemm.h index 8785deb4786b02dda20f05c9627f2e73b2fc7f14..08f68fb3d41e5d0a837f57a8d28acd82dd3f8cb4 100644 --- a/lite/arm/math/sgemm.h +++ b/lite/backends/arm/math/sgemm.h @@ -15,7 +15,7 @@ #pragma once #include -#include "lite/arm/math/packed_sgemm.h" +#include "lite/backends/arm/math/packed_sgemm.h" #include "lite/core/context.h" #include "lite/core/device_info.h" diff --git a/lite/arm/math/sgemv.cc b/lite/backends/arm/math/sgemv.cc similarity index 99% rename from lite/arm/math/sgemv.cc rename to lite/backends/arm/math/sgemv.cc index d1449a88ae0ab063a00849c52bba3ac3999b6be7..506451932dcccd98368a050484a38bc8a922eb22 100644 --- a/lite/arm/math/sgemv.cc +++ b/lite/backends/arm/math/sgemv.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/sgemv.h" +#include "lite/backends/arm/math/sgemv.h" #include #include "lite/utils/cp_logging.h" diff --git a/lite/arm/math/sgemv.h b/lite/backends/arm/math/sgemv.h similarity index 100% rename from lite/arm/math/sgemv.h rename to lite/backends/arm/math/sgemv.h diff --git a/lite/arm/math/shuffle_channel.cc b/lite/backends/arm/math/shuffle_channel.cc similarity index 96% rename from lite/arm/math/shuffle_channel.cc rename to lite/backends/arm/math/shuffle_channel.cc index bae03e902140e51b613d5a106808a6c13f035087..7c4564aa002330cdc6915dcb90d377d81bfbf843 100644 --- a/lite/arm/math/shuffle_channel.cc +++ b/lite/backends/arm/math/shuffle_channel.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/shuffle_channel.h" +#include "lite/backends/arm/math/shuffle_channel.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/shuffle_channel.h b/lite/backends/arm/math/shuffle_channel.h similarity index 100% rename from lite/arm/math/shuffle_channel.h rename to lite/backends/arm/math/shuffle_channel.h diff --git a/lite/arm/math/slice.cc b/lite/backends/arm/math/slice.cc similarity index 98% rename from lite/arm/math/slice.cc rename to lite/backends/arm/math/slice.cc index f92511812251a9afbc50dbdeab066803a5973b00..c50ebdb47b01eb9e7c7fcdb10142cf675132f964 100644 --- a/lite/arm/math/slice.cc +++ b/lite/backends/arm/math/slice.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/slice.h" +#include "lite/backends/arm/math/slice.h" #include #include #include diff --git a/lite/arm/math/slice.h b/lite/backends/arm/math/slice.h similarity index 100% rename from lite/arm/math/slice.h rename to lite/backends/arm/math/slice.h diff --git a/lite/arm/math/softmax.cc b/lite/backends/arm/math/softmax.cc similarity index 99% rename from lite/arm/math/softmax.cc rename to lite/backends/arm/math/softmax.cc index c37f66974e63d6bad18877c0e7a1b5d8549e9323..65d41b049123680f26674cc05d3c02172a260b31 100644 --- a/lite/arm/math/softmax.cc +++ b/lite/backends/arm/math/softmax.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/softmax.h" +#include "lite/backends/arm/math/softmax.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/softmax.h b/lite/backends/arm/math/softmax.h similarity index 100% rename from lite/arm/math/softmax.h rename to lite/backends/arm/math/softmax.h diff --git a/lite/arm/math/split.cc b/lite/backends/arm/math/split.cc similarity index 96% rename from lite/arm/math/split.cc rename to lite/backends/arm/math/split.cc index ae622fc3b69aa247aacb7a9fcf9bcf3ca0359803..54ea7e62c2567cf2fe490351572968366fda483e 100644 --- a/lite/arm/math/split.cc +++ b/lite/backends/arm/math/split.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/split.h" +#include "lite/backends/arm/math/split.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/split.h b/lite/backends/arm/math/split.h similarity index 100% rename from lite/arm/math/split.h rename to lite/backends/arm/math/split.h diff --git a/lite/arm/math/stack.cc b/lite/backends/arm/math/stack.cc similarity index 95% rename from lite/arm/math/stack.cc rename to lite/backends/arm/math/stack.cc index 1775e6048e39ce6ab33632a2e4a8991112b12b7f..e017a8d01e14f9d5f272a263f5e9d88b9de8fdf2 100644 --- a/lite/arm/math/stack.cc +++ b/lite/backends/arm/math/stack.cc @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/stack.h" +#include "lite/backends/arm/math/stack.h" #include #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/stack.h b/lite/backends/arm/math/stack.h similarity index 100% rename from lite/arm/math/stack.h rename to lite/backends/arm/math/stack.h diff --git a/lite/arm/math/topk.cc b/lite/backends/arm/math/topk.cc similarity index 95% rename from lite/arm/math/topk.cc rename to lite/backends/arm/math/topk.cc index 741bb2561a5843fc50253eb8342a23c5616d6521..c9239134e1c3988f5f9c39af6a69fec52fa0904f 100644 --- a/lite/arm/math/topk.cc +++ b/lite/backends/arm/math/topk.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/topk.h" +#include "lite/backends/arm/math/topk.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { namespace arm { diff --git a/lite/arm/math/topk.h b/lite/backends/arm/math/topk.h similarity index 100% rename from lite/arm/math/topk.h rename to lite/backends/arm/math/topk.h diff --git a/lite/arm/math/type_trans.cc b/lite/backends/arm/math/type_trans.cc similarity index 99% rename from lite/arm/math/type_trans.cc rename to lite/backends/arm/math/type_trans.cc index 86be0099c30da8d2a7d6b9440e850f007ed2eb3c..6ded50e75294ad5145b3b88c4c341d4cce09c812 100644 --- a/lite/arm/math/type_trans.cc +++ b/lite/backends/arm/math/type_trans.cc @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include #include #include -#include "lite/arm/math/saturate.h" +#include "lite/backends/arm/math/saturate.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/type_trans.h b/lite/backends/arm/math/type_trans.h similarity index 100% rename from lite/arm/math/type_trans.h rename to lite/backends/arm/math/type_trans.h diff --git a/lite/arm/math/yolo_box.cc b/lite/backends/arm/math/yolo_box.cc similarity index 98% rename from lite/arm/math/yolo_box.cc rename to lite/backends/arm/math/yolo_box.cc index 6dc21c29244ac2d29c3d82eb1f3179f60418d03f..72e67cf69331ac2e0fa6edc7c8cd4a99ee763071 100644 --- a/lite/arm/math/yolo_box.cc +++ b/lite/backends/arm/math/yolo_box.cc @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/arm/math/yolo_box.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/yolo_box.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/arm/math/yolo_box.h b/lite/backends/arm/math/yolo_box.h similarity index 100% rename from lite/arm/math/yolo_box.h rename to lite/backends/arm/math/yolo_box.h diff --git a/lite/cuda/CMakeLists.txt b/lite/backends/cuda/CMakeLists.txt similarity index 100% rename from lite/cuda/CMakeLists.txt rename to lite/backends/cuda/CMakeLists.txt diff --git a/lite/cuda/blas.cc b/lite/backends/cuda/blas.cc similarity index 97% rename from lite/cuda/blas.cc rename to lite/backends/cuda/blas.cc index eacbb27bd859de7a971a8e2e0ef4a074117c50ee..c9d2d46cfed837c483b5e46ceddd2b4d4b7bb9d6 100644 --- a/lite/cuda/blas.cc +++ b/lite/backends/cuda/blas.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/cuda/blas.h" +#include "lite/backends/cuda/blas.h" namespace paddle { namespace lite { diff --git a/lite/cuda/blas.h b/lite/backends/cuda/blas.h similarity index 98% rename from lite/cuda/blas.h rename to lite/backends/cuda/blas.h index 4e65d569a815991dc77e1dbb0d4d28d57d19e53e..f73bb576b8dd5ecad178ba69a9208b2286c050ab 100644 --- a/lite/cuda/blas.h +++ b/lite/backends/cuda/blas.h @@ -17,7 +17,7 @@ #include #include #include -#include "lite/cuda/cuda_utils.h" +#include "lite/backends/cuda/cuda_utils.h" #include "lite/utils/all.h" namespace paddle { diff --git a/lite/cuda/cuda_utils.h b/lite/backends/cuda/cuda_utils.h similarity index 100% rename from lite/cuda/cuda_utils.h rename to lite/backends/cuda/cuda_utils.h diff --git a/lite/cuda/target_wrapper.cc b/lite/backends/cuda/target_wrapper.cc similarity index 98% rename from lite/cuda/target_wrapper.cc rename to lite/backends/cuda/target_wrapper.cc index 1406aaa7ed70e5d6665a1100c400335d6b9e2953..b1aaadf027a56d485286a68638520f45d78d9468 100644 --- a/lite/cuda/target_wrapper.cc +++ b/lite/backends/cuda/target_wrapper.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/cuda/target_wrapper.h" +#include "lite/backends/cuda/target_wrapper.h" namespace paddle { namespace lite { diff --git a/lite/cuda/target_wrapper.h b/lite/backends/cuda/target_wrapper.h similarity index 100% rename from lite/cuda/target_wrapper.h rename to lite/backends/cuda/target_wrapper.h diff --git a/lite/fpga/CMakeLists.txt b/lite/backends/fpga/CMakeLists.txt similarity index 76% rename from lite/fpga/CMakeLists.txt rename to lite/backends/fpga/CMakeLists.txt index 2956d9474662e3cae80822038d2a5ee08c08dcf1..b12fd85caf7e0c79de830b45569e02ba916c34e6 100644 --- a/lite/fpga/CMakeLists.txt +++ b/lite/backends/fpga/CMakeLists.txt @@ -2,8 +2,8 @@ if (NOT LITE_WITH_FPGA) return() endif() -set(LITE_FPGA_KD_PATH "${PADDLE_SOURCE_DIR}/lite/fpga/KD") -set(LITE_FPGA_PATH "${PADDLE_SOURCE_DIR}/lite/fpga") +set(LITE_FPGA_KD_PATH "${PADDLE_SOURCE_DIR}/lite/backends/fpga/KD") +set(LITE_FPGA_PATH "${PADDLE_SOURCE_DIR}/lite/backends/fpga") message("fpga_kd_path ${LITE_FPGA_KD_PATH}") message("fpga_path ${LITE_FPGA_PATH}") diff --git a/lite/fpga/KD/alignment.h b/lite/backends/fpga/KD/alignment.h similarity index 93% rename from lite/fpga/KD/alignment.h rename to lite/backends/fpga/KD/alignment.h index 74b80de042f34e9c1ac45daa4558c796a01363fa..5cca79885cef65bfbf659de1f8d39ac2f176ef0d 100644 --- a/lite/fpga/KD/alignment.h +++ b/lite/backends/fpga/KD/alignment.h @@ -15,7 +15,7 @@ limitations under the License. */ #pragma once #include -#include "lite/fpga/KD/llapi/zynqmp_api.h" +#include "lite/backends/fpga/KD/llapi/zynqmp_api.h" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/context.hpp b/lite/backends/fpga/KD/context.hpp similarity index 70% rename from lite/fpga/KD/context.hpp rename to lite/backends/fpga/KD/context.hpp index adb9f8a13d8b51120ab2adb977b2a5eef08b22eb..86109a4d1e2e4b2d4f1fbb90fbca4dc907217a4f 100644 --- a/lite/fpga/KD/context.hpp +++ b/lite/backends/fpga/KD/context.hpp @@ -15,14 +15,14 @@ limitations under the License. */ #pragma once #include -#include "lite/fpga/KD/pe.hpp" -#include "lite/fpga/KD/pes/conv_pe.hpp" -#include "lite/fpga/KD/pes/depthwise_conv_pe.hpp" -#include "lite/fpga/KD/pes/fully_connected_pe.hpp" -#include "lite/fpga/KD/pes/input_pe.hpp" -#include "lite/fpga/KD/pes/output_pe.hpp" -#include "lite/fpga/KD/pes/pooling_pe.hpp" -#include "lite/fpga/KD/pes/softmax_pe.hpp" +#include "lite/backends/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/pes/conv_pe.hpp" +#include "lite/backends/fpga/KD/pes/depthwise_conv_pe.hpp" +#include "lite/backends/fpga/KD/pes/fully_connected_pe.hpp" +#include "lite/backends/fpga/KD/pes/input_pe.hpp" +#include "lite/backends/fpga/KD/pes/output_pe.hpp" +#include "lite/backends/fpga/KD/pes/pooling_pe.hpp" +#include "lite/backends/fpga/KD/pes/softmax_pe.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/dl_engine.cpp b/lite/backends/fpga/KD/dl_engine.cpp similarity index 94% rename from lite/fpga/KD/dl_engine.cpp rename to lite/backends/fpga/KD/dl_engine.cpp index 90c447c88970639ab19b483470052001e9e1e316..9849e4275b5d0f59346b9684530610853f1a560c 100644 --- a/lite/fpga/KD/dl_engine.cpp +++ b/lite/backends/fpga/KD/dl_engine.cpp @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/fpga/KD/dl_engine.hpp" +#include "lite/backends/fpga/KD/dl_engine.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/dl_engine.hpp b/lite/backends/fpga/KD/dl_engine.hpp similarity index 89% rename from lite/fpga/KD/dl_engine.hpp rename to lite/backends/fpga/KD/dl_engine.hpp index 1ac4f4f0fe73d0110f20ec152cc7e3a025950b7a..829f41dfebfabfe5642bd4cf107fc6c54f3ffd86 100644 --- a/lite/fpga/KD/dl_engine.hpp +++ b/lite/backends/fpga/KD/dl_engine.hpp @@ -16,8 +16,8 @@ limitations under the License. */ #include -#include "lite/fpga/KD/llapi/filter.h" -#include "lite/fpga/KD/llapi/zynqmp_api.h" +#include "lite/backends/fpga/KD/llapi/filter.h" +#include "lite/backends/fpga/KD/llapi/zynqmp_api.h" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/float16.hpp b/lite/backends/fpga/KD/float16.hpp similarity index 100% rename from lite/fpga/KD/float16.hpp rename to lite/backends/fpga/KD/float16.hpp diff --git a/lite/fpga/KD/fpga_cv.cpp b/lite/backends/fpga/KD/fpga_cv.cpp similarity index 98% rename from lite/fpga/KD/fpga_cv.cpp rename to lite/backends/fpga/KD/fpga_cv.cpp index 92ddccb0ada028349a59d005435a096510116213..e3a1eed1ff8ca9c08e41b8479f48346e1a8f6fed 100644 --- a/lite/fpga/KD/fpga_cv.cpp +++ b/lite/backends/fpga/KD/fpga_cv.cpp @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/fpga/KD/fpga_cv.hpp" +#include "lite/backends/fpga/KD/fpga_cv.hpp" using paddle::zynqmp::float16; diff --git a/lite/fpga/KD/fpga_cv.hpp b/lite/backends/fpga/KD/fpga_cv.hpp similarity index 86% rename from lite/fpga/KD/fpga_cv.hpp rename to lite/backends/fpga/KD/fpga_cv.hpp index 0f68ab239d0a0743d73064f5dd00f6cfdfb0cb51..6aa52edfbb704a0571fb1052aff6ecf022e49596 100644 --- a/lite/fpga/KD/fpga_cv.hpp +++ b/lite/backends/fpga/KD/fpga_cv.hpp @@ -15,9 +15,9 @@ limitations under the License. */ #pragma once #include -#include "lite/fpga/KD/float16.hpp" -#include "lite/fpga/KD/llapi/zynqmp_api.h" -#include "lite/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/float16.hpp" +#include "lite/backends/fpga/KD/llapi/zynqmp_api.h" +#include "lite/backends/fpga/KD/pe.hpp" void fpga_resize(float* input, int input_width, diff --git a/lite/fpga/KD/layout.hpp b/lite/backends/fpga/KD/layout.hpp similarity index 98% rename from lite/fpga/KD/layout.hpp rename to lite/backends/fpga/KD/layout.hpp index 81ec746e39c96792fecb45725eb7a543a1cd2e87..74819cd2120630def0114422b04efe076e1d6cb2 100644 --- a/lite/fpga/KD/layout.hpp +++ b/lite/backends/fpga/KD/layout.hpp @@ -16,7 +16,7 @@ limitations under the License. */ #include -#include "lite/fpga/KD/alignment.h" +#include "lite/backends/fpga/KD/alignment.h" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/llapi/bias_scale.cpp b/lite/backends/fpga/KD/llapi/bias_scale.cpp similarity index 97% rename from lite/fpga/KD/llapi/bias_scale.cpp rename to lite/backends/fpga/KD/llapi/bias_scale.cpp index 4ea6897ced4a03d9e9cd37862ff758575e939bda..cd60f27f9896e857f8ad566d285a9b9aea1d4721 100644 --- a/lite/fpga/KD/llapi/bias_scale.cpp +++ b/lite/backends/fpga/KD/llapi/bias_scale.cpp @@ -14,8 +14,8 @@ limitations under the License. */ #include -#include "lite/fpga/KD/llapi/bias_scale.h" -#include "lite/fpga/KD/llapi/zynqmp_api.h" +#include "lite/backends/fpga/KD/llapi/bias_scale.h" +#include "lite/backends/fpga/KD/llapi/zynqmp_api.h" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/llapi/bias_scale.h b/lite/backends/fpga/KD/llapi/bias_scale.h similarity index 100% rename from lite/fpga/KD/llapi/bias_scale.h rename to lite/backends/fpga/KD/llapi/bias_scale.h diff --git a/lite/fpga/KD/llapi/config.h b/lite/backends/fpga/KD/llapi/config.h similarity index 100% rename from lite/fpga/KD/llapi/config.h rename to lite/backends/fpga/KD/llapi/config.h diff --git a/lite/fpga/KD/llapi/filter.cpp b/lite/backends/fpga/KD/llapi/filter.cpp similarity index 98% rename from lite/fpga/KD/llapi/filter.cpp rename to lite/backends/fpga/KD/llapi/filter.cpp index 2bc1e28a4ba30e221d4ba5143af1cd2ce1798a99..0e41a204a854b0b57e1a8c98fb3cc8d5224c807c 100644 --- a/lite/fpga/KD/llapi/filter.cpp +++ b/lite/backends/fpga/KD/llapi/filter.cpp @@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/fpga/KD/llapi/filter.h" +#include "lite/backends/fpga/KD/llapi/filter.h" #include #include -#include "lite/fpga/KD/float16.hpp" -#include "lite/fpga/KD/llapi/zynqmp_api.h" +#include "lite/backends/fpga/KD/float16.hpp" +#include "lite/backends/fpga/KD/llapi/zynqmp_api.h" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/llapi/filter.h b/lite/backends/fpga/KD/llapi/filter.h similarity index 100% rename from lite/fpga/KD/llapi/filter.h rename to lite/backends/fpga/KD/llapi/filter.h diff --git a/lite/fpga/KD/llapi/zynqmp_api.cpp b/lite/backends/fpga/KD/llapi/zynqmp_api.cpp similarity index 98% rename from lite/fpga/KD/llapi/zynqmp_api.cpp rename to lite/backends/fpga/KD/llapi/zynqmp_api.cpp index b61eda8d9d72501fa4e5f4fd988a615aa48ec1db..6e7c1cd03027ae28b2977fcbe217b6cfb06378a0 100644 --- a/lite/fpga/KD/llapi/zynqmp_api.cpp +++ b/lite/backends/fpga/KD/llapi/zynqmp_api.cpp @@ -23,8 +23,8 @@ limitations under the License. */ #include #include -#include "lite/fpga/KD/llapi/config.h" -#include "lite/fpga/KD/llapi/zynqmp_api.h" +#include "lite/backends/fpga/KD/llapi/config.h" +#include "lite/backends/fpga/KD/llapi/zynqmp_api.h" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/llapi/zynqmp_api.h b/lite/backends/fpga/KD/llapi/zynqmp_api.h similarity index 100% rename from lite/fpga/KD/llapi/zynqmp_api.h rename to lite/backends/fpga/KD/llapi/zynqmp_api.h diff --git a/lite/fpga/KD/pe.hpp b/lite/backends/fpga/KD/pe.hpp similarity index 90% rename from lite/fpga/KD/pe.hpp rename to lite/backends/fpga/KD/pe.hpp index 0695be603ae326d7b6feb5b0b7e7341f7f288d48..d1dc3c4caa18cbfeba74fac26cca9e19230e2c21 100644 --- a/lite/fpga/KD/pe.hpp +++ b/lite/backends/fpga/KD/pe.hpp @@ -16,8 +16,8 @@ limitations under the License. */ #include #include -#include "lite/fpga/KD/pe_params.hpp" -#include "lite/fpga/KD/tensor_util.hpp" +#include "lite/backends/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/tensor_util.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pe_params.hpp b/lite/backends/fpga/KD/pe_params.hpp similarity index 97% rename from lite/fpga/KD/pe_params.hpp rename to lite/backends/fpga/KD/pe_params.hpp index b6f4500a1a934ac4e25ee7bc3cb2abf3d8da665a..709f04d399793c6f21c34fc1265f7ed8b5818314 100644 --- a/lite/fpga/KD/pe_params.hpp +++ b/lite/backends/fpga/KD/pe_params.hpp @@ -17,8 +17,8 @@ limitations under the License. */ #include #include -#include "lite/fpga/KD/llapi/zynqmp_api.h" -#include "lite/fpga/KD/tensor.hpp" +#include "lite/backends/fpga/KD/llapi/zynqmp_api.h" +#include "lite/backends/fpga/KD/tensor.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/batchnorm_pe.hpp b/lite/backends/fpga/KD/pes/batchnorm_pe.hpp similarity index 95% rename from lite/fpga/KD/pes/batchnorm_pe.hpp rename to lite/backends/fpga/KD/pes/batchnorm_pe.hpp index 73f9849680b7ac860ad55e278ecd50de169851dd..a2078751059a20385bd90d4832df206d1cf2edc4 100644 --- a/lite/fpga/KD/pes/batchnorm_pe.hpp +++ b/lite/backends/fpga/KD/pes/batchnorm_pe.hpp @@ -17,9 +17,9 @@ limitations under the License. */ #include #include -#include "lite/fpga/KD/pe.hpp" -#include "lite/fpga/KD/pe_params.hpp" -#include "lite/fpga/KD/pes/scale_pe.hpp" +#include "lite/backends/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/pes/scale_pe.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/concat_pe.hpp b/lite/backends/fpga/KD/pes/concat_pe.hpp similarity index 97% rename from lite/fpga/KD/pes/concat_pe.hpp rename to lite/backends/fpga/KD/pes/concat_pe.hpp index fb3f87ecafb7e1c50ddef06e029f2c6062df2fdc..72b480ab88a9f6bd97e1e525ede435d009a5e463 100644 --- a/lite/fpga/KD/pes/concat_pe.hpp +++ b/lite/backends/fpga/KD/pes/concat_pe.hpp @@ -17,8 +17,8 @@ limitations under the License. */ #include #include -#include "lite/fpga/KD/pe.hpp" -#include "lite/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/pe_params.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/conv_pe.hpp b/lite/backends/fpga/KD/pes/conv_pe.hpp similarity index 90% rename from lite/fpga/KD/pes/conv_pe.hpp rename to lite/backends/fpga/KD/pes/conv_pe.hpp index 06071001358305fac7686d122bb3e2b8657bff5a..e897f82280fa57f904bd7c749e371d8ec9219b51 100644 --- a/lite/fpga/KD/pes/conv_pe.hpp +++ b/lite/backends/fpga/KD/pes/conv_pe.hpp @@ -17,13 +17,13 @@ limitations under the License. */ #include #include -#include "lite/fpga/KD/pe.hpp" -#include "lite/fpga/KD/pe_params.hpp" -#include "lite/fpga/KD/pes/concat_pe.hpp" -#include "lite/fpga/KD/pes/conv_pe.hpp" -#include "lite/fpga/KD/pes/conv_process.hpp" -#include "lite/fpga/KD/pes/elementwise_add_pe.hpp" -#include "lite/fpga/KD/pes/scale_pe.hpp" +#include "lite/backends/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/pes/concat_pe.hpp" +#include "lite/backends/fpga/KD/pes/conv_pe.hpp" +#include "lite/backends/fpga/KD/pes/conv_process.hpp" +#include "lite/backends/fpga/KD/pes/elementwise_add_pe.hpp" +#include "lite/backends/fpga/KD/pes/scale_pe.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/conv_process.hpp b/lite/backends/fpga/KD/pes/conv_process.hpp similarity index 98% rename from lite/fpga/KD/pes/conv_process.hpp rename to lite/backends/fpga/KD/pes/conv_process.hpp index e6cf2fef3bc6e0d959deb1cb3aa68256829f3019..fd17218d06f050df3dc935bdde0a320e52b56a40 100644 --- a/lite/fpga/KD/pes/conv_process.hpp +++ b/lite/backends/fpga/KD/pes/conv_process.hpp @@ -18,12 +18,12 @@ limitations under the License. */ #include #include -#include "lite/fpga/KD/float16.hpp" -#include "lite/fpga/KD/llapi/bias_scale.h" -#include "lite/fpga/KD/llapi/filter.h" -#include "lite/fpga/KD/pe_params.hpp" -#include "lite/fpga/KD/tensor.hpp" -#include "lite/fpga/KD/tensor_util.hpp" +#include "lite/backends/fpga/KD/float16.hpp" +#include "lite/backends/fpga/KD/llapi/bias_scale.h" +#include "lite/backends/fpga/KD/llapi/filter.h" +#include "lite/backends/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/tensor.hpp" +#include "lite/backends/fpga/KD/tensor_util.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/crop_pe.cpp b/lite/backends/fpga/KD/pes/crop_pe.cpp similarity index 98% rename from lite/fpga/KD/pes/crop_pe.cpp rename to lite/backends/fpga/KD/pes/crop_pe.cpp index 48347c391527def26b64765da4edaf0d16d74857..c29df623aa610d329a46ee337cdcb1abd801881c 100644 --- a/lite/fpga/KD/pes/crop_pe.cpp +++ b/lite/backends/fpga/KD/pes/crop_pe.cpp @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/fpga/KD/pes/crop_pe.hpp" +#include "lite/backends/fpga/KD/pes/crop_pe.hpp" #include diff --git a/lite/fpga/KD/pes/crop_pe.hpp b/lite/backends/fpga/KD/pes/crop_pe.hpp similarity index 88% rename from lite/fpga/KD/pes/crop_pe.hpp rename to lite/backends/fpga/KD/pes/crop_pe.hpp index 01ae7b50003df820b98cc8c6cd3bbd035a359bbf..6ebbcdb31f1afb7939c75a2ba9254c0b31f67d31 100755 --- a/lite/fpga/KD/pes/crop_pe.hpp +++ b/lite/backends/fpga/KD/pes/crop_pe.hpp @@ -17,9 +17,9 @@ limitations under the License. */ #include #include -#include "lite/fpga/KD/float16.hpp" -#include "lite/fpga/KD/pe.hpp" -#include "lite/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/float16.hpp" +#include "lite/backends/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/pe_params.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/depthwise_conv_pe.hpp b/lite/backends/fpga/KD/pes/depthwise_conv_pe.hpp similarity index 94% rename from lite/fpga/KD/pes/depthwise_conv_pe.hpp rename to lite/backends/fpga/KD/pes/depthwise_conv_pe.hpp index 759ce8ecee234c234e6604f09b8309707763558d..9d7b9b544bff953662bab86f095823c5c7b3075b 100755 --- a/lite/fpga/KD/pes/depthwise_conv_pe.hpp +++ b/lite/backends/fpga/KD/pes/depthwise_conv_pe.hpp @@ -14,10 +14,10 @@ limitations under the License. */ #pragma once -#include "lite/fpga/KD/float16.hpp" -#include "lite/fpga/KD/pe.hpp" -#include "lite/fpga/KD/pe_params.hpp" -#include "lite/fpga/KD/pes/conv_process.hpp" +#include "lite/backends/fpga/KD/float16.hpp" +#include "lite/backends/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/pes/conv_process.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/elementwise_add_pe.hpp b/lite/backends/fpga/KD/pes/elementwise_add_pe.hpp similarity index 96% rename from lite/fpga/KD/pes/elementwise_add_pe.hpp rename to lite/backends/fpga/KD/pes/elementwise_add_pe.hpp index 015d861c29d659c9ec0f421a2b1b0e5c561139d9..a498a2bde9a3656cf8b7006b867eec088d87b425 100755 --- a/lite/fpga/KD/pes/elementwise_add_pe.hpp +++ b/lite/backends/fpga/KD/pes/elementwise_add_pe.hpp @@ -14,8 +14,8 @@ limitations under the License. */ #pragma once -#include "lite/fpga/KD/pe.hpp" -#include "lite/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/pe_params.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/fully_connected_pe.hpp b/lite/backends/fpga/KD/pes/fully_connected_pe.hpp similarity index 93% rename from lite/fpga/KD/pes/fully_connected_pe.hpp rename to lite/backends/fpga/KD/pes/fully_connected_pe.hpp index ab02991c93c91d13d83408af6976441b5f6178ac..2179a142ad3b3a990512b3ea1cd202bc5ce502f1 100644 --- a/lite/fpga/KD/pes/fully_connected_pe.hpp +++ b/lite/backends/fpga/KD/pes/fully_connected_pe.hpp @@ -16,10 +16,10 @@ limitations under the License. */ #include -#include "lite/fpga/KD/pe.hpp" -#include "lite/fpga/KD/pe_params.hpp" -#include "lite/fpga/KD/pes/conv_pe.hpp" -#include "lite/fpga/KD/pes/conv_process.hpp" +#include "lite/backends/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/pes/conv_pe.hpp" +#include "lite/backends/fpga/KD/pes/conv_process.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/input_pe.hpp b/lite/backends/fpga/KD/pes/input_pe.hpp similarity index 94% rename from lite/fpga/KD/pes/input_pe.hpp rename to lite/backends/fpga/KD/pes/input_pe.hpp index 0c2629fc1ee0b146e8932a369b9b28a4a23cac78..380c85e17e7de63486bbc93bb62ae8728286dd7a 100755 --- a/lite/fpga/KD/pes/input_pe.hpp +++ b/lite/backends/fpga/KD/pes/input_pe.hpp @@ -14,8 +14,8 @@ limitations under the License. */ #pragma once -#include "lite/fpga/KD/pe.hpp" -#include "lite/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/pe_params.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/norm_pe.hpp b/lite/backends/fpga/KD/pes/norm_pe.hpp similarity index 96% rename from lite/fpga/KD/pes/norm_pe.hpp rename to lite/backends/fpga/KD/pes/norm_pe.hpp index ad009e0e964d9f92d5e85d47fcec926a9bf0440c..3e2fd8062766c84282233b91fcaecf5e0a26fd72 100644 --- a/lite/fpga/KD/pes/norm_pe.hpp +++ b/lite/backends/fpga/KD/pes/norm_pe.hpp @@ -17,9 +17,9 @@ limitations under the License. */ #include #include -#include "lite/fpga/KD/float16.hpp" -#include "lite/fpga/KD/pe.hpp" -#include "lite/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/float16.hpp" +#include "lite/backends/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/pe_params.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/output_pe.hpp b/lite/backends/fpga/KD/pes/output_pe.hpp similarity index 93% rename from lite/fpga/KD/pes/output_pe.hpp rename to lite/backends/fpga/KD/pes/output_pe.hpp index f4ce136852ae24a3f85ed1eaf1a1d5cc50efb38c..1c99386ab19f485c07723c7fcc8501bdf5556f6c 100644 --- a/lite/fpga/KD/pes/output_pe.hpp +++ b/lite/backends/fpga/KD/pes/output_pe.hpp @@ -14,8 +14,8 @@ limitations under the License. */ #pragma once -#include "lite/fpga/KD/pe.hpp" -#include "lite/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/pe_params.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/pooling_pe.hpp b/lite/backends/fpga/KD/pes/pooling_pe.hpp similarity index 98% rename from lite/fpga/KD/pes/pooling_pe.hpp rename to lite/backends/fpga/KD/pes/pooling_pe.hpp index fb4c2924f0fb45cbb88ace63e8c9294dcdc818cd..fd3be1f463d3bfce925cc4ce5444d119c33e5692 100644 --- a/lite/fpga/KD/pes/pooling_pe.hpp +++ b/lite/backends/fpga/KD/pes/pooling_pe.hpp @@ -16,8 +16,8 @@ limitations under the License. */ #include -#include "lite/fpga/KD/pe.hpp" -#include "lite/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/pe_params.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/prior_box_pe.cpp b/lite/backends/fpga/KD/pes/prior_box_pe.cpp similarity index 99% rename from lite/fpga/KD/pes/prior_box_pe.cpp rename to lite/backends/fpga/KD/pes/prior_box_pe.cpp index d4b90b5240c7670c9704472942718cc4ffdc5eae..d6a503a31d4e0736724740ce1875c916969d93e0 100644 --- a/lite/fpga/KD/pes/prior_box_pe.cpp +++ b/lite/backends/fpga/KD/pes/prior_box_pe.cpp @@ -18,7 +18,7 @@ limitations under the License. */ #include #include -#include "lite/fpga/KD/pes/prior_box_pe.hpp" +#include "lite/backends/fpga/KD/pes/prior_box_pe.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/prior_box_pe.hpp b/lite/backends/fpga/KD/pes/prior_box_pe.hpp similarity index 93% rename from lite/fpga/KD/pes/prior_box_pe.hpp rename to lite/backends/fpga/KD/pes/prior_box_pe.hpp index ca5382687c99ca7a3aa888e0e279b7d0cb3299b1..8afe40dd30bb31ddaed0a08edccb439121ef12e0 100755 --- a/lite/fpga/KD/pes/prior_box_pe.hpp +++ b/lite/backends/fpga/KD/pes/prior_box_pe.hpp @@ -14,8 +14,8 @@ limitations under the License. */ #pragma once -#include "lite/fpga/KD/pe.hpp" -#include "lite/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/pe_params.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/relu_pe.hpp b/lite/backends/fpga/KD/pes/relu_pe.hpp similarity index 96% rename from lite/fpga/KD/pes/relu_pe.hpp rename to lite/backends/fpga/KD/pes/relu_pe.hpp index 0b3a0868dc4b67c028b0e8573912759ff9515b15..5c125010c27615c545ba274b259f18c775db3d55 100755 --- a/lite/fpga/KD/pes/relu_pe.hpp +++ b/lite/backends/fpga/KD/pes/relu_pe.hpp @@ -14,8 +14,8 @@ limitations under the License. */ #pragma once -#include "lite/fpga/KD/pe.hpp" -#include "lite/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/pe_params.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/resize.hpp b/lite/backends/fpga/KD/pes/resize.hpp similarity index 96% rename from lite/fpga/KD/pes/resize.hpp rename to lite/backends/fpga/KD/pes/resize.hpp index 370932dba9e6ca695d5e7f7b73880e9752be6381..f83896d2c7197f90d1daf8e087e984313c9ef397 100644 --- a/lite/fpga/KD/pes/resize.hpp +++ b/lite/backends/fpga/KD/pes/resize.hpp @@ -14,8 +14,8 @@ limitations under the License. */ #pragma once -#include "lite/fpga/KD/pe.hpp" -#include "lite/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/pe_params.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/scale_pe.hpp b/lite/backends/fpga/KD/pes/scale_pe.hpp similarity index 97% rename from lite/fpga/KD/pes/scale_pe.hpp rename to lite/backends/fpga/KD/pes/scale_pe.hpp index 664a4db2e99e6c75245644e32000f60b516cf61e..d5e16615d9943a1771dfabe916433768ecf16319 100755 --- a/lite/fpga/KD/pes/scale_pe.hpp +++ b/lite/backends/fpga/KD/pes/scale_pe.hpp @@ -14,8 +14,8 @@ limitations under the License. */ #pragma once -#include "lite/fpga/KD/pe.hpp" -#include "lite/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/pe_params.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/softmax_pe.cpp b/lite/backends/fpga/KD/pes/softmax_pe.cpp similarity index 98% rename from lite/fpga/KD/pes/softmax_pe.cpp rename to lite/backends/fpga/KD/pes/softmax_pe.cpp index 8e3296ffa0c56cdc6e054173cde163f1fa2d8bcd..099ed20b8fd995931fcb2ef5dc4bbc180625cb61 100755 --- a/lite/fpga/KD/pes/softmax_pe.cpp +++ b/lite/backends/fpga/KD/pes/softmax_pe.cpp @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/fpga/KD/pes/softmax_pe.hpp" +#include "lite/backends/fpga/KD/pes/softmax_pe.hpp" #include diff --git a/lite/fpga/KD/pes/softmax_pe.hpp b/lite/backends/fpga/KD/pes/softmax_pe.hpp similarity index 88% rename from lite/fpga/KD/pes/softmax_pe.hpp rename to lite/backends/fpga/KD/pes/softmax_pe.hpp index 6ac8e6bb97532cef48078cc3191c4eeaf1dbd2d9..5733f873a417e8957d95dbc1adf99a1151649e11 100644 --- a/lite/fpga/KD/pes/softmax_pe.hpp +++ b/lite/backends/fpga/KD/pes/softmax_pe.hpp @@ -20,11 +20,11 @@ limitations under the License. */ #if defined(__ARM_NEON) || defined(__ARM_NEON__) #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #endif -#include "lite/fpga/KD/pe.hpp" -#include "lite/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/pe_params.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/pes/split_pe.hpp b/lite/backends/fpga/KD/pes/split_pe.hpp similarity index 97% rename from lite/fpga/KD/pes/split_pe.hpp rename to lite/backends/fpga/KD/pes/split_pe.hpp index 074cc534e7efe5123a8f3bcb11b181bbbe2fb51e..26598a4c87f0b88882b3fe76de64ddfa5c6cd6a8 100644 --- a/lite/fpga/KD/pes/split_pe.hpp +++ b/lite/backends/fpga/KD/pes/split_pe.hpp @@ -16,8 +16,8 @@ limitations under the License. */ #include -#include "lite/fpga/KD/pe.hpp" -#include "lite/fpga/KD/pe_params.hpp" +#include "lite/backends/fpga/KD/pe.hpp" +#include "lite/backends/fpga/KD/pe_params.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/shape.hpp b/lite/backends/fpga/KD/shape.hpp similarity index 96% rename from lite/fpga/KD/shape.hpp rename to lite/backends/fpga/KD/shape.hpp index 12be3ac4853b13efca5d18a8e899b116f795d614..566ad8e6ff2eff32301e83b6cdb5b1addd0117fe 100755 --- a/lite/fpga/KD/shape.hpp +++ b/lite/backends/fpga/KD/shape.hpp @@ -17,8 +17,8 @@ limitations under the License. */ #include #include -#include "lite/fpga/KD/alignment.h" -#include "lite/fpga/KD/layout.hpp" +#include "lite/backends/fpga/KD/alignment.h" +#include "lite/backends/fpga/KD/layout.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/tensor.hpp b/lite/backends/fpga/KD/tensor.hpp similarity index 97% rename from lite/fpga/KD/tensor.hpp rename to lite/backends/fpga/KD/tensor.hpp index 4b93c4671d1e0328ff5be50960456ae535de6ee1..f003ded33eb51136ae0ae0a2c21988460232f89a 100644 --- a/lite/fpga/KD/tensor.hpp +++ b/lite/backends/fpga/KD/tensor.hpp @@ -26,11 +26,11 @@ limitations under the License. */ // #include "lite/core/tensor.h" -#include "lite/fpga/KD/dl_engine.hpp" -#include "lite/fpga/KD/float16.hpp" -#include "lite/fpga/KD/llapi/zynqmp_api.h" -#include "lite/fpga/KD/shape.hpp" -// #include "lite/fpga/KD/types.hpp" +#include "lite/backends/fpga/KD/dl_engine.hpp" +#include "lite/backends/fpga/KD/float16.hpp" +#include "lite/backends/fpga/KD/llapi/zynqmp_api.h" +#include "lite/backends/fpga/KD/shape.hpp" +// #include "lite/backends/fpga/KD/types.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/tensor_util.cpp b/lite/backends/fpga/KD/tensor_util.cpp similarity index 95% rename from lite/fpga/KD/tensor_util.cpp rename to lite/backends/fpga/KD/tensor_util.cpp index 49c58ec91a4ea6852f1bb4c40b13cb8e3bc98bc5..cbf5df15cdaec89c21112741d24a653cbab2c93e 100644 --- a/lite/fpga/KD/tensor_util.cpp +++ b/lite/backends/fpga/KD/tensor_util.cpp @@ -14,7 +14,7 @@ limitations under the License. */ #include -#include "lite/fpga/KD/tensor_util.hpp" +#include "lite/backends/fpga/KD/tensor_util.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/KD/tensor_util.hpp b/lite/backends/fpga/KD/tensor_util.hpp similarity index 94% rename from lite/fpga/KD/tensor_util.hpp rename to lite/backends/fpga/KD/tensor_util.hpp index 6022089264a0d17aa591c63d3235f9ef2f82a91b..01f57570397b64a5d24d725a07caee4d89ce52d8 100644 --- a/lite/fpga/KD/tensor_util.hpp +++ b/lite/backends/fpga/KD/tensor_util.hpp @@ -16,7 +16,7 @@ limitations under the License. */ #include -#include "lite/fpga/KD/tensor.hpp" +#include "lite/backends/fpga/KD/tensor.hpp" namespace paddle { namespace zynqmp { diff --git a/lite/fpga/lite_tensor.cc b/lite/backends/fpga/lite_tensor.cc similarity index 98% rename from lite/fpga/lite_tensor.cc rename to lite/backends/fpga/lite_tensor.cc index 2653dd6b217f4e60192d463192bd98740ce6a45f..43218173fd05626fb46495bb254b250c14e5417a 100644 --- a/lite/fpga/lite_tensor.cc +++ b/lite/backends/fpga/lite_tensor.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/fpga/lite_tensor.h" +#include "lite/backends/fpga/lite_tensor.h" #include namespace paddle { diff --git a/lite/fpga/lite_tensor.h b/lite/backends/fpga/lite_tensor.h similarity index 99% rename from lite/fpga/lite_tensor.h rename to lite/backends/fpga/lite_tensor.h index 296f462dc98df3cdd51d250af3af00e990c68d69..77f6a7ad822a0071539f54d4cb29d69983a99f7e 100644 --- a/lite/fpga/lite_tensor.h +++ b/lite/backends/fpga/lite_tensor.h @@ -21,8 +21,8 @@ #include #include +#include "lite/backends/fpga/KD/tensor.hpp" #include "lite/core/memory.h" -#include "lite/fpga/KD/tensor.hpp" namespace paddle { namespace lite { diff --git a/lite/fpga/target_wrapper.cc b/lite/backends/fpga/target_wrapper.cc similarity index 96% rename from lite/fpga/target_wrapper.cc rename to lite/backends/fpga/target_wrapper.cc index 4d5350b8fdd4383a58e1f5f58b931ac76808f0ba..653384b061782e9bde0c1800ebb82b978a910796 100644 --- a/lite/fpga/target_wrapper.cc +++ b/lite/backends/fpga/target_wrapper.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "lite/core/target_wrapper.h" -#include "lite/fpga/KD/llapi/zynqmp_api.h" +#include "lite/backends/fpga/KD/llapi/zynqmp_api.h" #include "lite/utils/all.h" #ifdef LITE_WITH_FPGA namespace paddle { diff --git a/lite/host/CMakeLists.txt b/lite/backends/host/CMakeLists.txt similarity index 100% rename from lite/host/CMakeLists.txt rename to lite/backends/host/CMakeLists.txt diff --git a/lite/host/target_wrapper.cc b/lite/backends/host/target_wrapper.cc similarity index 100% rename from lite/host/target_wrapper.cc rename to lite/backends/host/target_wrapper.cc diff --git a/lite/opencl/CMakeLists.txt b/lite/backends/opencl/CMakeLists.txt similarity index 96% rename from lite/opencl/CMakeLists.txt rename to lite/backends/opencl/CMakeLists.txt index bf7396acd42c1a400e509dc1287551fe106412b5..1acb98321844191832fd55b640a9b56d3d51b400 100644 --- a/lite/opencl/CMakeLists.txt +++ b/lite/backends/opencl/CMakeLists.txt @@ -11,8 +11,8 @@ lite_cc_library(cl_image SRCS cl_image.cc DEPS tensor cl_image_converter cl_runt lite_cc_library(cl_caller SRCS cl_caller.cc DEPS cl_context cl_image) lite_cc_library(cl_target_wrapper SRCS target_wrapper.cc DEPS cl_runtime) lite_cc_test(test_cl_functions SRCS cl_functions_test.cc DEPS cl_context cl_image cl_caller cl_wrapper cl_target_wrapper - ARGS --cl_path=${CMAKE_SOURCE_DIR}/paddle/fluid/lite/opencl) + ARGS --cl_path=${CMAKE_SOURCE_DIR}/paddle/fluid/lite/backends/opencl) lite_cc_test(test_cl_im2col SRCS cl_im2col_test.cc DEPS tensor cl_context cl_wrapper cl_target_wrapper - ARGS --cl_path=${CMAKE_SOURCE_DIR}/paddle/fluid/lite/opencl) + ARGS --cl_path=${CMAKE_SOURCE_DIR}/paddle/fluid/lite/backends/opencl) add_dependencies(cl_wrapper opencl_clhpp) diff --git a/lite/opencl/cl_caller.cc b/lite/backends/opencl/cl_caller.cc similarity index 96% rename from lite/opencl/cl_caller.cc rename to lite/backends/opencl/cl_caller.cc index 5ef32a73ec44e3053db9f10a487bfc6a325aa472..ae755b756d2c1d7eaf619469367f46550ec36e14 100644 --- a/lite/opencl/cl_caller.cc +++ b/lite/backends/opencl/cl_caller.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/opencl/cl_caller.h" +#include "lite/backends/opencl/cl_caller.h" #include +#include "lite/backends/opencl/cl_context.h" +#include "lite/backends/opencl/cl_image.h" +#include "lite/backends/opencl/cl_runtime.h" +#include "lite/backends/opencl/cl_utility.h" #include "lite/core/tensor.h" -#include "lite/opencl/cl_context.h" -#include "lite/opencl/cl_image.h" -#include "lite/opencl/cl_runtime.h" -#include "lite/opencl/cl_utility.h" #include "lite/utils/string.h" namespace paddle { diff --git a/lite/opencl/cl_caller.h b/lite/backends/opencl/cl_caller.h similarity index 97% rename from lite/opencl/cl_caller.h rename to lite/backends/opencl/cl_caller.h index d0e147814021c2b95ab832b3b168a7d64733ac80..ed5c9153d3cedf140cbf0570b7f71393fb918bf9 100644 --- a/lite/opencl/cl_caller.h +++ b/lite/backends/opencl/cl_caller.h @@ -15,8 +15,8 @@ limitations under the License. */ #pragma once #include +#include "lite/backends/opencl/cl_context.h" #include "lite/core/tensor.h" -#include "lite/opencl/cl_context.h" namespace paddle { namespace lite { diff --git a/lite/opencl/cl_context.cc b/lite/backends/opencl/cl_context.cc similarity index 97% rename from lite/opencl/cl_context.cc rename to lite/backends/opencl/cl_context.cc index 1501bd29841a2c729da85611aaa35087ed37cf9d..0fcb99486eac57e36ee548b809f8f141e0807db8 100644 --- a/lite/opencl/cl_context.cc +++ b/lite/backends/opencl/cl_context.cc @@ -12,12 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/opencl/cl_context.h" +#include "lite/backends/opencl/cl_context.h" #include #include #include -#include "lite/opencl/cl_runtime.h" -#include "lite/opencl/cl_utility.h" +#include "lite/backends/opencl/cl_runtime.h" +#include "lite/backends/opencl/cl_utility.h" #include "lite/utils/cp_logging.h" #include "lite/utils/replace_stl/stream.h" diff --git a/lite/opencl/cl_context.h b/lite/backends/opencl/cl_context.h similarity index 94% rename from lite/opencl/cl_context.h rename to lite/backends/opencl/cl_context.h index b6d74b0bf23e22b1b45237f5698c97dcafd04d84..a28f82f40ecd70a38fcd179e3c7dedfb02a6bcd1 100644 --- a/lite/opencl/cl_context.h +++ b/lite/backends/opencl/cl_context.h @@ -19,8 +19,8 @@ limitations under the License. */ #include #include #include -#include "lite/opencl/cl_image.h" -#include "lite/opencl/cl_include.h" +#include "lite/backends/opencl/cl_image.h" +#include "lite/backends/opencl/cl_include.h" namespace paddle { namespace lite { diff --git a/lite/opencl/cl_functions_test.cc b/lite/backends/opencl/cl_functions_test.cc similarity index 98% rename from lite/opencl/cl_functions_test.cc rename to lite/backends/opencl/cl_functions_test.cc index 795cd9862f22953a6f3612c939217bdc73392e70..b041952b34c43ca98237ee33e9dceccdd58a431b 100644 --- a/lite/opencl/cl_functions_test.cc +++ b/lite/backends/opencl/cl_functions_test.cc @@ -19,12 +19,12 @@ limitations under the License. */ #include #include #include +#include "lite/backends/opencl/cl_caller.h" +#include "lite/backends/opencl/cl_context.h" +#include "lite/backends/opencl/cl_image.h" +#include "lite/backends/opencl/cl_runtime.h" +#include "lite/backends/opencl/target_wrapper.h" #include "lite/core/tensor.h" -#include "lite/opencl/cl_caller.h" -#include "lite/opencl/cl_context.h" -#include "lite/opencl/cl_image.h" -#include "lite/opencl/cl_runtime.h" -#include "lite/opencl/target_wrapper.h" #include "lite/utils/cp_logging.h" DEFINE_string(cl_path, "/data/local/tmp/opencl", "The OpenCL kernels path."); diff --git a/lite/opencl/cl_im2col_test.cc b/lite/backends/opencl/cl_im2col_test.cc similarity index 99% rename from lite/opencl/cl_im2col_test.cc rename to lite/backends/opencl/cl_im2col_test.cc index 176a6516aab4815ef03ca726ba6f5a7fd18749f7..a0770d34eef9acec9fd245df079691ab511ae4ac 100644 --- a/lite/opencl/cl_im2col_test.cc +++ b/lite/backends/opencl/cl_im2col_test.cc @@ -17,10 +17,10 @@ limitations under the License. */ #include #include #include +#include "lite/backends/opencl/cl_context.h" +#include "lite/backends/opencl/cl_runtime.h" +#include "lite/backends/opencl/target_wrapper.h" #include "lite/core/tensor.h" -#include "lite/opencl/cl_context.h" -#include "lite/opencl/cl_runtime.h" -#include "lite/opencl/target_wrapper.h" #include "lite/utils/cp_logging.h" DEFINE_string(cl_path, "/data/local/tmp/opencl", "The OpenCL kernels path."); diff --git a/lite/opencl/cl_image.cc b/lite/backends/opencl/cl_image.cc similarity index 97% rename from lite/opencl/cl_image.cc rename to lite/backends/opencl/cl_image.cc index 206f84900056961b9d6abcf9c145408422bab950..f6dcd4bbefc7735e0b18df5f536c2236fbda1809 100644 --- a/lite/opencl/cl_image.cc +++ b/lite/backends/opencl/cl_image.cc @@ -12,10 +12,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/opencl/cl_image.h" +#include "lite/backends/opencl/cl_image.h" #include -#include "lite/opencl/cl_runtime.h" -#include "lite/opencl/cl_utility.h" +#include "lite/backends/opencl/cl_runtime.h" +#include "lite/backends/opencl/cl_utility.h" #include "lite/utils/cp_logging.h" namespace paddle { diff --git a/lite/opencl/cl_image.h b/lite/backends/opencl/cl_image.h similarity index 96% rename from lite/opencl/cl_image.h rename to lite/backends/opencl/cl_image.h index 4d4b858dbe519412fc7d5120cfe66ff740646232..f3a5f6361fbd88898c8a87ef347b3e00ee51da81 100644 --- a/lite/opencl/cl_image.h +++ b/lite/backends/opencl/cl_image.h @@ -17,9 +17,9 @@ limitations under the License. */ #include #include #include +#include "lite/backends/opencl/cl_image_converter.h" +#include "lite/backends/opencl/cl_include.h" #include "lite/core/tensor.h" -#include "lite/opencl/cl_image_converter.h" -#include "lite/opencl/cl_include.h" namespace paddle { namespace lite { diff --git a/lite/opencl/cl_image_converter.cc b/lite/backends/opencl/cl_image_converter.cc similarity index 99% rename from lite/opencl/cl_image_converter.cc rename to lite/backends/opencl/cl_image_converter.cc index 407a8b794ac0a8096558e5a8c2499b3188f84b37..402f710d7a226de089134b4abc41dc41027e0da1 100644 --- a/lite/opencl/cl_image_converter.cc +++ b/lite/backends/opencl/cl_image_converter.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/opencl/cl_image_converter.h" +#include "lite/backends/opencl/cl_image_converter.h" #include #include "lite/utils/cp_logging.h" diff --git a/lite/opencl/cl_image_converter.h b/lite/backends/opencl/cl_image_converter.h similarity index 100% rename from lite/opencl/cl_image_converter.h rename to lite/backends/opencl/cl_image_converter.h diff --git a/lite/opencl/cl_include.h b/lite/backends/opencl/cl_include.h similarity index 100% rename from lite/opencl/cl_include.h rename to lite/backends/opencl/cl_include.h diff --git a/lite/opencl/cl_kernel/buffer/depthwise_conv2d_kernel.cl b/lite/backends/opencl/cl_kernel/buffer/depthwise_conv2d_kernel.cl similarity index 100% rename from lite/opencl/cl_kernel/buffer/depthwise_conv2d_kernel.cl rename to lite/backends/opencl/cl_kernel/buffer/depthwise_conv2d_kernel.cl diff --git a/lite/opencl/cl_kernel/buffer/elementwise_add_kernel.cl b/lite/backends/opencl/cl_kernel/buffer/elementwise_add_kernel.cl similarity index 100% rename from lite/opencl/cl_kernel/buffer/elementwise_add_kernel.cl rename to lite/backends/opencl/cl_kernel/buffer/elementwise_add_kernel.cl diff --git a/lite/opencl/cl_kernel/buffer/fc_kernel.cl b/lite/backends/opencl/cl_kernel/buffer/fc_kernel.cl similarity index 100% rename from lite/opencl/cl_kernel/buffer/fc_kernel.cl rename to lite/backends/opencl/cl_kernel/buffer/fc_kernel.cl diff --git a/lite/opencl/cl_kernel/buffer/im2col_kernel.cl b/lite/backends/opencl/cl_kernel/buffer/im2col_kernel.cl similarity index 100% rename from lite/opencl/cl_kernel/buffer/im2col_kernel.cl rename to lite/backends/opencl/cl_kernel/buffer/im2col_kernel.cl diff --git a/lite/opencl/cl_kernel/buffer/mat_mul_kernel.cl b/lite/backends/opencl/cl_kernel/buffer/mat_mul_kernel.cl similarity index 100% rename from lite/opencl/cl_kernel/buffer/mat_mul_kernel.cl rename to lite/backends/opencl/cl_kernel/buffer/mat_mul_kernel.cl diff --git a/lite/opencl/cl_kernel/buffer/pool_kernel.cl b/lite/backends/opencl/cl_kernel/buffer/pool_kernel.cl similarity index 100% rename from lite/opencl/cl_kernel/buffer/pool_kernel.cl rename to lite/backends/opencl/cl_kernel/buffer/pool_kernel.cl diff --git a/lite/opencl/cl_kernel/buffer/relu_kernel.cl b/lite/backends/opencl/cl_kernel/buffer/relu_kernel.cl similarity index 100% rename from lite/opencl/cl_kernel/buffer/relu_kernel.cl rename to lite/backends/opencl/cl_kernel/buffer/relu_kernel.cl diff --git a/lite/opencl/cl_kernel/cl_common.h b/lite/backends/opencl/cl_kernel/cl_common.h similarity index 100% rename from lite/opencl/cl_kernel/cl_common.h rename to lite/backends/opencl/cl_kernel/cl_common.h diff --git a/lite/opencl/cl_kernel/image/channel_add_kernel.cl b/lite/backends/opencl/cl_kernel/image/channel_add_kernel.cl similarity index 100% rename from lite/opencl/cl_kernel/image/channel_add_kernel.cl rename to lite/backends/opencl/cl_kernel/image/channel_add_kernel.cl diff --git a/lite/opencl/cl_kernel/image/elementwise_add_kernel.cl b/lite/backends/opencl/cl_kernel/image/elementwise_add_kernel.cl similarity index 100% rename from lite/opencl/cl_kernel/image/elementwise_add_kernel.cl rename to lite/backends/opencl/cl_kernel/image/elementwise_add_kernel.cl diff --git a/lite/opencl/cl_kernel/image/pool_kernel.cl b/lite/backends/opencl/cl_kernel/image/pool_kernel.cl similarity index 100% rename from lite/opencl/cl_kernel/image/pool_kernel.cl rename to lite/backends/opencl/cl_kernel/image/pool_kernel.cl diff --git a/lite/opencl/cl_runtime.cc b/lite/backends/opencl/cl_runtime.cc similarity index 99% rename from lite/opencl/cl_runtime.cc rename to lite/backends/opencl/cl_runtime.cc index 613dbec0731b4a086ebb6740f8e958feec8ade8d..c2504ab611e93399c70169f3f123d4a0514c07ad 100644 --- a/lite/opencl/cl_runtime.cc +++ b/lite/backends/opencl/cl_runtime.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/opencl/cl_runtime.h" +#include "lite/backends/opencl/cl_runtime.h" #include #include #include diff --git a/lite/opencl/cl_runtime.h b/lite/backends/opencl/cl_runtime.h similarity index 96% rename from lite/opencl/cl_runtime.h rename to lite/backends/opencl/cl_runtime.h index ffea2fdea6511846a08214fda1f62f591b5c6e04..0859780c69cc8647c1fd54bf1ab12be29217c9e1 100644 --- a/lite/opencl/cl_runtime.h +++ b/lite/backends/opencl/cl_runtime.h @@ -18,8 +18,8 @@ limitations under the License. */ #include #include #include -#include "lite/opencl/cl_include.h" -#include "lite/opencl/cl_utility.h" +#include "lite/backends/opencl/cl_include.h" +#include "lite/backends/opencl/cl_utility.h" namespace paddle { namespace lite { diff --git a/lite/opencl/cl_utility.cc b/lite/backends/opencl/cl_utility.cc similarity index 98% rename from lite/opencl/cl_utility.cc rename to lite/backends/opencl/cl_utility.cc index 475f7499c7c066c2633a9156cb3dadd89a013b7c..7c8cca414ff89402bac35210be5ee8833047ae34 100644 --- a/lite/opencl/cl_utility.cc +++ b/lite/backends/opencl/cl_utility.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/opencl/cl_utility.h" +#include "lite/backends/opencl/cl_utility.h" namespace paddle { namespace lite { diff --git a/lite/opencl/cl_utility.h b/lite/backends/opencl/cl_utility.h similarity index 97% rename from lite/opencl/cl_utility.h rename to lite/backends/opencl/cl_utility.h index 4a0c6ccd977bfcb36ee66d83f1ca520181f7f9ac..b7f14c15e61ba050220ef0819fa9c3d13a7b8606 100644 --- a/lite/opencl/cl_utility.h +++ b/lite/backends/opencl/cl_utility.h @@ -14,7 +14,7 @@ limitations under the License. */ #pragma once -#include "lite/opencl/cl_include.h" +#include "lite/backends/opencl/cl_include.h" #include "lite/utils/cp_logging.h" #include "lite/utils/string.h" diff --git a/lite/opencl/cl_wrapper.cc b/lite/backends/opencl/cl_wrapper.cc similarity index 99% rename from lite/opencl/cl_wrapper.cc rename to lite/backends/opencl/cl_wrapper.cc index 862ba02bae3db6df264f2e1217afe970fe8873de..357ac8c2d6ae340743fa713641e3e89449f1489f 100644 --- a/lite/opencl/cl_wrapper.cc +++ b/lite/backends/opencl/cl_wrapper.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/opencl/cl_wrapper.h" +#include "lite/backends/opencl/cl_wrapper.h" #include #include #include diff --git a/lite/opencl/cl_wrapper.h b/lite/backends/opencl/cl_wrapper.h similarity index 99% rename from lite/opencl/cl_wrapper.h rename to lite/backends/opencl/cl_wrapper.h index dab66a18671aa474cf36dc2c73ac902d92b43176..35ef33e5a2f3973217e0e4c36caf1f8eb0fbdcb2 100644 --- a/lite/opencl/cl_wrapper.h +++ b/lite/backends/opencl/cl_wrapper.h @@ -14,7 +14,7 @@ limitations under the License. */ #pragma once -#include "lite/opencl/cl_include.h" +#include "lite/backends/opencl/cl_include.h" #include "lite/utils/cp_logging.h" #if CL_HPP_TARGET_OPENCL_VERSION < 200 diff --git a/lite/opencl/target_wrapper.cc b/lite/backends/opencl/target_wrapper.cc similarity index 98% rename from lite/opencl/target_wrapper.cc rename to lite/backends/opencl/target_wrapper.cc index 0d5397b6497ba7301b587345635ae388f68e0b61..eb324fcb0f0872ede6f4476ce5921e2094d45be7 100644 --- a/lite/opencl/target_wrapper.cc +++ b/lite/backends/opencl/target_wrapper.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/opencl/target_wrapper.h" +#include "lite/backends/opencl/target_wrapper.h" #include #include -#include "lite/opencl/cl_include.h" -#include "lite/opencl/cl_runtime.h" -#include "lite/opencl/cl_utility.h" +#include "lite/backends/opencl/cl_include.h" +#include "lite/backends/opencl/cl_runtime.h" +#include "lite/backends/opencl/cl_utility.h" namespace paddle { namespace lite { diff --git a/lite/opencl/target_wrapper.h b/lite/backends/opencl/target_wrapper.h similarity index 98% rename from lite/opencl/target_wrapper.h rename to lite/backends/opencl/target_wrapper.h index b1bef9f33499c4ae801c85ad9180bd1e3ab22ebc..8ff8e6fd4027bd543bdfc221b1fdf5af9d7c4000 100644 --- a/lite/opencl/target_wrapper.h +++ b/lite/backends/opencl/target_wrapper.h @@ -15,8 +15,8 @@ #pragma once #include +#include "lite/backends/opencl/cl_include.h" #include "lite/core/target_wrapper.h" -#include "lite/opencl/cl_include.h" namespace paddle { namespace lite { diff --git a/lite/x86/CMakeLists.txt b/lite/backends/x86/CMakeLists.txt similarity index 100% rename from lite/x86/CMakeLists.txt rename to lite/backends/x86/CMakeLists.txt diff --git a/lite/x86/cpu_info.cc b/lite/backends/x86/cpu_info.cc similarity index 99% rename from lite/x86/cpu_info.cc rename to lite/backends/x86/cpu_info.cc index d239689d35007bca36da8d56147c36f18032219b..c2759d6191aaa7ba277ff2a935ea6fdda8383e1e 100644 --- a/lite/x86/cpu_info.cc +++ b/lite/backends/x86/cpu_info.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/x86/cpu_info.h" +#include "lite/backends/x86/cpu_info.h" #ifdef PADDLE_WITH_XBYAK #include "xbyak/xbyak.h" diff --git a/lite/x86/cpu_info.h b/lite/backends/x86/cpu_info.h similarity index 100% rename from lite/x86/cpu_info.h rename to lite/backends/x86/cpu_info.h diff --git a/lite/x86/cupti_lib_path.h.in b/lite/backends/x86/cupti_lib_path.h.in similarity index 100% rename from lite/x86/cupti_lib_path.h.in rename to lite/backends/x86/cupti_lib_path.h.in diff --git a/lite/x86/dynamic_loader.cc b/lite/backends/x86/dynamic_loader.cc similarity index 98% rename from lite/x86/dynamic_loader.cc rename to lite/backends/x86/dynamic_loader.cc index 2fda916a332fc368c73ce02649f87c6ebe727fe0..3a3e0e1dd422093d7ea8e1c04dcaa2733890d51b 100644 --- a/lite/x86/dynamic_loader.cc +++ b/lite/backends/x86/dynamic_loader.cc @@ -11,7 +11,7 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/dynamic_loader.h" +#include "lite/backends/x86/dynamic_loader.h" #include #include // NOLINT @@ -19,10 +19,10 @@ limitations under the License. */ #include "gflags/gflags.h" #include "glog/logging.h" +#include "lite/backends/x86/cupti_lib_path.h" +#include "lite/backends/x86/port.h" +#include "lite/backends/x86/warpctc_lib_path.h" #include "lite/utils/paddle_enforce.h" -#include "lite/x86/cupti_lib_path.h" -#include "lite/x86/port.h" -#include "lite/x86/warpctc_lib_path.h" DEFINE_string(cudnn_dir, "", diff --git a/lite/x86/dynamic_loader.h b/lite/backends/x86/dynamic_loader.h similarity index 100% rename from lite/x86/dynamic_loader.h rename to lite/backends/x86/dynamic_loader.h diff --git a/lite/x86/jit/CMakeLists.txt b/lite/backends/x86/jit/CMakeLists.txt similarity index 68% rename from lite/x86/jit/CMakeLists.txt rename to lite/backends/x86/jit/CMakeLists.txt index bcf300f10032bb4963afe86d9ab7df9ef6cd79c9..e4113832c68e7a9af32f889a3533e8f3bcabdbc3 100644 --- a/lite/x86/jit/CMakeLists.txt +++ b/lite/backends/x86/jit/CMakeLists.txt @@ -1,9 +1,9 @@ -set(jit_file ${PADDLE_BINARY_DIR}/lite/x86/jit/kernels.h) -file(WRITE ${jit_file} "// Generated by the lite/x86/jit/CMakeLists.txt. DO NOT EDIT!\n\n") +set(jit_file ${PADDLE_BINARY_DIR}/lite/backends/x86/jit/kernels.h) +file(WRITE ${jit_file} "// Generated by the lite/backends/x86/jit/CMakeLists.txt. DO NOT EDIT!\n\n") file(APPEND ${jit_file} "\#pragma once\n") -file(APPEND ${jit_file} "\#include \"lite/x86/jit/helper.h\"\n") -file(APPEND ${jit_file} "\#include \"lite/x86/jit/registry.h\"\n\n") +file(APPEND ${jit_file} "\#include \"lite/backends/x86/jit/helper.h\"\n") +file(APPEND ${jit_file} "\#include \"lite/backends/x86/jit/registry.h\"\n\n") set(JIT_KERNEL_DEPS x86_cpu_info cblas gflags xxhash) diff --git a/lite/x86/jit/README.en.md b/lite/backends/x86/jit/README.en.md similarity index 91% rename from lite/x86/jit/README.en.md rename to lite/backends/x86/jit/README.en.md index 665923533ca9dbfddb35bf537ca8f72891f1db5b..cd2aa5c242dba1a9be669a536cd9b614bf890e48 100644 --- a/lite/x86/jit/README.en.md +++ b/lite/backends/x86/jit/README.en.md @@ -34,7 +34,7 @@ PaddlePaddle/Paddle/paddle/fluid/ └── ... ``` -All basical definations of jit kernels are addressed in `lite/x86/jit` including these three key folders `refer`, `gen`, `more`. There is only one unique name for each kernel while may have seraval implementations with same functionality. +All basical definations of jit kernels are addressed in `lite/backends/x86/jit` including these three key folders `refer`, `gen`, `more`. There is only one unique name for each kernel while may have seraval implementations with same functionality. - `refer`: Each kernel must have one reference implementation on CPU, and it should only focus on the correctness and should not depends on any third-party libraries. - `gen`: The code generated should be kept here. They should be designed focusing on the best performance, which depends on Xbyak. @@ -71,7 +71,7 @@ Get all implementations and run once: } ``` -All kernels are inlcuded in `lite/x86/jit/kernels.h`, which is automatically generated in compile time, you can only include this one header to get all the registered kernels. +All kernels are inlcuded in `lite/backends/x86/jit/kernels.h`, which is automatically generated in compile time, you can only include this one header to get all the registered kernels. ## Solid Test diff --git a/lite/x86/jit/README.md b/lite/backends/x86/jit/README.md similarity index 97% rename from lite/x86/jit/README.md rename to lite/backends/x86/jit/README.md index d206c091774dec5bb6dbe85c841c17b194a59bf7..6998c5d867b079dfef69a71ca56e6f3fc30363d4 100644 --- a/lite/x86/jit/README.md +++ b/lite/backends/x86/jit/README.md @@ -46,7 +46,7 @@ PaddlePaddle/Paddle/paddle/fluid/ ### 例子 -所有kernel的调用只需要在头文件中包含`"lite/x86/jit/kernels.h"`, 该文件是编译时自动生成的。 +所有kernel的调用只需要在头文件中包含`"lite/backends/x86/jit/kernels.h"`, 该文件是编译时自动生成的。 直接从缓存中获取默认最优的函数。 diff --git a/lite/x86/jit/benchmark.cc b/lite/backends/x86/jit/benchmark.cc similarity index 99% rename from lite/x86/jit/benchmark.cc rename to lite/backends/x86/jit/benchmark.cc index 8cba3780dc69d9c75b06d52efe932926f530201b..c49984691e5beca5a42defd68243e1352372cf11 100644 --- a/lite/x86/jit/benchmark.cc +++ b/lite/backends/x86/jit/benchmark.cc @@ -18,9 +18,9 @@ #include #include "gflags/gflags.h" #include "glog/logging.h" +#include "lite/backends/x86/jit/kernels.h" +#include "lite/backends/x86/legacy_place.h" #include "lite/core/tensor.h" -#include "lite/x86/jit/kernels.h" -#include "lite/x86/legacy_place.h" DEFINE_int32(burning, 10, "Burning times."); DEFINE_int32(repeat, 3000, "Repeat times."); diff --git a/lite/x86/jit/gen/CMakeLists.txt b/lite/backends/x86/jit/gen/CMakeLists.txt similarity index 100% rename from lite/x86/jit/gen/CMakeLists.txt rename to lite/backends/x86/jit/gen/CMakeLists.txt diff --git a/lite/x86/jit/gen/act.cc b/lite/backends/x86/jit/gen/act.cc similarity index 97% rename from lite/x86/jit/gen/act.cc rename to lite/backends/x86/jit/gen/act.cc index 4e542d62ee88e9467bf85633c0b2dd4ea2959c82..f1f261c199d8d25997b1ce235aa99356834e43a8 100644 --- a/lite/x86/jit/gen/act.cc +++ b/lite/backends/x86/jit/gen/act.cc @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/gen/act.h" +#include "lite/backends/x86/jit/gen/act.h" #include -#include "lite/x86/cpu_info.h" -#include "lite/x86/jit/registry.h" +#include "lite/backends/x86/cpu_info.h" +#include "lite/backends/x86/jit/registry.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/act.h b/lite/backends/x86/jit/gen/act.h similarity index 99% rename from lite/x86/jit/gen/act.h rename to lite/backends/x86/jit/gen/act.h index 0f850b8b6dc20da6658722295fded5292918c4d4..6366cff3c85d674c8f7730dae24732bdf3571672 100644 --- a/lite/x86/jit/gen/act.h +++ b/lite/backends/x86/jit/gen/act.h @@ -16,7 +16,7 @@ #include #include -#include "lite/x86/jit/gen/jitcode.h" +#include "lite/backends/x86/jit/gen/jitcode.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/blas.cc b/lite/backends/x86/jit/gen/blas.cc similarity index 98% rename from lite/x86/jit/gen/blas.cc rename to lite/backends/x86/jit/gen/blas.cc index d56c74efa6761fc13e6ad3049adf97a6b41119a7..0bddea6ace7fd338d14da918516223bb17bafdbd 100644 --- a/lite/x86/jit/gen/blas.cc +++ b/lite/backends/x86/jit/gen/blas.cc @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/gen/blas.h" +#include "lite/backends/x86/jit/gen/blas.h" #include -#include "lite/x86/jit/registry.h" +#include "lite/backends/x86/jit/registry.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/blas.h b/lite/backends/x86/jit/gen/blas.h similarity index 98% rename from lite/x86/jit/gen/blas.h rename to lite/backends/x86/jit/gen/blas.h index 2d073c087385e1411fbbbc107e4cde4ee4138668..39920195b245e1c44ff68ab91af94d25c949bd02 100644 --- a/lite/x86/jit/gen/blas.h +++ b/lite/backends/x86/jit/gen/blas.h @@ -16,7 +16,7 @@ #include #include "glog/logging.h" -#include "lite/x86/jit/gen/jitcode.h" +#include "lite/backends/x86/jit/gen/jitcode.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/embseqpool.cc b/lite/backends/x86/jit/gen/embseqpool.cc similarity index 96% rename from lite/x86/jit/gen/embseqpool.cc rename to lite/backends/x86/jit/gen/embseqpool.cc index 6b6c831960c040f55738996cdedba492d7e4bf6a..2ff6894383f95699e4209215b0df3a84507a06b4 100644 --- a/lite/x86/jit/gen/embseqpool.cc +++ b/lite/backends/x86/jit/gen/embseqpool.cc @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/gen/embseqpool.h" +#include "lite/backends/x86/jit/gen/embseqpool.h" #include // offsetof #include #include -#include "lite/x86/jit/gen/act.h" // for exp_float_consts ones -#include "lite/x86/jit/registry.h" +#include "lite/backends/x86/jit/gen/act.h" // for exp_float_consts ones +#include "lite/backends/x86/jit/registry.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/embseqpool.h b/lite/backends/x86/jit/gen/embseqpool.h similarity index 97% rename from lite/x86/jit/gen/embseqpool.h rename to lite/backends/x86/jit/gen/embseqpool.h index 68f744c760b501fdd91c0d0ae4db58a72b1790ba..7cae76f9dd99cf904e831b196bd493623ff7eb1d 100644 --- a/lite/x86/jit/gen/embseqpool.h +++ b/lite/backends/x86/jit/gen/embseqpool.h @@ -16,8 +16,8 @@ #include #include +#include "lite/backends/x86/jit/gen/jitcode.h" #include "lite/utils/paddle_enforce.h" -#include "lite/x86/jit/gen/jitcode.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/gru.cc b/lite/backends/x86/jit/gen/gru.cc similarity index 97% rename from lite/x86/jit/gen/gru.cc rename to lite/backends/x86/jit/gen/gru.cc index 5c52552457bead387fd9380cdf26554c04806d13..c5737faf134287697ef49b88f10c2590da4cc07d 100644 --- a/lite/x86/jit/gen/gru.cc +++ b/lite/backends/x86/jit/gen/gru.cc @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/gen/gru.h" +#include "lite/backends/x86/jit/gen/gru.h" #include // offsetof #include -#include "lite/x86/jit/registry.h" +#include "lite/backends/x86/jit/registry.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/gru.h b/lite/backends/x86/jit/gen/gru.h similarity index 97% rename from lite/x86/jit/gen/gru.h rename to lite/backends/x86/jit/gen/gru.h index e2ac385a5afe08d8633747cb5fa5031132e5042a..408f25746d85d4c56bdbd3c0728687f817c1f80f 100644 --- a/lite/x86/jit/gen/gru.h +++ b/lite/backends/x86/jit/gen/gru.h @@ -16,8 +16,8 @@ #include #include "glog/logging.h" -#include "lite/x86/jit/gen/act.h" -#include "lite/x86/jit/gen/jitcode.h" +#include "lite/backends/x86/jit/gen/act.h" +#include "lite/backends/x86/jit/gen/jitcode.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/hopv.cc b/lite/backends/x86/jit/gen/hopv.cc similarity index 97% rename from lite/x86/jit/gen/hopv.cc rename to lite/backends/x86/jit/gen/hopv.cc index 2020f034d1faf7657a36b4f6c6edf6c9886c1a25..4304dc48c5a084a747227bd4d4aedb1cec1775cd 100644 --- a/lite/x86/jit/gen/hopv.cc +++ b/lite/backends/x86/jit/gen/hopv.cc @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/gen/hopv.h" +#include "lite/backends/x86/jit/gen/hopv.h" #include -#include "lite/x86/jit/registry.h" +#include "lite/backends/x86/jit/registry.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/hopv.h b/lite/backends/x86/jit/gen/hopv.h similarity index 98% rename from lite/x86/jit/gen/hopv.h rename to lite/backends/x86/jit/gen/hopv.h index 37128f0d4251c4e9774e6569bc18a2b5baa16c52..801131d6307e6ff10efaa2770fce6ac0a0f3b9d3 100644 --- a/lite/x86/jit/gen/hopv.h +++ b/lite/backends/x86/jit/gen/hopv.h @@ -16,7 +16,7 @@ #include #include "glog/logging.h" -#include "lite/x86/jit/gen/jitcode.h" +#include "lite/backends/x86/jit/gen/jitcode.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/jitcode.h b/lite/backends/x86/jit/gen/jitcode.h similarity index 97% rename from lite/x86/jit/gen/jitcode.h rename to lite/backends/x86/jit/gen/jitcode.h index ddbf2adddc160287c10f2a91728c8f73ffde2bd6..1840dcac682fde2ff9674459f96def080237d52a 100644 --- a/lite/x86/jit/gen/jitcode.h +++ b/lite/backends/x86/jit/gen/jitcode.h @@ -16,8 +16,8 @@ #include #include -#include "lite/x86/cpu_info.h" -#include "lite/x86/jit/gen_base.h" +#include "lite/backends/x86/cpu_info.h" +#include "lite/backends/x86/jit/gen_base.h" #define XBYAK_USE_MMAP_ALLOCATOR #include "xbyak/xbyak.h" diff --git a/lite/x86/jit/gen/lstm.cc b/lite/backends/x86/jit/gen/lstm.cc similarity index 98% rename from lite/x86/jit/gen/lstm.cc rename to lite/backends/x86/jit/gen/lstm.cc index 8a1cd68fbd7e049e60ea27823ea76fce70eb380a..44e58d0b75612238115d5771082d28c30cad55a2 100644 --- a/lite/x86/jit/gen/lstm.cc +++ b/lite/backends/x86/jit/gen/lstm.cc @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/gen/lstm.h" +#include "lite/backends/x86/jit/gen/lstm.h" #include // offsetof #include -#include "lite/x86/jit/registry.h" +#include "lite/backends/x86/jit/registry.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/lstm.h b/lite/backends/x86/jit/gen/lstm.h similarity index 97% rename from lite/x86/jit/gen/lstm.h rename to lite/backends/x86/jit/gen/lstm.h index 9e2e722697b109082efcf6798796e3e0bb66f4f0..141419505c7ce3b8e515dbd728987640afda7fc5 100644 --- a/lite/x86/jit/gen/lstm.h +++ b/lite/backends/x86/jit/gen/lstm.h @@ -16,8 +16,8 @@ #include #include "glog/logging.h" -#include "lite/x86/jit/gen/act.h" -#include "lite/x86/jit/gen/jitcode.h" +#include "lite/backends/x86/jit/gen/act.h" +#include "lite/backends/x86/jit/gen/jitcode.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/matmul.cc b/lite/backends/x86/jit/gen/matmul.cc similarity index 97% rename from lite/x86/jit/gen/matmul.cc rename to lite/backends/x86/jit/gen/matmul.cc index 37c8c21dd3a5523accd81f6c2ed80051ca1a9795..103b9101bab4a90f651b1af2fbf229933905990e 100644 --- a/lite/x86/jit/gen/matmul.cc +++ b/lite/backends/x86/jit/gen/matmul.cc @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/gen/matmul.h" +#include "lite/backends/x86/jit/gen/matmul.h" #include // offsetof #include #include -#include "lite/x86/jit/registry.h" +#include "lite/backends/x86/jit/registry.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/matmul.h b/lite/backends/x86/jit/gen/matmul.h similarity index 97% rename from lite/x86/jit/gen/matmul.h rename to lite/backends/x86/jit/gen/matmul.h index 6ab0dfebce573a57ed0ae5699f65449840eb9991..b1b302b7904a5d92952f4385c483eccdc5df3592 100644 --- a/lite/x86/jit/gen/matmul.h +++ b/lite/backends/x86/jit/gen/matmul.h @@ -18,8 +18,8 @@ #include #include #include "glog/logging.h" +#include "lite/backends/x86/jit/gen/jitcode.h" #include "lite/utils/paddle_enforce.h" -#include "lite/x86/jit/gen/jitcode.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/seqpool.cc b/lite/backends/x86/jit/gen/seqpool.cc similarity index 94% rename from lite/x86/jit/gen/seqpool.cc rename to lite/backends/x86/jit/gen/seqpool.cc index 1b24f429bebcd87e48b1a79035bc849d4fb74c75..e0cf5e5a5a7646f09666f6ccb35b18610c845317 100644 --- a/lite/x86/jit/gen/seqpool.cc +++ b/lite/backends/x86/jit/gen/seqpool.cc @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/gen/seqpool.h" +#include "lite/backends/x86/jit/gen/seqpool.h" #include -#include "lite/x86/jit/gen/act.h" // for exp_float_consts ones -#include "lite/x86/jit/registry.h" +#include "lite/backends/x86/jit/gen/act.h" // for exp_float_consts ones +#include "lite/backends/x86/jit/registry.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/seqpool.h b/lite/backends/x86/jit/gen/seqpool.h similarity index 99% rename from lite/x86/jit/gen/seqpool.h rename to lite/backends/x86/jit/gen/seqpool.h index 468d03d700a28d0850d5d8b0e6f6c0accc1b5da7..346179cfbbd0e8291dc17b266366c5df07114b7f 100644 --- a/lite/x86/jit/gen/seqpool.h +++ b/lite/backends/x86/jit/gen/seqpool.h @@ -16,8 +16,8 @@ #include #include +#include "lite/backends/x86/jit/gen/jitcode.h" #include "lite/utils/paddle_enforce.h" -#include "lite/x86/jit/gen/jitcode.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/sgd.cc b/lite/backends/x86/jit/gen/sgd.cc similarity index 97% rename from lite/x86/jit/gen/sgd.cc rename to lite/backends/x86/jit/gen/sgd.cc index 75a11f770cba8f39d8bf4042ad70300ed531bef2..10659f50844d73c14403f9e7a35d800364be1e7b 100644 --- a/lite/x86/jit/gen/sgd.cc +++ b/lite/backends/x86/jit/gen/sgd.cc @@ -12,12 +12,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/gen/sgd.h" +#include "lite/backends/x86/jit/gen/sgd.h" #include // offsetof #include #include +#include "lite/backends/x86/jit/registry.h" #include "lite/utils/paddle_enforce.h" -#include "lite/x86/jit/registry.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/sgd.h b/lite/backends/x86/jit/gen/sgd.h similarity index 97% rename from lite/x86/jit/gen/sgd.h rename to lite/backends/x86/jit/gen/sgd.h index a6853965fbafb086ddcdf3e00f96d240323dcb71..303d94f2ab6bf823ea71b8c52b2a755558f50fbd 100644 --- a/lite/x86/jit/gen/sgd.h +++ b/lite/backends/x86/jit/gen/sgd.h @@ -16,7 +16,7 @@ #include #include "glog/logging.h" -#include "lite/x86/jit/gen/jitcode.h" +#include "lite/backends/x86/jit/gen/jitcode.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/vbroadcast.cc b/lite/backends/x86/jit/gen/vbroadcast.cc similarity index 96% rename from lite/x86/jit/gen/vbroadcast.cc rename to lite/backends/x86/jit/gen/vbroadcast.cc index e423aa3e8ad00879936482a4f7ee3b4059b644f1..9e02dca8c40975fb45feed1d818bbe6d3e65db19 100644 --- a/lite/x86/jit/gen/vbroadcast.cc +++ b/lite/backends/x86/jit/gen/vbroadcast.cc @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/gen/vbroadcast.h" +#include "lite/backends/x86/jit/gen/vbroadcast.h" #include #include +#include "lite/backends/x86/jit/registry.h" #include "lite/utils/paddle_enforce.h" -#include "lite/x86/jit/registry.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen/vbroadcast.h b/lite/backends/x86/jit/gen/vbroadcast.h similarity index 96% rename from lite/x86/jit/gen/vbroadcast.h rename to lite/backends/x86/jit/gen/vbroadcast.h index 0074f1e810fd00a2e7dd3c854ef356cba0bc5069..39bcd4965f3a24f18de7fa5a13d469b3019920f9 100644 --- a/lite/x86/jit/gen/vbroadcast.h +++ b/lite/backends/x86/jit/gen/vbroadcast.h @@ -16,7 +16,7 @@ #include #include "glog/logging.h" -#include "lite/x86/jit/gen/jitcode.h" +#include "lite/backends/x86/jit/gen/jitcode.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/gen_base.cc b/lite/backends/x86/jit/gen_base.cc similarity index 95% rename from lite/x86/jit/gen_base.cc rename to lite/backends/x86/jit/gen_base.cc index 16e36e57dde0775c9577ff91830f48974a0858cb..38250d533dd8c94afc87b5f9113ea165d6b7e9ed 100644 --- a/lite/x86/jit/gen_base.cc +++ b/lite/backends/x86/jit/gen_base.cc @@ -12,16 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/gen_base.h" +#include "lite/backends/x86/jit/gen_base.h" #include #include #include #include // #include "paddle/fluid/memory/allocation/cpu_allocator.h" // for // posix_memalign +#include "lite/backends/x86/cpu_info.h" +#include "lite/backends/x86/jit/macro.h" #include "lite/utils/paddle_enforce.h" -#include "lite/x86/cpu_info.h" -#include "lite/x86/jit/macro.h" #ifndef _WIN32 #define posix_memalign_free free diff --git a/lite/x86/jit/gen_base.h b/lite/backends/x86/jit/gen_base.h similarity index 98% rename from lite/x86/jit/gen_base.h rename to lite/backends/x86/jit/gen_base.h index d9ce4fa44dd934ac46510909cdb8ca745299e608..b5f942615aa001a119273b52c70116ae66e66126 100644 --- a/lite/x86/jit/gen_base.h +++ b/lite/backends/x86/jit/gen_base.h @@ -18,7 +18,7 @@ #include // for unique_ptr #include #include -#include "lite/x86/jit/kernel_base.h" +#include "lite/backends/x86/jit/kernel_base.h" DECLARE_bool(dump_jitcode); diff --git a/lite/x86/jit/helper.cc b/lite/backends/x86/jit/helper.cc similarity index 98% rename from lite/x86/jit/helper.cc rename to lite/backends/x86/jit/helper.cc index 4767795aa16e2ab313727c1884c913fd53bee46a..8322f7ebd2ce78f99979574983d81cebe5139606 100644 --- a/lite/x86/jit/helper.cc +++ b/lite/backends/x86/jit/helper.cc @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/helper.h" +#include "lite/backends/x86/jit/helper.h" #include // tolower #include #include diff --git a/lite/x86/jit/helper.h b/lite/backends/x86/jit/helper.h similarity index 98% rename from lite/x86/jit/helper.h rename to lite/backends/x86/jit/helper.h index 43f371184fa6a409ad2fc08e16d63517bacb374e..b21be9466c05f4c41127ba781360a946e1c1b98c 100644 --- a/lite/x86/jit/helper.h +++ b/lite/backends/x86/jit/helper.h @@ -19,11 +19,11 @@ #include #include // for std::move #include +#include "lite/backends/x86/jit/gen_base.h" +#include "lite/backends/x86/jit/kernel_base.h" +#include "lite/backends/x86/jit/kernel_key.h" +#include "lite/backends/x86/jit/kernel_pool.h" #include "lite/utils/paddle_enforce.h" -#include "lite/x86/jit/gen_base.h" -#include "lite/x86/jit/kernel_base.h" -#include "lite/x86/jit/kernel_key.h" -#include "lite/x86/jit/kernel_pool.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/kernel_base.h b/lite/backends/x86/jit/kernel_base.h similarity index 99% rename from lite/x86/jit/kernel_base.h rename to lite/backends/x86/jit/kernel_base.h index a6968dfa56044f79281b715529a2f50dca0b7068..dbe44a78acbd99621b60dfa67beaddf9301159d3 100644 --- a/lite/x86/jit/kernel_base.h +++ b/lite/backends/x86/jit/kernel_base.h @@ -14,7 +14,7 @@ #pragma once #include -#include "lite/x86/jit/macro.h" +#include "lite/backends/x86/jit/macro.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/kernel_key.cc b/lite/backends/x86/jit/kernel_key.cc similarity index 97% rename from lite/x86/jit/kernel_key.cc rename to lite/backends/x86/jit/kernel_key.cc index 07b30e63ae2749bde2876f30b00ec8c997c56fdb..a6288fcf19d6867e1e1eb0bce32e559a4f303929 100644 --- a/lite/x86/jit/kernel_key.cc +++ b/lite/backends/x86/jit/kernel_key.cc @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/kernel_key.h" +#include "lite/backends/x86/jit/kernel_key.h" #include // XXH64: 13.8 GB/s #include "lite/utils/paddle_enforce.h" diff --git a/lite/x86/jit/kernel_key.h b/lite/backends/x86/jit/kernel_key.h similarity index 94% rename from lite/x86/jit/kernel_key.h rename to lite/backends/x86/jit/kernel_key.h index 6524a000fca48b5ed6197252ae39a506b0ef1816..6df3a20a4b7a3e663255c79d203bc8bf44fa6772 100644 --- a/lite/x86/jit/kernel_key.h +++ b/lite/backends/x86/jit/kernel_key.h @@ -15,8 +15,8 @@ #pragma once #include #include -#include "lite/x86/jit/kernel_base.h" -#include "lite/x86/legacy_place.h" +#include "lite/backends/x86/jit/kernel_base.h" +#include "lite/backends/x86/legacy_place.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/kernel_pool.cc b/lite/backends/x86/jit/kernel_pool.cc similarity index 96% rename from lite/x86/jit/kernel_pool.cc rename to lite/backends/x86/jit/kernel_pool.cc index 70e1d5de2e49047978d66192e8d867119ace16ef..43ad20c90cf9b5f16c2c9710069cd29a3e0dd460 100644 --- a/lite/x86/jit/kernel_pool.cc +++ b/lite/backends/x86/jit/kernel_pool.cc @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/kernel_pool.h" +#include "lite/backends/x86/jit/kernel_pool.h" #include // for shared_ptr #include #include diff --git a/lite/x86/jit/kernel_pool.h b/lite/backends/x86/jit/kernel_pool.h similarity index 95% rename from lite/x86/jit/kernel_pool.h rename to lite/backends/x86/jit/kernel_pool.h index fd2eb5f929e4f1d93402c17a920cece754070a88..dc0b1bbf2ecc4b14c6f6acd02d4dad4909c58f73 100644 --- a/lite/x86/jit/kernel_pool.h +++ b/lite/backends/x86/jit/kernel_pool.h @@ -19,9 +19,9 @@ #include #include // for move #include -#include "lite/x86/jit/gen_base.h" -#include "lite/x86/jit/kernel_base.h" -#include "lite/x86/jit/kernel_key.h" +#include "lite/backends/x86/jit/gen_base.h" +#include "lite/backends/x86/jit/kernel_base.h" +#include "lite/backends/x86/jit/kernel_key.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/macro.h b/lite/backends/x86/jit/macro.h similarity index 100% rename from lite/x86/jit/macro.h rename to lite/backends/x86/jit/macro.h diff --git a/lite/x86/jit/more/CMakeLists.txt b/lite/backends/x86/jit/more/CMakeLists.txt similarity index 100% rename from lite/x86/jit/more/CMakeLists.txt rename to lite/backends/x86/jit/more/CMakeLists.txt diff --git a/lite/x86/jit/more/intrinsic/CMakeLists.txt b/lite/backends/x86/jit/more/intrinsic/CMakeLists.txt similarity index 100% rename from lite/x86/jit/more/intrinsic/CMakeLists.txt rename to lite/backends/x86/jit/more/intrinsic/CMakeLists.txt diff --git a/lite/x86/jit/more/intrinsic/crf_decoding.cc b/lite/backends/x86/jit/more/intrinsic/crf_decoding.cc similarity index 97% rename from lite/x86/jit/more/intrinsic/crf_decoding.cc rename to lite/backends/x86/jit/more/intrinsic/crf_decoding.cc index 3f18b3f92f14daf33623d973073587f03315d12b..d9c939f7ef0d6f69bbaaee5f8e3955750c363b0d 100644 --- a/lite/x86/jit/more/intrinsic/crf_decoding.cc +++ b/lite/backends/x86/jit/more/intrinsic/crf_decoding.cc @@ -12,10 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/more/intrinsic/crf_decoding.h" +#include "lite/backends/x86/jit/more/intrinsic/crf_decoding.h" #include -#include "lite/x86/cpu_info.h" -#include "lite/x86/jit/registry.h" +#include "lite/backends/x86/cpu_info.h" +#include "lite/backends/x86/jit/registry.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/more/intrinsic/crf_decoding.h b/lite/backends/x86/jit/more/intrinsic/crf_decoding.h similarity index 96% rename from lite/x86/jit/more/intrinsic/crf_decoding.h rename to lite/backends/x86/jit/more/intrinsic/crf_decoding.h index 21c4cb50262be88456ab9794766fd79fbc01e1ef..8a425fb4910ae66e6e5821038fd1ce763b3ec825 100644 --- a/lite/x86/jit/more/intrinsic/crf_decoding.h +++ b/lite/backends/x86/jit/more/intrinsic/crf_decoding.h @@ -15,7 +15,7 @@ #pragma once #include -#include "lite/x86/jit/kernel_base.h" +#include "lite/backends/x86/jit/kernel_base.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/more/intrinsic/layer_norm.cc b/lite/backends/x86/jit/more/intrinsic/layer_norm.cc similarity index 98% rename from lite/x86/jit/more/intrinsic/layer_norm.cc rename to lite/backends/x86/jit/more/intrinsic/layer_norm.cc index 7beb6a14375f1b06e047d612f4394630188917c4..bfd3409e65d3d4830b05ba5dfcda5cbd7553ad37 100644 --- a/lite/x86/jit/more/intrinsic/layer_norm.cc +++ b/lite/backends/x86/jit/more/intrinsic/layer_norm.cc @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/more/intrinsic/layer_norm.h" +#include "lite/backends/x86/jit/more/intrinsic/layer_norm.h" #include -#include "lite/x86/jit/registry.h" +#include "lite/backends/x86/jit/registry.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/more/intrinsic/layer_norm.h b/lite/backends/x86/jit/more/intrinsic/layer_norm.h similarity index 96% rename from lite/x86/jit/more/intrinsic/layer_norm.h rename to lite/backends/x86/jit/more/intrinsic/layer_norm.h index f399e65681f800d7414226febbfac4b6f389b65d..d8768d52ed1c3c6d83abc5b504c9b0a87e7479d0 100644 --- a/lite/x86/jit/more/intrinsic/layer_norm.h +++ b/lite/backends/x86/jit/more/intrinsic/layer_norm.h @@ -15,7 +15,7 @@ #pragma once #include -#include "lite/x86/jit/kernel_base.h" +#include "lite/backends/x86/jit/kernel_base.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/more/mix/CMakeLists.txt b/lite/backends/x86/jit/more/mix/CMakeLists.txt similarity index 100% rename from lite/x86/jit/more/mix/CMakeLists.txt rename to lite/backends/x86/jit/more/mix/CMakeLists.txt diff --git a/lite/x86/jit/more/mix/mix.cc b/lite/backends/x86/jit/more/mix/mix.cc similarity index 98% rename from lite/x86/jit/more/mix/mix.cc rename to lite/backends/x86/jit/more/mix/mix.cc index 4e9bf4796c2b3e35a6e005a513d2e578a8029a34..b904b8a24cd97e01ac3c8ef2add93582c3277f65 100644 --- a/lite/x86/jit/more/mix/mix.cc +++ b/lite/backends/x86/jit/more/mix/mix.cc @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/more/mix/mix.h" -#include "lite/x86/jit/kernels.h" -#include "lite/x86/jit/registry.h" +#include "lite/backends/x86/jit/more/mix/mix.h" +#include "lite/backends/x86/jit/kernels.h" +#include "lite/backends/x86/jit/registry.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/more/mix/mix.h b/lite/backends/x86/jit/more/mix/mix.h similarity index 97% rename from lite/x86/jit/more/mix/mix.h rename to lite/backends/x86/jit/more/mix/mix.h index 7560210dfa922b461ce9bd868eb8761ac21f0887..6ade67182c0bc8f85f8a34e20ba04334f97c6a2c 100644 --- a/lite/x86/jit/more/mix/mix.h +++ b/lite/backends/x86/jit/more/mix/mix.h @@ -15,7 +15,7 @@ #pragma once #include -#include "lite/x86/jit/kernel_base.h" +#include "lite/backends/x86/jit/kernel_base.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/more/mkl/CMakeLists.txt b/lite/backends/x86/jit/more/mkl/CMakeLists.txt similarity index 100% rename from lite/x86/jit/more/mkl/CMakeLists.txt rename to lite/backends/x86/jit/more/mkl/CMakeLists.txt diff --git a/lite/x86/jit/more/mkl/mkl.cc b/lite/backends/x86/jit/more/mkl/mkl.cc similarity index 97% rename from lite/x86/jit/more/mkl/mkl.cc rename to lite/backends/x86/jit/more/mkl/mkl.cc index 531c8fcef779c8a16c1a3e553591e85711e8cce5..7df930f6c05af26b23f6879c11d1eca0013bac39 100644 --- a/lite/x86/jit/more/mkl/mkl.cc +++ b/lite/backends/x86/jit/more/mkl/mkl.cc @@ -12,11 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/more/mkl/mkl.h" -#include "lite/x86/cpu_info.h" -#include "lite/x86/jit/refer/refer.h" -#include "lite/x86/jit/registry.h" -#include "lite/x86/mklml.h" +#include "lite/backends/x86/jit/more/mkl/mkl.h" +#include "lite/backends/x86/cpu_info.h" +#include "lite/backends/x86/jit/refer/refer.h" +#include "lite/backends/x86/jit/registry.h" +#include "lite/backends/x86/mklml.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/more/mkl/mkl.h b/lite/backends/x86/jit/more/mkl/mkl.h similarity index 99% rename from lite/x86/jit/more/mkl/mkl.h rename to lite/backends/x86/jit/more/mkl/mkl.h index b9668f833838e866e14b81520ffd6199863927ec..8b713e537e74ca2d2a2e79dad7c325cda9c0e7a4 100644 --- a/lite/x86/jit/more/mkl/mkl.h +++ b/lite/backends/x86/jit/more/mkl/mkl.h @@ -17,8 +17,8 @@ #include #include #include +#include "lite/backends/x86/jit/kernel_base.h" #include "lite/utils/paddle_enforce.h" -#include "lite/x86/jit/kernel_base.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/refer/CMakeLists.txt b/lite/backends/x86/jit/refer/CMakeLists.txt similarity index 100% rename from lite/x86/jit/refer/CMakeLists.txt rename to lite/backends/x86/jit/refer/CMakeLists.txt diff --git a/lite/x86/jit/refer/refer.cc b/lite/backends/x86/jit/refer/refer.cc similarity index 95% rename from lite/x86/jit/refer/refer.cc rename to lite/backends/x86/jit/refer/refer.cc index b34e09d6413d7f6a2c526ccf326270e1dae8f7ce..e1b1240c5d5b0bc382fae8bd1b77f6c412522bdd 100644 --- a/lite/x86/jit/refer/refer.cc +++ b/lite/backends/x86/jit/refer/refer.cc @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "lite/x86/jit/refer/refer.h" -#include "lite/x86/jit/registry.h" +#include "lite/backends/x86/jit/refer/refer.h" +#include "lite/backends/x86/jit/registry.h" namespace refer = paddle::lite::jit::refer; diff --git a/lite/x86/jit/refer/refer.h b/lite/backends/x86/jit/refer/refer.h similarity index 99% rename from lite/x86/jit/refer/refer.h rename to lite/backends/x86/jit/refer/refer.h index 020c4b0a1fad3331165b52c7349b0b8d2e3534dd..119ec7469ed21f5e74c973e3de88ed6b93b1e06a 100644 --- a/lite/x86/jit/refer/refer.h +++ b/lite/backends/x86/jit/refer/refer.h @@ -19,10 +19,10 @@ #include #include #include +#include "lite/backends/x86/jit/helper.h" +#include "lite/backends/x86/jit/kernel_base.h" +#include "lite/backends/x86/jit/macro.h" #include "lite/utils/paddle_enforce.h" -#include "lite/x86/jit/helper.h" -#include "lite/x86/jit/kernel_base.h" -#include "lite/x86/jit/macro.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/registry.h b/lite/backends/x86/jit/registry.h similarity index 97% rename from lite/x86/jit/registry.h rename to lite/backends/x86/jit/registry.h index db1a7341c27929e69f70a87cd6acccf33e624416..7613a8dd4376045beb3636954668130e7220521e 100644 --- a/lite/x86/jit/registry.h +++ b/lite/backends/x86/jit/registry.h @@ -18,11 +18,11 @@ #include #include #include // for std::move +#include "lite/backends/x86/cpu_info.h" +#include "lite/backends/x86/jit/kernel_base.h" +#include "lite/backends/x86/jit/kernel_pool.h" +#include "lite/backends/x86/legacy_place.h" #include "lite/utils/macros.h" -#include "lite/x86/cpu_info.h" -#include "lite/x86/jit/kernel_base.h" -#include "lite/x86/jit/kernel_pool.h" -#include "lite/x86/legacy_place.h" namespace paddle { namespace lite { diff --git a/lite/x86/jit/test.cc b/lite/backends/x86/jit/test.cc similarity index 99% rename from lite/x86/jit/test.cc rename to lite/backends/x86/jit/test.cc index 9f654ddc4368e48828fb956265c0e9e8671b6459..aafcad579fdefd675323e0e2a6f40bd89c2a0166 100644 --- a/lite/x86/jit/test.cc +++ b/lite/backends/x86/jit/test.cc @@ -20,9 +20,9 @@ limitations under the License. */ #include #include #include -#include "lite/x86/cpu_info.h" -#include "lite/x86/jit/kernels.h" -#include "lite/x86/legacy_place.h" +#include "lite/backends/x86/cpu_info.h" +#include "lite/backends/x86/jit/kernels.h" +#include "lite/backends/x86/legacy_place.h" DEFINE_double(acc, 1e-5, "Test accuracy threshold."); diff --git a/lite/x86/legacy_place.h b/lite/backends/x86/legacy_place.h similarity index 100% rename from lite/x86/legacy_place.h rename to lite/backends/x86/legacy_place.h diff --git a/lite/x86/math/CMakeLists.txt b/lite/backends/x86/math/CMakeLists.txt similarity index 100% rename from lite/x86/math/CMakeLists.txt rename to lite/backends/x86/math/CMakeLists.txt diff --git a/lite/x86/math/beam_search.cc b/lite/backends/x86/math/beam_search.cc similarity index 99% rename from lite/x86/math/beam_search.cc rename to lite/backends/x86/math/beam_search.cc index f8d675a8ba1d91520229fb5570481a27af8bbeb7..93726afcc22446526952f3d7d9641f4abcfc10ee 100644 --- a/lite/x86/math/beam_search.cc +++ b/lite/backends/x86/math/beam_search.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/math/beam_search.h" +#include "lite/backends/x86/math/beam_search.h" #include #include #include "lite/fluid/lod.h" diff --git a/lite/x86/math/beam_search.h b/lite/backends/x86/math/beam_search.h similarity index 100% rename from lite/x86/math/beam_search.h rename to lite/backends/x86/math/beam_search.h diff --git a/lite/x86/math/beam_search_test.cc b/lite/backends/x86/math/beam_search_test.cc similarity index 100% rename from lite/x86/math/beam_search_test.cc rename to lite/backends/x86/math/beam_search_test.cc diff --git a/lite/x86/math/blas.cc b/lite/backends/x86/math/blas.cc similarity index 97% rename from lite/x86/math/blas.cc rename to lite/backends/x86/math/blas.cc index 81d539beabd60c444b7b953b536cbc4936b490e5..2d21adaf5d22930ff720c193696eb00c8035579d 100644 --- a/lite/x86/math/blas.cc +++ b/lite/backends/x86/math/blas.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/x86/math/blas.h" +#include "lite/backends/x86/math/blas.h" #include diff --git a/lite/x86/math/blas.h b/lite/backends/x86/math/blas.h similarity index 99% rename from lite/x86/math/blas.h rename to lite/backends/x86/math/blas.h index 4345657760e2fa6912ec56a1c3b77b4c37d5dacb..c7d5abfce36c1d9169fa6dedeb234a993cbb6ed9 100644 --- a/lite/x86/math/blas.h +++ b/lite/backends/x86/math/blas.h @@ -18,7 +18,7 @@ #include "lite/core/tensor.h" #ifdef PADDLE_WITH_MKLML -#include "lite/x86/mklml.h" +#include "lite/backends/x86/mklml.h" #endif #ifdef PADDLE_WITH_LIBXSMM @@ -405,4 +405,4 @@ inline BlasT GetBlas(const lite::Context& dev_ctx) { } // namespace lite } // namespace paddle -#include "lite/x86/math/blas_impl.h" +#include "lite/backends/x86/math/blas_impl.h" diff --git a/lite/x86/math/blas_impl.h b/lite/backends/x86/math/blas_impl.h similarity index 99% rename from lite/x86/math/blas_impl.h rename to lite/backends/x86/math/blas_impl.h index 8f393768da8caaaa4af7ae586c31a05a8587d3a5..36d76c783cfe06d38b65d548e5dd4dbb16304521 100644 --- a/lite/x86/math/blas_impl.h +++ b/lite/backends/x86/math/blas_impl.h @@ -15,7 +15,7 @@ #include #include #include -#include "lite/x86/math/math_function.h" +#include "lite/backends/x86/math/math_function.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/concat_and_split.cc b/lite/backends/x86/math/concat_and_split.cc similarity index 98% rename from lite/x86/math/concat_and_split.cc rename to lite/backends/x86/math/concat_and_split.cc index 1b6f409efdfef412a0f442d63564a37e46ad7d8b..bec93dde41fdb654cfbfd20f5d9e59d1d372e3a8 100644 --- a/lite/x86/math/concat_and_split.cc +++ b/lite/backends/x86/math/concat_and_split.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/math/concat_and_split.h" +#include "lite/backends/x86/math/concat_and_split.h" #include #include diff --git a/lite/x86/math/concat_and_split.h b/lite/backends/x86/math/concat_and_split.h similarity index 100% rename from lite/x86/math/concat_and_split.h rename to lite/backends/x86/math/concat_and_split.h diff --git a/lite/x86/math/context_project.cc b/lite/backends/x86/math/context_project.cc similarity index 94% rename from lite/x86/math/context_project.cc rename to lite/backends/x86/math/context_project.cc index 3660cbb94df71404cd2874c930d8629f0a1aa5b0..dafced7780a18d84f406df52b5021143fa51aa4a 100644 --- a/lite/x86/math/context_project.cc +++ b/lite/backends/x86/math/context_project.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/math/context_project.h" +#include "lite/backends/x86/math/context_project.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/context_project.h b/lite/backends/x86/math/context_project.h similarity index 99% rename from lite/x86/math/context_project.h rename to lite/backends/x86/math/context_project.h index ed569576b1ab4636fb5c615352567554375067bf..0c56e0d759fd9b1e3abba5209f43d7a0c8fe194e 100644 --- a/lite/x86/math/context_project.h +++ b/lite/backends/x86/math/context_project.h @@ -16,10 +16,10 @@ limitations under the License. */ #include #include +#include "lite/backends/x86/math/blas.h" +#include "lite/backends/x86/math/im2col.h" #include "lite/core/context.h" #include "lite/core/tensor.h" -#include "lite/x86/math/blas.h" -#include "lite/x86/math/im2col.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/cos_sim_functor.cc b/lite/backends/x86/math/cos_sim_functor.cc similarity index 97% rename from lite/x86/math/cos_sim_functor.cc rename to lite/backends/x86/math/cos_sim_functor.cc index 4f3cce1295611ef12a3c902b5fbbecbc549c602b..8dffa380f10b557c2bc92c0848135236d835e510 100644 --- a/lite/x86/math/cos_sim_functor.cc +++ b/lite/backends/x86/math/cos_sim_functor.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/math/cos_sim_functor.h" +#include "lite/backends/x86/math/cos_sim_functor.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/cos_sim_functor.h b/lite/backends/x86/math/cos_sim_functor.h similarity index 100% rename from lite/x86/math/cos_sim_functor.h rename to lite/backends/x86/math/cos_sim_functor.h diff --git a/lite/x86/math/cpu_vec.h b/lite/backends/x86/math/cpu_vec.h similarity index 99% rename from lite/x86/math/cpu_vec.h rename to lite/backends/x86/math/cpu_vec.h index 54a7aba9259348526029200dcc498ed7f515eb5d..9ff64d53f069d2e4c5b639d273af5b4aa5738b2b 100644 --- a/lite/x86/math/cpu_vec.h +++ b/lite/backends/x86/math/cpu_vec.h @@ -16,11 +16,11 @@ limitations under the License. */ #include #include #include +#include "lite/backends/x86/cpu_info.h" #include "lite/utils/paddle_enforce.h" -#include "lite/x86/cpu_info.h" #ifdef PADDLE_WITH_MKLML -#include "lite/x86/mklml.h" +#include "lite/backends/x86/mklml.h" #endif namespace paddle { diff --git a/lite/x86/math/cross_entropy.cc b/lite/backends/x86/math/cross_entropy.cc similarity index 98% rename from lite/x86/math/cross_entropy.cc rename to lite/backends/x86/math/cross_entropy.cc index cce27f90344a035a8d5407e25af2884be33d0b7d..366486924a8c4a5eefd6341183b4f1bc1c0277ad 100644 --- a/lite/x86/math/cross_entropy.cc +++ b/lite/backends/x86/math/cross_entropy.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/math/cross_entropy.h" +#include "lite/backends/x86/math/cross_entropy.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/cross_entropy.h b/lite/backends/x86/math/cross_entropy.h similarity index 100% rename from lite/x86/math/cross_entropy.h rename to lite/backends/x86/math/cross_entropy.h diff --git a/lite/x86/math/detail/CMakeLists.txt b/lite/backends/x86/math/detail/CMakeLists.txt similarity index 100% rename from lite/x86/math/detail/CMakeLists.txt rename to lite/backends/x86/math/detail/CMakeLists.txt diff --git a/lite/x86/math/detail/activation_functions.h b/lite/backends/x86/math/detail/activation_functions.h similarity index 99% rename from lite/x86/math/detail/activation_functions.h rename to lite/backends/x86/math/detail/activation_functions.h index 981f6e18f3e94effe463870b30c09a35a97e4b92..cb215df72205ed59c22698fc1fb914cd3736ce22 100644 --- a/lite/x86/math/detail/activation_functions.h +++ b/lite/backends/x86/math/detail/activation_functions.h @@ -15,8 +15,8 @@ limitations under the License. */ #pragma once #include #include +#include "lite/backends/x86/cpu_info.h" #include "lite/utils/paddle_enforce.h" -#include "lite/x86/cpu_info.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/detail/avx_functions.cc b/lite/backends/x86/math/detail/avx_functions.cc similarity index 95% rename from lite/x86/math/detail/avx_functions.cc rename to lite/backends/x86/math/detail/avx_functions.cc index bfcc52c745350370ea0439f767f3d8a8c2ba9256..0b0c5b977b51f22a57dc92c4f7da9bc4ed5ce150 100644 --- a/lite/x86/math/detail/avx_functions.cc +++ b/lite/backends/x86/math/detail/avx_functions.cc @@ -14,8 +14,8 @@ limitations under the License. */ #ifdef __AVX__ -#include "lite/x86/math/detail/activation_functions.h" -#include "lite/x86/math/detail/avx_mathfun.h" +#include "lite/backends/x86/math/detail/activation_functions.h" +#include "lite/backends/x86/math/detail/avx_mathfun.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/detail/avx_mathfun.h b/lite/backends/x86/math/detail/avx_mathfun.h similarity index 99% rename from lite/x86/math/detail/avx_mathfun.h rename to lite/backends/x86/math/detail/avx_mathfun.h index f0f86d4501f19d585b871cc8004cbcbf6099c4ef..c95c881512900efb4b39df3ba16b8de686caefcb 100644 --- a/lite/x86/math/detail/avx_mathfun.h +++ b/lite/backends/x86/math/detail/avx_mathfun.h @@ -42,7 +42,7 @@ (this is the zlib license) */ -#include "lite/x86/cpu_info.h" +#include "lite/backends/x86/cpu_info.h" /* __m128 is ugly to write */ typedef __m256 v8sf; // vector of 8 float (avx) diff --git a/lite/x86/math/detail/gru_cpu_kernel.h b/lite/backends/x86/math/detail/gru_cpu_kernel.h similarity index 99% rename from lite/x86/math/detail/gru_cpu_kernel.h rename to lite/backends/x86/math/detail/gru_cpu_kernel.h index 1682a48def13c0c220082e888baf289526a69c7f..400431810d79b336507519e3271d4df8c5d83152 100644 --- a/lite/x86/math/detail/gru_cpu_kernel.h +++ b/lite/backends/x86/math/detail/gru_cpu_kernel.h @@ -14,8 +14,8 @@ limitations under the License. */ #pragma once #include -#include "lite/x86/math/detail/activation_functions.h" -#include "lite/x86/math/gru_compute.h" +#include "lite/backends/x86/math/detail/activation_functions.h" +#include "lite/backends/x86/math/gru_compute.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/detail/gru_kernel.h b/lite/backends/x86/math/detail/gru_kernel.h similarity index 99% rename from lite/x86/math/detail/gru_kernel.h rename to lite/backends/x86/math/detail/gru_kernel.h index 90ff006d45a313f7adaab41bbc7ad0e1d5985d71..91c753c685e2d20e4fc0cf463f76b317348ff85b 100644 --- a/lite/x86/math/detail/gru_kernel.h +++ b/lite/backends/x86/math/detail/gru_kernel.h @@ -14,8 +14,8 @@ limitations under the License. */ #pragma once #include +#include "lite/backends/x86/math/detail/activation_functions.h" #include "lite/utils/macros.h" -#include "lite/x86/math/detail/activation_functions.h" // TODO(guosheng): refine code style in gru_kernel namespace paddle { diff --git a/lite/x86/math/gru_compute.cc b/lite/backends/x86/math/gru_compute.cc similarity index 96% rename from lite/x86/math/gru_compute.cc rename to lite/backends/x86/math/gru_compute.cc index 54e99735a7bd2c884d0ed353017c0ccb50fab7e4..b1fdfe18a58058bb3c1b7b4759d0251f70f12d93 100644 --- a/lite/x86/math/gru_compute.cc +++ b/lite/backends/x86/math/gru_compute.cc @@ -9,10 +9,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/math/gru_compute.h" -#include "lite/x86/math/blas.h" -#include "lite/x86/math/detail/gru_cpu_kernel.h" -#include "lite/x86/math/detail/gru_kernel.h" +#include "lite/backends/x86/math/gru_compute.h" +#include "lite/backends/x86/math/blas.h" +#include "lite/backends/x86/math/detail/gru_cpu_kernel.h" +#include "lite/backends/x86/math/detail/gru_kernel.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/gru_compute.h b/lite/backends/x86/math/gru_compute.h similarity index 96% rename from lite/x86/math/gru_compute.h rename to lite/backends/x86/math/gru_compute.h index 1c000825448a778e5f6128db4183365ba1f4fe4b..86b7a91f4127de50aeb5c5fb02122bced0af4188 100644 --- a/lite/x86/math/gru_compute.h +++ b/lite/backends/x86/math/gru_compute.h @@ -11,9 +11,9 @@ limitations under the License. */ #pragma once +#include "lite/backends/x86/math/detail/activation_functions.h" #include "lite/core/context.h" #include "lite/utils/paddle_enforce.h" -#include "lite/x86/math/detail/activation_functions.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/im2col.cc b/lite/backends/x86/math/im2col.cc similarity index 99% rename from lite/x86/math/im2col.cc rename to lite/backends/x86/math/im2col.cc index cc50faba3361b340cd9f13cf3112f32f53e5be64..1c4c6a49f5bb804a57344c59368d18255e8a7912 100644 --- a/lite/x86/math/im2col.cc +++ b/lite/backends/x86/math/im2col.cc @@ -12,10 +12,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/math/im2col.h" +#include "lite/backends/x86/math/im2col.h" #include +#include "lite/backends/x86/math/im2col_cfo_cpu.h" #include "lite/utils/paddle_enforce.h" -#include "lite/x86/math/im2col_cfo_cpu.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/im2col.h b/lite/backends/x86/math/im2col.h similarity index 100% rename from lite/x86/math/im2col.h rename to lite/backends/x86/math/im2col.h diff --git a/lite/x86/math/im2col_cfo_cpu.h b/lite/backends/x86/math/im2col_cfo_cpu.h similarity index 100% rename from lite/x86/math/im2col_cfo_cpu.h rename to lite/backends/x86/math/im2col_cfo_cpu.h diff --git a/lite/x86/math/im2col_test.cc b/lite/backends/x86/math/im2col_test.cc similarity index 100% rename from lite/x86/math/im2col_test.cc rename to lite/backends/x86/math/im2col_test.cc diff --git a/lite/x86/math/math_function.cc b/lite/backends/x86/math/math_function.cc similarity index 97% rename from lite/x86/math/math_function.cc rename to lite/backends/x86/math/math_function.cc index 8ec256ea8e30216f41dd9d6146f4fb6804f6ac7b..822b7df936d84c21c226a13a48e8c09a2343f86a 100644 --- a/lite/x86/math/math_function.cc +++ b/lite/backends/x86/math/math_function.cc @@ -12,10 +12,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/math/math_function.h" +#include "lite/backends/x86/math/math_function.h" #ifdef PADDLE_WITH_MKLML -#include "lite/x86/mklml.h" +#include "lite/backends/x86/mklml.h" #endif #ifdef PADDLE_USE_OPENBLAS @@ -23,9 +23,9 @@ limitations under the License. */ #endif #include +#include "lite/backends/x86/math/math_function_impl.h" #include "lite/fluid/data_type.h" #include "lite/fluid/float16.h" -#include "lite/x86/math/math_function_impl.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/math_function.h b/lite/backends/x86/math/math_function.h similarity index 100% rename from lite/x86/math/math_function.h rename to lite/backends/x86/math/math_function.h diff --git a/lite/x86/math/math_function_impl.h b/lite/backends/x86/math/math_function_impl.h similarity index 99% rename from lite/x86/math/math_function_impl.h rename to lite/backends/x86/math/math_function_impl.h index 880a81e1975542e38a57c2869f7d63cee9739962..3aaca2e59370f8f2b922554ec6f378bb2a3de9b5 100644 --- a/lite/x86/math/math_function_impl.h +++ b/lite/backends/x86/math/math_function_impl.h @@ -14,9 +14,9 @@ limitations under the License. */ #pragma once #include +#include "lite/backends/x86/math/math_function.h" #include "lite/fluid/data_type.h" #include "lite/fluid/eigen.h" -#include "lite/x86/math/math_function.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/math_function_test.cc b/lite/backends/x86/math/math_function_test.cc similarity index 100% rename from lite/x86/math/math_function_test.cc rename to lite/backends/x86/math/math_function_test.cc diff --git a/lite/x86/math/maxouting.cc b/lite/backends/x86/math/maxouting.cc similarity index 98% rename from lite/x86/math/maxouting.cc rename to lite/backends/x86/math/maxouting.cc index 978a0990cfe24bf608d166323e6f72fef70360c2..20b40fe7c5000cc1d0ee80c18efa5d1defc911f0 100644 --- a/lite/x86/math/maxouting.cc +++ b/lite/backends/x86/math/maxouting.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/math/maxouting.h" +#include "lite/backends/x86/math/maxouting.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/maxouting.h b/lite/backends/x86/math/maxouting.h similarity index 100% rename from lite/x86/math/maxouting.h rename to lite/backends/x86/math/maxouting.h diff --git a/lite/x86/math/pooling.cc b/lite/backends/x86/math/pooling.cc similarity index 99% rename from lite/x86/math/pooling.cc rename to lite/backends/x86/math/pooling.cc index f7edc3c9353d44f14ba881319c5d64ff4680a516..e700c5f7c794ae07dc9ddc218f732a3eff049acf 100644 --- a/lite/x86/math/pooling.cc +++ b/lite/backends/x86/math/pooling.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/math/pooling.h" +#include "lite/backends/x86/math/pooling.h" #include #include diff --git a/lite/x86/math/pooling.h b/lite/backends/x86/math/pooling.h similarity index 100% rename from lite/x86/math/pooling.h rename to lite/backends/x86/math/pooling.h diff --git a/lite/x86/math/prelu.h b/lite/backends/x86/math/prelu.h similarity index 96% rename from lite/x86/math/prelu.h rename to lite/backends/x86/math/prelu.h index f57021715b32647bdbacb9ea6f1257c864a58e00..049397c72c054818e6d2f7bbf569280e323a9e93 100644 --- a/lite/x86/math/prelu.h +++ b/lite/backends/x86/math/prelu.h @@ -14,7 +14,7 @@ limitations under the License. */ #pragma once #include -#include "lite/x86/math/math_function.h" +#include "lite/backends/x86/math/math_function.h" // #include "paddle/fluid/platform/cudnn_helper.h" namespace paddle { diff --git a/lite/x86/math/sample_prob.cc b/lite/backends/x86/math/sample_prob.cc similarity index 94% rename from lite/x86/math/sample_prob.cc rename to lite/backends/x86/math/sample_prob.cc index 2d9bec1746cd5fa56440279058721277eaa65489..ecf1ca8e1a440b14e10fbe43b665bac8ee687ecd 100644 --- a/lite/x86/math/sample_prob.cc +++ b/lite/backends/x86/math/sample_prob.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/math/sample_prob.h" +#include "lite/backends/x86/math/sample_prob.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/sample_prob.h b/lite/backends/x86/math/sample_prob.h similarity index 98% rename from lite/x86/math/sample_prob.h rename to lite/backends/x86/math/sample_prob.h index 162de0a04e7afe4a15f06ed812d8e064eaebec36..5312b3df10a41444c073f0cf61d69bce6fc3859a 100644 --- a/lite/x86/math/sample_prob.h +++ b/lite/backends/x86/math/sample_prob.h @@ -16,10 +16,10 @@ limitations under the License. */ #include #include #include +#include "lite/backends/x86/math/sampler.h" #include "lite/core/context.h" #include "lite/core/tensor.h" #include "lite/fluid/eigen.h" -#include "lite/x86/math/sampler.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/sampler.cc b/lite/backends/x86/math/sampler.cc similarity index 98% rename from lite/x86/math/sampler.cc rename to lite/backends/x86/math/sampler.cc index 2ea17e890fb7f50cb485206003d7d2e8528d780a..1246806372d3e7e815fddbf7304390bc18905590 100644 --- a/lite/x86/math/sampler.cc +++ b/lite/backends/x86/math/sampler.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/math/sampler.h" +#include "lite/backends/x86/math/sampler.h" #include #include #include diff --git a/lite/x86/math/sampler.h b/lite/backends/x86/math/sampler.h similarity index 100% rename from lite/x86/math/sampler.h rename to lite/backends/x86/math/sampler.h diff --git a/lite/x86/math/sequence2batch.cc b/lite/backends/x86/math/sequence2batch.cc similarity index 97% rename from lite/x86/math/sequence2batch.cc rename to lite/backends/x86/math/sequence2batch.cc index 6a053d46a928d4c8e337e28c249874b6c902c1b7..ff215781f1efeb20a0e126a6e39a8f3508131abd 100644 --- a/lite/x86/math/sequence2batch.cc +++ b/lite/backends/x86/math/sequence2batch.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/math/sequence2batch.h" +#include "lite/backends/x86/math/sequence2batch.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/sequence2batch.h b/lite/backends/x86/math/sequence2batch.h similarity index 100% rename from lite/x86/math/sequence2batch.h rename to lite/backends/x86/math/sequence2batch.h diff --git a/lite/x86/math/sequence_padding.cc b/lite/backends/x86/math/sequence_padding.cc similarity index 99% rename from lite/x86/math/sequence_padding.cc rename to lite/backends/x86/math/sequence_padding.cc index 8289a18bbb7192ca2e051100cf6ff220d0685fd1..fbb6c11a5f7a0cbae36d2f8fba0b141dadadf542 100644 --- a/lite/x86/math/sequence_padding.cc +++ b/lite/backends/x86/math/sequence_padding.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/math/sequence_padding.h" +#include "lite/backends/x86/math/sequence_padding.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/sequence_padding.h b/lite/backends/x86/math/sequence_padding.h similarity index 100% rename from lite/x86/math/sequence_padding.h rename to lite/backends/x86/math/sequence_padding.h diff --git a/lite/x86/math/sequence_pooling.cc b/lite/backends/x86/math/sequence_pooling.cc similarity index 98% rename from lite/x86/math/sequence_pooling.cc rename to lite/backends/x86/math/sequence_pooling.cc index dad25abbe753bd3a8d1a50152c2bda1bc2041343..186b8b5543c7132867093616c83b45ae8ff27d3c 100644 --- a/lite/x86/math/sequence_pooling.cc +++ b/lite/backends/x86/math/sequence_pooling.cc @@ -14,12 +14,12 @@ limitations under the License. */ #include +#include "lite/backends/x86/jit/kernels.h" +#include "lite/backends/x86/legacy_place.h" +#include "lite/backends/x86/math/blas.h" +#include "lite/backends/x86/math/math_function.h" +#include "lite/backends/x86/math/sequence_pooling.h" #include "lite/fluid/eigen.h" -#include "lite/x86/jit/kernels.h" -#include "lite/x86/legacy_place.h" -#include "lite/x86/math/blas.h" -#include "lite/x86/math/math_function.h" -#include "lite/x86/math/sequence_pooling.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/sequence_pooling.h b/lite/backends/x86/math/sequence_pooling.h similarity index 100% rename from lite/x86/math/sequence_pooling.h rename to lite/backends/x86/math/sequence_pooling.h diff --git a/lite/x86/math/sequence_pooling_test.cc b/lite/backends/x86/math/sequence_pooling_test.cc similarity index 100% rename from lite/x86/math/sequence_pooling_test.cc rename to lite/backends/x86/math/sequence_pooling_test.cc diff --git a/lite/x86/math/sequence_scale.cc b/lite/backends/x86/math/sequence_scale.cc similarity index 96% rename from lite/x86/math/sequence_scale.cc rename to lite/backends/x86/math/sequence_scale.cc index f43402cb169583003f94c54d9bac854a38e5a547..fad0628de15379b58847827cc3d48bf6085cbda2 100644 --- a/lite/x86/math/sequence_scale.cc +++ b/lite/backends/x86/math/sequence_scale.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/math/sequence_scale.h" +#include "lite/backends/x86/math/sequence_scale.h" #include "lite/fluid/lod.h" namespace paddle { diff --git a/lite/x86/math/sequence_scale.h b/lite/backends/x86/math/sequence_scale.h similarity index 100% rename from lite/x86/math/sequence_scale.h rename to lite/backends/x86/math/sequence_scale.h diff --git a/lite/x86/math/softmax.cc b/lite/backends/x86/math/softmax.cc similarity index 92% rename from lite/x86/math/softmax.cc rename to lite/backends/x86/math/softmax.cc index 3bb86e8288117b87d14a972a1191fd360612db94..1f7144dd8ba75b91d3350960bb2f8ef2d3ed76ea 100644 --- a/lite/x86/math/softmax.cc +++ b/lite/backends/x86/math/softmax.cc @@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/math/softmax.h" -#include "lite/x86/math/softmax_impl.h" +#include "lite/backends/x86/math/softmax.h" +#include "lite/backends/x86/math/softmax_impl.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/softmax.h b/lite/backends/x86/math/softmax.h similarity index 100% rename from lite/x86/math/softmax.h rename to lite/backends/x86/math/softmax.h diff --git a/lite/x86/math/softmax_impl.h b/lite/backends/x86/math/softmax_impl.h similarity index 98% rename from lite/x86/math/softmax_impl.h rename to lite/backends/x86/math/softmax_impl.h index a7ed501bdb936ad96b3386eee1cd60b99729164a..c8432c42cc52c7b656397f8ac09bed99b1957732 100644 --- a/lite/x86/math/softmax_impl.h +++ b/lite/backends/x86/math/softmax_impl.h @@ -14,12 +14,12 @@ limitations under the License. */ #pragma once #include +#include "lite/backends/x86/cpu_info.h" +#include "lite/backends/x86/jit/helper.h" +#include "lite/backends/x86/jit/kernel_base.h" +#include "lite/backends/x86/math/cpu_vec.h" #include "lite/core/tensor.h" #include "lite/fluid/eigen.h" -#include "lite/x86/cpu_info.h" -#include "lite/x86/jit/helper.h" -#include "lite/x86/jit/kernel_base.h" -#include "lite/x86/math/cpu_vec.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/tree2col.cc b/lite/backends/x86/math/tree2col.cc similarity index 99% rename from lite/x86/math/tree2col.cc rename to lite/backends/x86/math/tree2col.cc index 311c7a85475c2a5618a9cace0cb75945a57dea32..8a34bebef05e35880548ccc30f7519e2a84dbd1a 100644 --- a/lite/x86/math/tree2col.cc +++ b/lite/backends/x86/math/tree2col.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "lite/x86/math/tree2col.h" +#include "lite/backends/x86/math/tree2col.h" #include #include diff --git a/lite/x86/math/tree2col.h b/lite/backends/x86/math/tree2col.h similarity index 98% rename from lite/x86/math/tree2col.h rename to lite/backends/x86/math/tree2col.h index 9ee47ee76683c995f0fce04b6ff87462464c0bb5..3a48c2f40a541a7b30f93d73ae75240db905b7df 100644 --- a/lite/x86/math/tree2col.h +++ b/lite/backends/x86/math/tree2col.h @@ -17,9 +17,9 @@ #include #include #include +#include "lite/backends/x86/math/math_function.h" #include "lite/core/context.h" #include "lite/core/tensor.h" -#include "lite/x86/math/math_function.h" namespace paddle { namespace lite { diff --git a/lite/x86/math/unpooling.cc b/lite/backends/x86/math/unpooling.cc similarity index 98% rename from lite/x86/math/unpooling.cc rename to lite/backends/x86/math/unpooling.cc index 57409dbc38532ce2767e051718c6719deba6d87d..568f9952cab755c8441695e1a9266a2001d2b9a9 100644 --- a/lite/x86/math/unpooling.cc +++ b/lite/backends/x86/math/unpooling.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/math/unpooling.h" +#include "lite/backends/x86/math/unpooling.h" #include "lite/utils/paddle_enforce.h" namespace paddle { diff --git a/lite/x86/math/unpooling.h b/lite/backends/x86/math/unpooling.h similarity index 100% rename from lite/x86/math/unpooling.h rename to lite/backends/x86/math/unpooling.h diff --git a/lite/x86/math/vol2col.cc b/lite/backends/x86/math/vol2col.cc similarity index 99% rename from lite/x86/math/vol2col.cc rename to lite/backends/x86/math/vol2col.cc index af07d532756fd301ca223a29975110a0e6f982cb..8fd5e8954e2010d5226d56ac4a87a44e6364c8c6 100644 --- a/lite/x86/math/vol2col.cc +++ b/lite/backends/x86/math/vol2col.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/math/vol2col.h" +#include "lite/backends/x86/math/vol2col.h" #include #include "lite/utils/paddle_enforce.h" diff --git a/lite/x86/math/vol2col.h b/lite/backends/x86/math/vol2col.h similarity index 100% rename from lite/x86/math/vol2col.h rename to lite/backends/x86/math/vol2col.h diff --git a/lite/x86/mklml.cc b/lite/backends/x86/mklml.cc similarity index 95% rename from lite/x86/mklml.cc rename to lite/backends/x86/mklml.cc index 387b7dd66cf37a27ef40b406f0d68b8c80060edb..1c3c3c3bde5d07160dfa1699c58f45b737c772dd 100644 --- a/lite/x86/mklml.cc +++ b/lite/backends/x86/mklml.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -#include "lite/x86/mklml.h" +#include "lite/backends/x86/mklml.h" namespace paddle { namespace lite { diff --git a/lite/x86/mklml.h b/lite/backends/x86/mklml.h similarity index 97% rename from lite/x86/mklml.h rename to lite/backends/x86/mklml.h index 920bdff49226bbf8003dbbdfade05f0de667de98..753c42f29599172590dbaf98f18fc6de07c33729 100644 --- a/lite/x86/mklml.h +++ b/lite/backends/x86/mklml.h @@ -16,8 +16,8 @@ limitations under the License. */ #include #include // NOLINT -#include "lite/x86/dynamic_loader.h" -#include "lite/x86/port.h" +#include "lite/backends/x86/dynamic_loader.h" +#include "lite/backends/x86/port.h" namespace paddle { namespace lite { diff --git a/lite/x86/port.h b/lite/backends/x86/port.h similarity index 100% rename from lite/x86/port.h rename to lite/backends/x86/port.h diff --git a/lite/x86/target_wrapper.cc b/lite/backends/x86/target_wrapper.cc similarity index 96% rename from lite/x86/target_wrapper.cc rename to lite/backends/x86/target_wrapper.cc index 8108103de81679f03f7a708a0059c41ed75ae53e..34227abd988188036328f3a7c4309d06abd1b87a 100644 --- a/lite/x86/target_wrapper.cc +++ b/lite/backends/x86/target_wrapper.cc @@ -14,8 +14,8 @@ #include "lite/core/target_wrapper.h" #include +#include "lite/backends/x86/target_wrapper.h" #include "lite/utils/all.h" -#include "lite/x86/target_wrapper.h" namespace paddle { namespace lite { diff --git a/lite/x86/target_wrapper.h b/lite/backends/x86/target_wrapper.h similarity index 100% rename from lite/x86/target_wrapper.h rename to lite/backends/x86/target_wrapper.h diff --git a/lite/x86/warpctc_lib_path.h.in b/lite/backends/x86/warpctc_lib_path.h.in similarity index 100% rename from lite/x86/warpctc_lib_path.h.in rename to lite/backends/x86/warpctc_lib_path.h.in diff --git a/lite/core/context.h b/lite/core/context.h index 985b4e6f44ac32f194bd0e97d3a30ceb1c395dae..2980646a8744d1f342a7ebe197f05707e503640c 100644 --- a/lite/core/context.h +++ b/lite/core/context.h @@ -16,14 +16,14 @@ #include "lite/utils/any.h" #ifdef LITE_WITH_CUDA -#include "lite/cuda/blas.h" -#include "lite/cuda/cuda_utils.h" +#include "lite/backends/cuda/blas.h" +#include "lite/backends/cuda/cuda_utils.h" #endif #ifdef LITE_WITH_OPENCL #include #include -#include "lite/opencl/cl_context.h" -#include "lite/opencl/cl_runtime.h" +#include "lite/backends/opencl/cl_context.h" +#include "lite/backends/opencl/cl_runtime.h" #endif #ifdef LITE_WITH_NPU #include "lite/npu/npu_helper.h" diff --git a/lite/core/kernel.h b/lite/core/kernel.h index 85244c5b14f2bbc392031220f9ee08c3f8a9bdf1..92eca6af54991da45f81954399202d8627fb16a2 100644 --- a/lite/core/kernel.h +++ b/lite/core/kernel.h @@ -20,7 +20,7 @@ #include #include #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/context.h" #include "lite/core/target_wrapper.h" #include "lite/core/type_system.h" diff --git a/lite/core/memory.h b/lite/core/memory.h index baecac5d126505dc43e2ab4e37fdbf0a0ad22308..31d7fd34e1cff5fed562996137be059172ff8151 100644 --- a/lite/core/memory.h +++ b/lite/core/memory.h @@ -18,11 +18,11 @@ #include "lite/utils/macros.h" #ifdef LITE_WITH_OPENCL -#include "lite/opencl/target_wrapper.h" +#include "lite/backends/opencl/target_wrapper.h" #endif // LITE_WITH_OPENCL #ifdef LITE_WITH_CUDA -#include "lite/cuda/target_wrapper.h" +#include "lite/backends/cuda/target_wrapper.h" #endif // LITE_WITH_CUDA namespace paddle { diff --git a/lite/core/tensor.h b/lite/core/tensor.h index 2c00e09405aefb2d3e208f2478b6935e8f3fe30a..205e586ab33545e685dbe8083dfda9f4dffdb13d 100644 --- a/lite/core/tensor.h +++ b/lite/core/tensor.h @@ -15,7 +15,7 @@ #pragma once #ifdef LITE_WITH_FPGA -#include "lite/fpga/lite_tensor.h" +#include "lite/backends/fpga/lite_tensor.h" #endif #ifndef LITE_WITH_FPGA diff --git a/lite/kernels/arm/activation_compute.cc b/lite/kernels/arm/activation_compute.cc index a1cbb9c862212c797749184c345afe88e26204c1..add88b9294b6458449cb49fae10ddcbac6d65631 100644 --- a/lite/kernels/arm/activation_compute.cc +++ b/lite/kernels/arm/activation_compute.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "lite/kernels/arm/activation_compute.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/affine_channel_compute.cc b/lite/kernels/arm/affine_channel_compute.cc index 2e22d5e9f32d5b48169f335fd71ef8c3ed086b4f..6781dab488a505fbcc2fdba5bea1e3282cee3d40 100644 --- a/lite/kernels/arm/affine_channel_compute.cc +++ b/lite/kernels/arm/affine_channel_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/affine_channel_compute.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/anchor_generator_compute.cc b/lite/kernels/arm/anchor_generator_compute.cc index c54719230414bc5de651b30200589753cf0503dd..3f317174759d079a2d798a8367493c52e0a71ce8 100644 --- a/lite/kernels/arm/anchor_generator_compute.cc +++ b/lite/kernels/arm/anchor_generator_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/anchor_generator_compute.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/argmax_compute.cc b/lite/kernels/arm/argmax_compute.cc index 5087038ff4524de37ba8312924f041de9189a827..5cb0e48c158286d9463bead60cc87a59168da1b4 100644 --- a/lite/kernels/arm/argmax_compute.cc +++ b/lite/kernels/arm/argmax_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/argmax_compute.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/assign_compute.cc b/lite/kernels/arm/assign_compute.cc index 0ffba5f3083564e37ac72d0869ea3092a59f944f..b0a5529c368c67c30dfb8517a89bb35c5440e122 100644 --- a/lite/kernels/arm/assign_compute.cc +++ b/lite/kernels/arm/assign_compute.cc @@ -14,7 +14,7 @@ #include "lite/kernels/arm/assign_compute.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/axpy_compute.cc b/lite/kernels/arm/axpy_compute.cc index 2cd4435d6af3810ddc9c99e6bcb3cbe6fa494352..705aa6a0f5a6b801d4997eec2383eb075d4a4639 100644 --- a/lite/kernels/arm/axpy_compute.cc +++ b/lite/kernels/arm/axpy_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/axpy_compute.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/batch_norm_compute.cc b/lite/kernels/arm/batch_norm_compute.cc index 855f873eee53c29acc861de2d927869dfcfefc30..1519ad624eff5e94e26cd648e4fc05fc456d26cb 100644 --- a/lite/kernels/arm/batch_norm_compute.cc +++ b/lite/kernels/arm/batch_norm_compute.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "lite/kernels/arm/batch_norm_compute.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/beam_search_compute.cc b/lite/kernels/arm/beam_search_compute.cc index 6be5d680b4e59c90f5e4d35af559e6efcf823efd..5ac53b3b96d0ba676e2909d6102e9edded5e9a92 100644 --- a/lite/kernels/arm/beam_search_compute.cc +++ b/lite/kernels/arm/beam_search_compute.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "lite/kernels/arm/beam_search_compute.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/beam_search_compute.h b/lite/kernels/arm/beam_search_compute.h index ef150ba74ac604993fc54d8c62379672dca445e9..ebd72732bb25e826c24f20cd28588b170f344268 100644 --- a/lite/kernels/arm/beam_search_compute.h +++ b/lite/kernels/arm/beam_search_compute.h @@ -14,7 +14,7 @@ #pragma once #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" diff --git a/lite/kernels/arm/beam_search_decode_compute.cc b/lite/kernels/arm/beam_search_decode_compute.cc index d0640e2c3becd05ca9d5339eba946fea1620b06a..a417baa6d7201e2abf067648b1d90ab37ac5ee21 100644 --- a/lite/kernels/arm/beam_search_decode_compute.cc +++ b/lite/kernels/arm/beam_search_decode_compute.cc @@ -16,7 +16,7 @@ #include #include #include "lite/api/paddle_place.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/box_clip_compute.cc b/lite/kernels/arm/box_clip_compute.cc index 6973f2c6a73a896cffd8fe9ba3f45884d8218321..9591302c58e05735e2aad319a4289936b3002026 100644 --- a/lite/kernels/arm/box_clip_compute.cc +++ b/lite/kernels/arm/box_clip_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/box_clip_compute.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/box_coder_compute.cc b/lite/kernels/arm/box_coder_compute.cc index bd1a1d6f38d55d0a6822dac82859285473fa4b8a..81e79a83f2b605ffb46a047c75ddc4e18dc47e23 100644 --- a/lite/kernels/arm/box_coder_compute.cc +++ b/lite/kernels/arm/box_coder_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/box_coder_compute.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/calib_compute.cc b/lite/kernels/arm/calib_compute.cc index 3bc434329a9a034d8cbc1e587550d1f3eefa4652..525e5aefd63474cfac09900e9c411ca5e5868311 100644 --- a/lite/kernels/arm/calib_compute.cc +++ b/lite/kernels/arm/calib_compute.cc @@ -14,7 +14,7 @@ #include "lite/kernels/arm/calib_compute.h" #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/op_registry.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/calib_compute_test.cc b/lite/kernels/arm/calib_compute_test.cc index ee29424293eb237f3182a46d0eb5f41dd52a5602..27049cc2c64da80f1b68786eecdcd2437a2f577f 100644 --- a/lite/kernels/arm/calib_compute_test.cc +++ b/lite/kernels/arm/calib_compute_test.cc @@ -20,7 +20,7 @@ #include #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" namespace paddle { diff --git a/lite/kernels/arm/cast_compute.cc b/lite/kernels/arm/cast_compute.cc index e67151650abae8ba2848920d5a00a827361e048c..8b6971ec138c0adeb7691b05917f403ab7031664 100644 --- a/lite/kernels/arm/cast_compute.cc +++ b/lite/kernels/arm/cast_compute.cc @@ -14,7 +14,7 @@ #include "lite/kernels/arm/cast_compute.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/cast_compute.h b/lite/kernels/arm/cast_compute.h index fc5b82f4c9f4409bef9e713dc6ebf0cbd8785096..d342a405ad593b8457b2899fa3ee6ae843d8f792 100644 --- a/lite/kernels/arm/cast_compute.h +++ b/lite/kernels/arm/cast_compute.h @@ -14,7 +14,7 @@ #pragma once #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" diff --git a/lite/kernels/arm/compare_compute.cc b/lite/kernels/arm/compare_compute.cc index 72465b1bc45368de3f4f4e781221b376d4fbc4e9..fe4b3d6587aa72d234344ef430ef43e7fd9057fe 100644 --- a/lite/kernels/arm/compare_compute.cc +++ b/lite/kernels/arm/compare_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/compare_compute.h" #include #include "lite/api/paddle_place.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/compare_compute.h b/lite/kernels/arm/compare_compute.h index 2e85bfae77c4fc80e886ecdb15bcf1e1c7e724ad..65354022c6a5c0f1efbd179f0625f9451b327ab4 100644 --- a/lite/kernels/arm/compare_compute.h +++ b/lite/kernels/arm/compare_compute.h @@ -14,7 +14,7 @@ #pragma once #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/kernel.h" #include "lite/operators/compare_op.h" diff --git a/lite/kernels/arm/concat_compute.cc b/lite/kernels/arm/concat_compute.cc index eb1e57376103873a33537aaec37b55aa6222ace9..ccae9e0df6ea6b6ea81b57bfc491f52043230f8f 100644 --- a/lite/kernels/arm/concat_compute.cc +++ b/lite/kernels/arm/concat_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/concat_compute.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/concat_compute_test.cc b/lite/kernels/arm/concat_compute_test.cc index 0f9defb8ead3bf95b8813a49f360b18d337ba37a..a3131f68924121a44707e290ddbe29cb2b086e4b 100644 --- a/lite/kernels/arm/concat_compute_test.cc +++ b/lite/kernels/arm/concat_compute_test.cc @@ -17,7 +17,7 @@ #include #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" diff --git a/lite/kernels/arm/conv_compute.h b/lite/kernels/arm/conv_compute.h index 51a9064409fda3dde075f2d5f60aef8efdc70d4a..28b8d40677cd97c257d135c6c491e98efb948881 100644 --- a/lite/kernels/arm/conv_compute.h +++ b/lite/kernels/arm/conv_compute.h @@ -13,7 +13,7 @@ // limitations under the License. #pragma once -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/kernel.h" #include "lite/operators/conv_op.h" diff --git a/lite/kernels/arm/conv_compute_test.cc b/lite/kernels/arm/conv_compute_test.cc index 8f081788826029ea1a8c9c0cda90765181834a98..40f678164e015f82a599f4759e434eed9e69905e 100644 --- a/lite/kernels/arm/conv_compute_test.cc +++ b/lite/kernels/arm/conv_compute_test.cc @@ -18,7 +18,7 @@ #include #include #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/op_registry.h" namespace paddle { diff --git a/lite/kernels/arm/conv_transpose_compute.cc b/lite/kernels/arm/conv_transpose_compute.cc index 2e2d3906bb4bf74c5363413cb3a683e384bb45fa..fdadbabfc189814870bce96db121233eecf88c24 100644 --- a/lite/kernels/arm/conv_transpose_compute.cc +++ b/lite/kernels/arm/conv_transpose_compute.cc @@ -14,7 +14,7 @@ #include "lite/kernels/arm/conv_transpose_compute.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/conv_transpose_compute.h b/lite/kernels/arm/conv_transpose_compute.h index 899486e96694b229901567bae66e4d475680e948..8b87c7cfad9276c867d21db29c2af14e1e3ea86d 100644 --- a/lite/kernels/arm/conv_transpose_compute.h +++ b/lite/kernels/arm/conv_transpose_compute.h @@ -13,7 +13,7 @@ // limitations under the License. #pragma once -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/kernel.h" #include "lite/operators/conv_transpose_op.h" diff --git a/lite/kernels/arm/conv_transpose_compute_test.cc b/lite/kernels/arm/conv_transpose_compute_test.cc index f7817f2d06c4262c147da7dd8eb1927c4ca80281..298c651d9f86a5fc3d527cd7b973b1a24160ec42 100644 --- a/lite/kernels/arm/conv_transpose_compute_test.cc +++ b/lite/kernels/arm/conv_transpose_compute_test.cc @@ -21,7 +21,7 @@ #include #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" namespace paddle { diff --git a/lite/kernels/arm/crop_compute.cc b/lite/kernels/arm/crop_compute.cc index c404a1b24f710c4949731af9848154f05f3e688b..e99c1629956a51d0f2e728274beda427a8bf5540 100644 --- a/lite/kernels/arm/crop_compute.cc +++ b/lite/kernels/arm/crop_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/crop_compute.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/decode_bboxes_compute.cc b/lite/kernels/arm/decode_bboxes_compute.cc index 1e917305b218f072e83042dd5dc6490f369052ff..84dde340881a3c80688dbe692b365043bda2d53a 100644 --- a/lite/kernels/arm/decode_bboxes_compute.cc +++ b/lite/kernels/arm/decode_bboxes_compute.cc @@ -14,7 +14,7 @@ #include "lite/kernels/arm/decode_bboxes_compute.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/density_prior_box_compute.cc b/lite/kernels/arm/density_prior_box_compute.cc index 35616bc6e8ac1e8c142616cf633578a057bb967f..3a9fa85411464081e7b006afffe4e80d87ef90f6 100644 --- a/lite/kernels/arm/density_prior_box_compute.cc +++ b/lite/kernels/arm/density_prior_box_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/density_prior_box_compute.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/dropout_compute.cc b/lite/kernels/arm/dropout_compute.cc index 3d094dc7ae0b22a4b471f610a3135f0664790db3..3a3a1f301f52ea33b32f54830546511fe2a24ed4 100644 --- a/lite/kernels/arm/dropout_compute.cc +++ b/lite/kernels/arm/dropout_compute.cc @@ -14,7 +14,7 @@ #include "lite/kernels/arm/dropout_compute.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/elementwise_compute.cc b/lite/kernels/arm/elementwise_compute.cc index 0a3963f8f46f9fd2267d26dea4eaaed982df58a5..a0a87628fff494807c82cfb9891ce717fbfd0cab 100644 --- a/lite/kernels/arm/elementwise_compute.cc +++ b/lite/kernels/arm/elementwise_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/elementwise_compute.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/fc_compute.cc b/lite/kernels/arm/fc_compute.cc index e75fb6c025ad4a38a92259f88b7a1408b913adcf..83d40362e7bbd53737b005ccba99b89373cca215 100644 --- a/lite/kernels/arm/fc_compute.cc +++ b/lite/kernels/arm/fc_compute.cc @@ -15,9 +15,9 @@ #include "lite/kernels/arm/fc_compute.h" #include #include "lite/api/paddle_place.h" -#include "lite/arm/math/funcs.h" -#include "lite/arm/math/gemm_prepacked_int8.h" -#include "lite/arm/math/gemv_arm_int8.h" +#include "lite/backends/arm/math/funcs.h" +#include "lite/backends/arm/math/gemm_prepacked_int8.h" +#include "lite/backends/arm/math/gemv_arm_int8.h" #include "lite/core/op_registry.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/fc_compute.h b/lite/kernels/arm/fc_compute.h index 7028a8bf4cca8f5d583706c43d8bef5a30db07d8..2af3845ebbbb76c1a2ae1681787abe2852c442ab 100644 --- a/lite/kernels/arm/fc_compute.h +++ b/lite/kernels/arm/fc_compute.h @@ -14,7 +14,7 @@ #pragma once #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/kernel.h" namespace paddle { diff --git a/lite/kernels/arm/fc_compute_test.cc b/lite/kernels/arm/fc_compute_test.cc index 4359ad0076ed96b7acbf81288307bf67930c1538..acda9016673fde7227a7b0c5278e73c3c92cf8aa 100644 --- a/lite/kernels/arm/fc_compute_test.cc +++ b/lite/kernels/arm/fc_compute_test.cc @@ -20,7 +20,7 @@ #include #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" namespace paddle { diff --git a/lite/kernels/arm/generate_proposals_compute.cc b/lite/kernels/arm/generate_proposals_compute.cc index c9a5eb0b5a5f2ffad06711df16bda47a77215703..a9768f25f089e2e33ec371136dfa9aa574b43fad 100644 --- a/lite/kernels/arm/generate_proposals_compute.cc +++ b/lite/kernels/arm/generate_proposals_compute.cc @@ -16,7 +16,7 @@ #include #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/gru_compute.cc b/lite/kernels/arm/gru_compute.cc index f9e004560598f8a3bacad3d1250e3ab2f21fe05c..fde909aba4b578fe65e60e00013c7b6f363c855b 100644 --- a/lite/kernels/arm/gru_compute.cc +++ b/lite/kernels/arm/gru_compute.cc @@ -16,10 +16,10 @@ #include #include #include "lite/api/paddle_place.h" -#include "lite/arm/math/funcs.h" -#include "lite/arm/math/gru_utils.h" -#include "lite/arm/math/sequence2batch.h" -#include "lite/arm/math/sgemm.h" +#include "lite/backends/arm/math/funcs.h" +#include "lite/backends/arm/math/gru_utils.h" +#include "lite/backends/arm/math/sequence2batch.h" +#include "lite/backends/arm/math/sgemm.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/gru_unit_compute.cc b/lite/kernels/arm/gru_unit_compute.cc index 3fc24e505d75c66016e498148a6b6140e8f32796..10909e1124a490eb9e4f2e211736666267225fbd 100644 --- a/lite/kernels/arm/gru_unit_compute.cc +++ b/lite/kernels/arm/gru_unit_compute.cc @@ -14,9 +14,9 @@ #include "lite/kernels/arm/gru_unit_compute.h" #include "lite/api/paddle_place.h" -#include "lite/arm/math/funcs.h" -#include "lite/arm/math/gru_utils.h" -#include "lite/arm/math/sgemm.h" +#include "lite/backends/arm/math/funcs.h" +#include "lite/backends/arm/math/gru_utils.h" +#include "lite/backends/arm/math/sgemm.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/im2sequence_compute.cc b/lite/kernels/arm/im2sequence_compute.cc index f1feccc969bd3216917f0a88e0498bbedbaadcd4..e727b61604fce876295993bfef9d8f75ddb18307 100644 --- a/lite/kernels/arm/im2sequence_compute.cc +++ b/lite/kernels/arm/im2sequence_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/im2sequence_compute.h" #include #include "lite/api/paddle_place.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/im2sequence_compute.h b/lite/kernels/arm/im2sequence_compute.h index 35579bc05e90f82767de43068c11e90cc9b7e55f..1db0e1fb401f6f6dce96e9b4bb30fdcb0471ca35 100644 --- a/lite/kernels/arm/im2sequence_compute.h +++ b/lite/kernels/arm/im2sequence_compute.h @@ -14,7 +14,7 @@ #pragma once #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/kernel.h" #include "lite/operators/im2sequence_op.h" diff --git a/lite/kernels/arm/increment_compute.cc b/lite/kernels/arm/increment_compute.cc index a2a78c4581804df9c92882239c9d544f6a4429ae..fd548f91f9537cd2b168558f04c27d7f83c1ea28 100644 --- a/lite/kernels/arm/increment_compute.cc +++ b/lite/kernels/arm/increment_compute.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "lite/kernels/arm/increment_compute.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/increment_compute.h b/lite/kernels/arm/increment_compute.h index eea3b7b0478881da92a494501ca9c13f5220ba17..d26ddd417760e50605f0caca04e85aa20caa240e 100644 --- a/lite/kernels/arm/increment_compute.h +++ b/lite/kernels/arm/increment_compute.h @@ -14,7 +14,7 @@ #pragma once #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" diff --git a/lite/kernels/arm/interpolate_compute.cc b/lite/kernels/arm/interpolate_compute.cc index 27a956b0c73a08c64e74fa9ee98a4c733ee9a9f2..a26777826db6976c755fac7798880871f407c12d 100644 --- a/lite/kernels/arm/interpolate_compute.cc +++ b/lite/kernels/arm/interpolate_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/interpolate_compute.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" diff --git a/lite/kernels/arm/is_empty_compute.cc b/lite/kernels/arm/is_empty_compute.cc index 3b4732cfe34470ad426f19555080bbf33da8fa23..fac4e34bc2de76d8d77724223d765168fdfc24e6 100644 --- a/lite/kernels/arm/is_empty_compute.cc +++ b/lite/kernels/arm/is_empty_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/is_empty_compute.h" #include #include "lite/api/paddle_place.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/is_empty_compute.h b/lite/kernels/arm/is_empty_compute.h index 82afc70ab280ea2b25c1736ba439948a08798868..072c8feac3613ef2f92c017d2125e934ca758be8 100644 --- a/lite/kernels/arm/is_empty_compute.h +++ b/lite/kernels/arm/is_empty_compute.h @@ -14,7 +14,7 @@ #pragma once #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/kernel.h" #include "lite/operators/logical_op.h" diff --git a/lite/kernels/arm/lod_reset_compute.cc b/lite/kernels/arm/lod_reset_compute.cc index 5a6a05ca9fb48d9955d472132a195e306b8c4f23..cb995d265e5eb423868836e932c44f05310b1eea 100644 --- a/lite/kernels/arm/lod_reset_compute.cc +++ b/lite/kernels/arm/lod_reset_compute.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "lite/kernels/arm/lod_reset_compute.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/lod_reset_compute.h b/lite/kernels/arm/lod_reset_compute.h index 7ad82de9fc3b026dbc8741ee49d3daad10a2d655..7ecb271967139dfdc1a52fd769c329a6a5ad1eba 100644 --- a/lite/kernels/arm/lod_reset_compute.h +++ b/lite/kernels/arm/lod_reset_compute.h @@ -14,7 +14,7 @@ #pragma once #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" diff --git a/lite/kernels/arm/logical_compute.cc b/lite/kernels/arm/logical_compute.cc index 654897849c677189a79f4d8cae2e026e6916cafb..c1cef5c2ced4fca239bf000fc1617509d73f01f5 100644 --- a/lite/kernels/arm/logical_compute.cc +++ b/lite/kernels/arm/logical_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/logical_compute.h" #include #include "lite/api/paddle_place.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/logical_compute.h b/lite/kernels/arm/logical_compute.h index 4348061ca2da81c43c3466bcce43127df6d2acf7..fe7ef1e92d5c5ccf73cca9751aad3f0a248ab8c9 100644 --- a/lite/kernels/arm/logical_compute.h +++ b/lite/kernels/arm/logical_compute.h @@ -14,7 +14,7 @@ #pragma once #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/kernel.h" #include "lite/operators/logical_op.h" diff --git a/lite/kernels/arm/lookup_table_compute.cc b/lite/kernels/arm/lookup_table_compute.cc index bb8ea6349e4e3e297bdbfbd62b107387c2814719..d39d7ccb60d0e69ecc2a8f3278bdf032b2d8fb16 100644 --- a/lite/kernels/arm/lookup_table_compute.cc +++ b/lite/kernels/arm/lookup_table_compute.cc @@ -16,7 +16,7 @@ #include #include #include "lite/api/paddle_place.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/lrn_compute.cc b/lite/kernels/arm/lrn_compute.cc index 4a8f2e04f7352b8418b4e26359686f43ea86dbc1..18e6654282c8810a8310e540c2851fecb116f2d8 100644 --- a/lite/kernels/arm/lrn_compute.cc +++ b/lite/kernels/arm/lrn_compute.cc @@ -14,7 +14,7 @@ #include "lite/kernels/arm/lrn_compute.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/matmul_compute.cc b/lite/kernels/arm/matmul_compute.cc index d6928652eee456b1345eb7882267a40540aa88a9..29be34d0c273abe9fafb7d187cc6d443eefc2d55 100644 --- a/lite/kernels/arm/matmul_compute.cc +++ b/lite/kernels/arm/matmul_compute.cc @@ -14,7 +14,7 @@ #include "lite/kernels/arm/matmul_compute.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/mul_compute.cc b/lite/kernels/arm/mul_compute.cc index adf80db312b7c100588b976cfd270a3f3508485d..d0ae2d0df165070e39b5193a61bfedfae69ec6c8 100644 --- a/lite/kernels/arm/mul_compute.cc +++ b/lite/kernels/arm/mul_compute.cc @@ -14,7 +14,7 @@ #include "lite/kernels/arm/mul_compute.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/mul_compute_test.cc b/lite/kernels/arm/mul_compute_test.cc index eb3fa6978ce99c4a1772fa00d9671291c1243e24..cddee81fe22897dbe91721ed172b144539e0852c 100644 --- a/lite/kernels/arm/mul_compute_test.cc +++ b/lite/kernels/arm/mul_compute_test.cc @@ -20,7 +20,7 @@ #include #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" namespace paddle { diff --git a/lite/kernels/arm/negative_compute.cc b/lite/kernels/arm/negative_compute.cc index 83dcdb99b97f132f1d73b5187d9562922bfc47d4..b5f59d842e7617e2701e87e9758bbdfd826a0334 100644 --- a/lite/kernels/arm/negative_compute.cc +++ b/lite/kernels/arm/negative_compute.cc @@ -14,7 +14,7 @@ #include "lite/kernels/arm/negative_compute.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/norm_compute.cc b/lite/kernels/arm/norm_compute.cc index a38567a64239e9dd62673a691566c8bff96cecec..3cc1645fc6823c4c3276cd1f22f4be8a584d2073 100644 --- a/lite/kernels/arm/norm_compute.cc +++ b/lite/kernels/arm/norm_compute.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "lite/kernels/arm/norm_compute.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/norm_compute.h b/lite/kernels/arm/norm_compute.h index bfc6e91a24d380e35a7b5eb4859652254674f729..c9783d999b22841ab1fb009c373cfedfedde0f5f 100644 --- a/lite/kernels/arm/norm_compute.h +++ b/lite/kernels/arm/norm_compute.h @@ -14,7 +14,7 @@ #pragma once #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" diff --git a/lite/kernels/arm/pad2d_compute.cc b/lite/kernels/arm/pad2d_compute.cc index 5fe7a63b86a6855d45923517efaf82f55220a6a0..2c3952018f9bfd78e75e528c1b6ecfc7427d35d8 100644 --- a/lite/kernels/arm/pad2d_compute.cc +++ b/lite/kernels/arm/pad2d_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/pad2d_compute.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/pool_compute.cc b/lite/kernels/arm/pool_compute.cc index e86859c5819a1545c4220162cf3754de2fbefb38..d95d658cf92599d0ce5a0d72a7003ff06e1de63a 100644 --- a/lite/kernels/arm/pool_compute.cc +++ b/lite/kernels/arm/pool_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/pool_compute.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/pool_compute_test.cc b/lite/kernels/arm/pool_compute_test.cc index cd49ac360345e66558c1b2ee497310b5e6e84e3d..e04129cf0b6b659d3a8b95e82924135b7247d30e 100644 --- a/lite/kernels/arm/pool_compute_test.cc +++ b/lite/kernels/arm/pool_compute_test.cc @@ -17,7 +17,7 @@ #include #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" namespace paddle { diff --git a/lite/kernels/arm/power_compute.cc b/lite/kernels/arm/power_compute.cc index fb9d61355441c974396bacf52059276862eed890..2b946dccc0bc578b6394731d55e94d045ab8b3f7 100644 --- a/lite/kernels/arm/power_compute.cc +++ b/lite/kernels/arm/power_compute.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "lite/kernels/arm/power_compute.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/prior_box_compute.cc b/lite/kernels/arm/prior_box_compute.cc index 209259337436f06923c0c10604ac25dbf22bc2bd..203f483351a27650b8ccb27c930dcdc5d2a5ceb9 100644 --- a/lite/kernels/arm/prior_box_compute.cc +++ b/lite/kernels/arm/prior_box_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/prior_box_compute.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/read_from_array_compute.cc b/lite/kernels/arm/read_from_array_compute.cc index 5a61a239553b47dfb058596f7ffe99e5051cddf0..945ada8c65abf53bd590247bdfca2ccc23eb1304 100644 --- a/lite/kernels/arm/read_from_array_compute.cc +++ b/lite/kernels/arm/read_from_array_compute.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "lite/kernels/arm/read_from_array_compute.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/read_from_array_compute.h b/lite/kernels/arm/read_from_array_compute.h index aa993ba78e10e54a9ae5f86fc6270111e6503171..c8ba6d6d258f87c4d91e701bb6490258b71d3ecd 100644 --- a/lite/kernels/arm/read_from_array_compute.h +++ b/lite/kernels/arm/read_from_array_compute.h @@ -14,7 +14,7 @@ #pragma once #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" diff --git a/lite/kernels/arm/reduce_max_compute.cc b/lite/kernels/arm/reduce_max_compute.cc index b82b2aa116267fb654073cde1cc5d06eabcc4145..7a4a4313e0595243cb8eaada75cc80469b9759ec 100644 --- a/lite/kernels/arm/reduce_max_compute.cc +++ b/lite/kernels/arm/reduce_max_compute.cc @@ -14,7 +14,7 @@ #include "lite/kernels/arm/reduce_max_compute.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/reduce_max_compute.h b/lite/kernels/arm/reduce_max_compute.h index c4febdba435241e2feaa8654dc192a69b9bc7dda..f2228284aeea8dd08e1d457055023da1845c1672 100644 --- a/lite/kernels/arm/reduce_max_compute.h +++ b/lite/kernels/arm/reduce_max_compute.h @@ -14,7 +14,7 @@ #pragma once #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" diff --git a/lite/kernels/arm/reduce_mean_compute.cc b/lite/kernels/arm/reduce_mean_compute.cc index 989550b8da5aca30141a74c5a3544243f1fcd6d4..418134a05f1d75fb55e5487e3194e0f4383d2dd8 100644 --- a/lite/kernels/arm/reduce_mean_compute.cc +++ b/lite/kernels/arm/reduce_mean_compute.cc @@ -14,7 +14,7 @@ #include "lite/kernels/arm/reduce_mean_compute.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/reduce_mean_compute.h b/lite/kernels/arm/reduce_mean_compute.h index 5f4bbd46d54ee9a1f77a52f22e60be0409648ffb..f38851202171cd707cd0a89696fa63b24cfdef24 100644 --- a/lite/kernels/arm/reduce_mean_compute.h +++ b/lite/kernels/arm/reduce_mean_compute.h @@ -14,7 +14,7 @@ #pragma once #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" diff --git a/lite/kernels/arm/roi_align_compute.cc b/lite/kernels/arm/roi_align_compute.cc index a3efa9b4b8c9fb869648dae87b9932fe39975819..9ac6b1abac26ffbdd5671cf8986d2b8f2b2b2dfa 100644 --- a/lite/kernels/arm/roi_align_compute.cc +++ b/lite/kernels/arm/roi_align_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/roi_align_compute.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/scale_compute.cc b/lite/kernels/arm/scale_compute.cc index 07287111a13abd7e50fcc814ae034e4cccb98f55..2a46d2212e4f69630e012ae4a497f68db7a01985 100644 --- a/lite/kernels/arm/scale_compute.cc +++ b/lite/kernels/arm/scale_compute.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "lite/kernels/arm/scale_compute.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/sequence_expand_compute.cc b/lite/kernels/arm/sequence_expand_compute.cc index 6723a1684f7144a33b1bc2c3ada51c0ef98c240c..524461e193605f80a7b428ca4d0058a832213cdd 100644 --- a/lite/kernels/arm/sequence_expand_compute.cc +++ b/lite/kernels/arm/sequence_expand_compute.cc @@ -14,7 +14,7 @@ #include "lite/kernels/arm/sequence_expand_compute.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/sequence_pool_compute.cc b/lite/kernels/arm/sequence_pool_compute.cc index 7be2fb737b7e78abc333ce293e60267083551517..8fcbb8cffe72935e4df503c3c1748ddb68247fb7 100644 --- a/lite/kernels/arm/sequence_pool_compute.cc +++ b/lite/kernels/arm/sequence_pool_compute.cc @@ -15,7 +15,7 @@ limitations under the License. */ #include "lite/kernels/arm/sequence_pool_compute.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/sequence_pool_compute.h b/lite/kernels/arm/sequence_pool_compute.h index d7f96c111905838be582e54329e1a13e01f00eca..67265eb8ea9fb879f54b0eb0e412f0d48b2fc817 100644 --- a/lite/kernels/arm/sequence_pool_compute.h +++ b/lite/kernels/arm/sequence_pool_compute.h @@ -14,7 +14,7 @@ #pragma once #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" diff --git a/lite/kernels/arm/sequence_softmax_compute.cc b/lite/kernels/arm/sequence_softmax_compute.cc index 2cd3f4b404be0d71a80b2ff85e84014fda0d0568..093e8a61d8ea2b325e8a859ef8d2c9a7ae402eae 100644 --- a/lite/kernels/arm/sequence_softmax_compute.cc +++ b/lite/kernels/arm/sequence_softmax_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/sequence_softmax_compute.h" #include #include "lite/api/paddle_place.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/sequence_softmax_compute.h b/lite/kernels/arm/sequence_softmax_compute.h index e5fbdb0c78c40d96519bb4fa5c1200ba55f6ea39..03c6c58479c99f1647bb7228a4b3f4f6357340de 100644 --- a/lite/kernels/arm/sequence_softmax_compute.h +++ b/lite/kernels/arm/sequence_softmax_compute.h @@ -14,7 +14,7 @@ #pragma once #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/kernel.h" #include "lite/operators/sequence_softmax_op.h" diff --git a/lite/kernels/arm/shape_compute.cc b/lite/kernels/arm/shape_compute.cc index f653add69291e57329514cb2caa38a3cb78337bd..f382004d7af3c45bb6c2b6ce952738e21c048238 100644 --- a/lite/kernels/arm/shape_compute.cc +++ b/lite/kernels/arm/shape_compute.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "lite/kernels/arm/shape_compute.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/shuffle_channel_compute.cc b/lite/kernels/arm/shuffle_channel_compute.cc index 66a1a0b7db223ea842989e212a948b32a7f9d145..06750bcd5a1a6e11e75d4f0936de0ffeea77594a 100644 --- a/lite/kernels/arm/shuffle_channel_compute.cc +++ b/lite/kernels/arm/shuffle_channel_compute.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "lite/kernels/arm/shuffle_channel_compute.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/slice_compute.cc b/lite/kernels/arm/slice_compute.cc index 861363ba4d3d9c3e8b8ce0c7be494e4a815825ad..c71ed3292f0a69b930590060086633d48035ccea 100644 --- a/lite/kernels/arm/slice_compute.cc +++ b/lite/kernels/arm/slice_compute.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "lite/kernels/arm/slice_compute.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/slice_compute.h b/lite/kernels/arm/slice_compute.h index dc7197f2be2cd222bb9e4d4a6dccb3a4d3e4132d..701dacfbb4d011814805f4111eee89dcadfefe80 100644 --- a/lite/kernels/arm/slice_compute.h +++ b/lite/kernels/arm/slice_compute.h @@ -14,7 +14,7 @@ #pragma once #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" diff --git a/lite/kernels/arm/softmax_compute.cc b/lite/kernels/arm/softmax_compute.cc index 6aec5eccfee4fbb782fee1794da0cc7cefe766a8..3409d0f5c5bd6e7ce1ea77809f7715b62bb10ca2 100644 --- a/lite/kernels/arm/softmax_compute.cc +++ b/lite/kernels/arm/softmax_compute.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "lite/kernels/arm/softmax_compute.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/split_compute.cc b/lite/kernels/arm/split_compute.cc index 35641524e3247ac32446f0d76e62f14a9c48d94e..27606e2d76dfd13161fffc3f53d614155f62254e 100644 --- a/lite/kernels/arm/split_compute.cc +++ b/lite/kernels/arm/split_compute.cc @@ -14,7 +14,7 @@ #include "lite/kernels/arm/split_compute.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/stack_compute.cc b/lite/kernels/arm/stack_compute.cc index 12d04b2d60703b6f959d4a0a3d62cb56d571961f..0e98c5328e660195bfcc27a3f4154be121a99101 100644 --- a/lite/kernels/arm/stack_compute.cc +++ b/lite/kernels/arm/stack_compute.cc @@ -14,7 +14,7 @@ #include "lite/kernels/arm/stack_compute.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/topk_compute.cc b/lite/kernels/arm/topk_compute.cc index 2d1119cc8c95e9a330f8b910026d1210e647d2f0..994ef3f8dd00c0bf0c9c5f64025b23195462ce5f 100644 --- a/lite/kernels/arm/topk_compute.cc +++ b/lite/kernels/arm/topk_compute.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "lite/kernels/arm/topk_compute.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/transpose_compute.cc b/lite/kernels/arm/transpose_compute.cc index ccf38b1d1f9e5d570ebe723914361abe1a52821b..8d1964de530ec3955b149fcd71286f8dfadcd1f9 100644 --- a/lite/kernels/arm/transpose_compute.cc +++ b/lite/kernels/arm/transpose_compute.cc @@ -15,7 +15,7 @@ #include "lite/kernels/arm/transpose_compute.h" #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/transpose_compute_test.cc b/lite/kernels/arm/transpose_compute_test.cc index 83abb52655fdfc803a00116ed416383af5d57b0c..aaf3f138a54db2c7ff766325cfd61bc51ec8b1d2 100644 --- a/lite/kernels/arm/transpose_compute_test.cc +++ b/lite/kernels/arm/transpose_compute_test.cc @@ -17,7 +17,7 @@ #include #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" diff --git a/lite/kernels/arm/while_compute.cc b/lite/kernels/arm/while_compute.cc index 380466bc06820f7a6edf3c4caf14df1d08bf8c0f..ab3da93acc4d6a29f1a7b41c7dc43e4c05f59b88 100644 --- a/lite/kernels/arm/while_compute.cc +++ b/lite/kernels/arm/while_compute.cc @@ -16,7 +16,7 @@ #include #include #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/tensor.h" #include "lite/core/type_system.h" diff --git a/lite/kernels/arm/write_to_array_compute.cc b/lite/kernels/arm/write_to_array_compute.cc index 0a9edd11357ef1b09693e18344f6168b260fadab..42498e77f2c1ed8c1caf7f8640dfcbef5f004c08 100644 --- a/lite/kernels/arm/write_to_array_compute.cc +++ b/lite/kernels/arm/write_to_array_compute.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "lite/kernels/arm/write_to_array_compute.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/arm/write_to_array_compute.h b/lite/kernels/arm/write_to_array_compute.h index 2aa6e8daf2c426b042d10f587f65f3bb98124839..c7b7c64c341fb16188aea1a166a93ffe7a78ecb7 100644 --- a/lite/kernels/arm/write_to_array_compute.h +++ b/lite/kernels/arm/write_to_array_compute.h @@ -14,7 +14,7 @@ #pragma once #include -#include "lite/arm/math/type_trans.h" +#include "lite/backends/arm/math/type_trans.h" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" diff --git a/lite/kernels/arm/yolo_box_compute.cc b/lite/kernels/arm/yolo_box_compute.cc index 1bd87996f19d53132fabccc7a0b79beb83f442ef..1336e5e1e0a6438a08f542d299eddc30d15dad15 100644 --- a/lite/kernels/arm/yolo_box_compute.cc +++ b/lite/kernels/arm/yolo_box_compute.cc @@ -14,7 +14,7 @@ #include "lite/kernels/arm/yolo_box_compute.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #include "lite/core/tensor.h" namespace paddle { diff --git a/lite/kernels/cuda/io_copy_compute.cc b/lite/kernels/cuda/io_copy_compute.cc index 9407764c9fa41ec217212ef99f930f8de6bc9b27..011b7c802ac77ae5365c50f5025846e90779934b 100644 --- a/lite/kernels/cuda/io_copy_compute.cc +++ b/lite/kernels/cuda/io_copy_compute.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "lite/backends/cuda/target_wrapper.h" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" -#include "lite/cuda/target_wrapper.h" namespace paddle { namespace lite { diff --git a/lite/kernels/cuda/mul_compute.h b/lite/kernels/cuda/mul_compute.h index b28b14e6c91875edbfb36b54dd0a6e96119e7460..4a542104d6743b52758cbecfb11c025628e46333 100644 --- a/lite/kernels/cuda/mul_compute.h +++ b/lite/kernels/cuda/mul_compute.h @@ -13,10 +13,10 @@ // limitations under the License. #pragma once +#include "lite/backends/cuda/blas.h" #include "lite/core/context.h" #include "lite/core/kernel.h" #include "lite/core/types.h" -#include "lite/cuda/blas.h" #include "lite/operators/op_params.h" namespace paddle { diff --git a/lite/kernels/fpga/activation_compute.cc b/lite/kernels/fpga/activation_compute.cc index ac13e2daf6e492cf1741077bd428a425435e693c..ecd9af0f8da5df62a15637e88dc4564efb187f6c 100644 --- a/lite/kernels/fpga/activation_compute.cc +++ b/lite/kernels/fpga/activation_compute.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "lite/kernels/fpga/activation_compute.h" -#include "lite/fpga/KD/float16.hpp" +#include "lite/backends/fpga/KD/float16.hpp" namespace paddle { namespace lite { diff --git a/lite/kernels/fpga/activation_compute.h b/lite/kernels/fpga/activation_compute.h index f3b40f57c345afd9d2fdd49d96182125684ed7ae..796d54413f0fd7d434bc660c62b536b1a1eedd4b 100644 --- a/lite/kernels/fpga/activation_compute.h +++ b/lite/kernels/fpga/activation_compute.h @@ -14,10 +14,10 @@ #pragma once #include +#include "lite/backends/fpga/KD/float16.hpp" +#include "lite/backends/fpga/KD/pes/relu_pe.hpp" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" -#include "lite/fpga/KD/float16.hpp" -#include "lite/fpga/KD/pes/relu_pe.hpp" namespace paddle { namespace lite { diff --git a/lite/kernels/fpga/calib_compute.cc b/lite/kernels/fpga/calib_compute.cc index 7e70b279f07cfdda694c8b81816ac023f3c991a7..51902cb08ad15fa20e3b1853c44564982adc327f 100644 --- a/lite/kernels/fpga/calib_compute.cc +++ b/lite/kernels/fpga/calib_compute.cc @@ -14,9 +14,9 @@ #include "lite/kernels/fpga/calib_compute.h" #include +#include "lite/backends/fpga/KD/float16.hpp" #include "lite/core/op_registry.h" #include "lite/core/type_system.h" -#include "lite/fpga/KD/float16.hpp" namespace paddle { namespace lite { diff --git a/lite/kernels/fpga/conv_compute.h b/lite/kernels/fpga/conv_compute.h index 8e73772446282ba4deeef122f4d5890bc4afccd4..42909c0fa049772d0b837a3ec690397d58e19cb4 100644 --- a/lite/kernels/fpga/conv_compute.h +++ b/lite/kernels/fpga/conv_compute.h @@ -14,9 +14,9 @@ #pragma once +#include "lite/backends/fpga/KD/float16.hpp" +#include "lite/backends/fpga/KD/pes/conv_pe.hpp" #include "lite/core/kernel.h" -#include "lite/fpga/KD/float16.hpp" -#include "lite/fpga/KD/pes/conv_pe.hpp" #include "lite/operators/conv_op.h" namespace paddle { diff --git a/lite/kernels/fpga/conv_compute_test.cc b/lite/kernels/fpga/conv_compute_test.cc index 3f4ba611d2e82a4ce5f522bedc8d380d77d40281..f166974cc9f2fd856defd753e1e9131858d41252 100644 --- a/lite/kernels/fpga/conv_compute_test.cc +++ b/lite/kernels/fpga/conv_compute_test.cc @@ -18,8 +18,8 @@ #include #include #include +#include "lite/backends/fpga/KD/float16.hpp" #include "lite/core/op_registry.h" -#include "lite/fpga/KD/float16.hpp" namespace paddle { namespace lite { diff --git a/lite/kernels/fpga/elementwise_compute.cc b/lite/kernels/fpga/elementwise_compute.cc index 9a9dd7d6df345753b7b27537c133940e2201a069..2a12650ef11ca996e8cff96c4d8e54d42e2020f4 100644 --- a/lite/kernels/fpga/elementwise_compute.cc +++ b/lite/kernels/fpga/elementwise_compute.cc @@ -14,7 +14,7 @@ #include "lite/kernels/fpga/elementwise_compute.h" #include -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/fpga/elementwise_compute.h b/lite/kernels/fpga/elementwise_compute.h index 36900f51a42ac8e3927339500cf9c503644b3b88..ef60b82f04adae3cb77b09ef19f747d9e19c4bee 100644 --- a/lite/kernels/fpga/elementwise_compute.h +++ b/lite/kernels/fpga/elementwise_compute.h @@ -14,10 +14,10 @@ #pragma once #include +#include "lite/backends/fpga/KD/float16.hpp" +#include "lite/backends/fpga/KD/pes/elementwise_add_pe.hpp" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" -#include "lite/fpga/KD/float16.hpp" -#include "lite/fpga/KD/pes/elementwise_add_pe.hpp" namespace paddle { namespace lite { diff --git a/lite/kernels/fpga/elementwise_compute_test.cc b/lite/kernels/fpga/elementwise_compute_test.cc index 681ca27e20b7c99a70be930e6c22ef666a9fce16..add60f64602105d317c3657985c0011aff246608 100644 --- a/lite/kernels/fpga/elementwise_compute_test.cc +++ b/lite/kernels/fpga/elementwise_compute_test.cc @@ -16,8 +16,8 @@ #include #include #include +#include "lite/backends/fpga/KD/float16.hpp" #include "lite/core/op_registry.h" -#include "lite/fpga/KD/float16.hpp" namespace paddle { namespace lite { namespace kernels { diff --git a/lite/kernels/fpga/fc_compute.h b/lite/kernels/fpga/fc_compute.h index 207ab4267aa138bb97e95ef870f96ad936204ee5..f20419f02b91d02d8d7c6ec7a573a4ead23b3ba7 100644 --- a/lite/kernels/fpga/fc_compute.h +++ b/lite/kernels/fpga/fc_compute.h @@ -14,9 +14,9 @@ #pragma once +#include "lite/backends/fpga/KD/float16.hpp" +#include "lite/backends/fpga/KD/pes/fully_connected_pe.hpp" #include "lite/core/kernel.h" -#include "lite/fpga/KD/float16.hpp" -#include "lite/fpga/KD/pes/fully_connected_pe.hpp" #include "lite/operators/fc_op.h" namespace paddle { diff --git a/lite/kernels/fpga/feed_compute.h b/lite/kernels/fpga/feed_compute.h index 17f2c5109418fa73ad8cd6dd845534e76fac70f4..a15ba5636f1d767129ff42f79379670c840a1aa2 100644 --- a/lite/kernels/fpga/feed_compute.h +++ b/lite/kernels/fpga/feed_compute.h @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. #pragma once +#include "lite/backends/fpga/KD/pes/input_pe.hpp" #include "lite/core/op_registry.h" #include "lite/core/type_system.h" -#include "lite/fpga/KD/pes/input_pe.hpp" namespace paddle { namespace lite { diff --git a/lite/kernels/fpga/fetch_compute.h b/lite/kernels/fpga/fetch_compute.h index 60542dfb8a44c6f1601c0f917218e346a08be7f4..d86fa905c422dc759b23b3b8603e3b4436c5bdf4 100644 --- a/lite/kernels/fpga/fetch_compute.h +++ b/lite/kernels/fpga/fetch_compute.h @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. #pragma once +#include "lite/backends/fpga/KD/pes/output_pe.hpp" #include "lite/core/op_registry.h" #include "lite/core/type_system.h" -#include "lite/fpga/KD/pes/output_pe.hpp" namespace paddle { namespace lite { diff --git a/lite/kernels/fpga/layout_compute.cc b/lite/kernels/fpga/layout_compute.cc index 59c90d56be97368c35cb4c38e3feae5c2841fe71..823637e3f3c92dd39b6110f1ed2028e2d06a1d31 100644 --- a/lite/kernels/fpga/layout_compute.cc +++ b/lite/kernels/fpga/layout_compute.cc @@ -13,11 +13,11 @@ // limitations under the License. #include "lite/api/paddle_place.h" +#include "lite/backends/fpga/KD/float16.hpp" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" #include "lite/core/target_wrapper.h" #include "lite/core/type_system.h" -#include "lite/fpga/KD/float16.hpp" namespace paddle { namespace lite { diff --git a/lite/kernels/fpga/pooling_compute.h b/lite/kernels/fpga/pooling_compute.h index 17191cd6106d992425e4b18606bc19c73814ddca..18eee5f21dbcc3f8db9ecaa771a2146990ca4351 100644 --- a/lite/kernels/fpga/pooling_compute.h +++ b/lite/kernels/fpga/pooling_compute.h @@ -14,9 +14,9 @@ #pragma once #include +#include "lite/backends/fpga/KD/float16.hpp" +#include "lite/backends/fpga/KD/pes/pooling_pe.hpp" #include "lite/core/kernel.h" -#include "lite/fpga/KD/float16.hpp" -#include "lite/fpga/KD/pes/pooling_pe.hpp" #include "lite/operators/pool_op.h" namespace paddle { diff --git a/lite/kernels/fpga/pooling_compute_test.cc b/lite/kernels/fpga/pooling_compute_test.cc index 526daec4032942d71fde8d503e2ef7cc6208734d..2309bf8fe4aa1c083e1662556ac49bf4357ab07a 100644 --- a/lite/kernels/fpga/pooling_compute_test.cc +++ b/lite/kernels/fpga/pooling_compute_test.cc @@ -19,7 +19,7 @@ #include #include "lite/core/op_registry.h" -#include "lite/fpga/KD/float16.hpp" +#include "lite/backends/fpga/KD/float16.hpp" namespace paddle { namespace lite { diff --git a/lite/kernels/fpga/softmax_compute.cc b/lite/kernels/fpga/softmax_compute.cc index c7cf64dea030a92f79aacd1485bdf4ed94b7c7b2..260f03c114da00b6336245b185e6c3e58ce468d4 100644 --- a/lite/kernels/fpga/softmax_compute.cc +++ b/lite/kernels/fpga/softmax_compute.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "lite/kernels/fpga/softmax_compute.h" -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" namespace paddle { namespace lite { diff --git a/lite/kernels/fpga/softmax_compute.h b/lite/kernels/fpga/softmax_compute.h index 9d823f00cab5427ad8568acae4aeecf25a3880d8..5eb4af6223ed9166b72d47cf7e6c052c2a547e53 100644 --- a/lite/kernels/fpga/softmax_compute.h +++ b/lite/kernels/fpga/softmax_compute.h @@ -14,10 +14,10 @@ #pragma once #include +#include "lite/backends/fpga/KD/float16.hpp" +#include "lite/backends/fpga/KD/pes/softmax_pe.hpp" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" -#include "lite/fpga/KD/float16.hpp" -#include "lite/fpga/KD/pes/softmax_pe.hpp" namespace paddle { namespace lite { diff --git a/lite/kernels/fpga/softmax_compute_test.cc b/lite/kernels/fpga/softmax_compute_test.cc index f5354d29289dee7f870aad69593c2a90a8aa5d19..f92139d0f49b3d149531f11cb422e44ded6e7e64 100644 --- a/lite/kernels/fpga/softmax_compute_test.cc +++ b/lite/kernels/fpga/softmax_compute_test.cc @@ -16,8 +16,8 @@ #include #include #include +#include "lite/backends/fpga/KD/float16.hpp" #include "lite/core/op_registry.h" -#include "lite/fpga/KD/float16.hpp" namespace paddle { namespace lite { diff --git a/lite/kernels/opencl/CMakeLists.txt b/lite/kernels/opencl/CMakeLists.txt index dc1ff6b97fad6e946452efe47a869998250c6ea2..65145c40b818a3ad0e43b30ab7758bce2dc18a65 100644 --- a/lite/kernels/opencl/CMakeLists.txt +++ b/lite/kernels/opencl/CMakeLists.txt @@ -18,32 +18,32 @@ add_kernel(conv_opencl OPENCL basic SRCS conv_compute.cc DEPS ${cl_kernel_deps}) lite_cc_test(test_elementwise_add_opencl SRCS elementwise_add_compute_test.cc DEPS elementwise_add_opencl fusion_elementwise_add_activation_opencl op_registry program context - ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/opencl) + ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/backends/opencl) lite_cc_test(test_pool_opencl SRCS pool_compute_test.cc DEPS pool_opencl op_registry program context - ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/opencl) + ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/backends/opencl) lite_cc_test(test_fc_opencl SRCS fc_compute_test.cc DEPS fc_opencl op_registry program context - ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/opencl) + ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/backends/opencl) lite_cc_test(test_mul_opencl SRCS mul_compute_test.cc DEPS mul_opencl op_registry program context - ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/opencl) + ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/backends/opencl) lite_cc_test(test_io_copy_compute_opencl SRCS io_copy_compute_test.cc DEPS io_copy_compute_opencl op_registry program context - ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/opencl) + ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/backends/opencl) lite_cc_test(test_relu_opencl SRCS relu_compute_test.cc DEPS relu_opencl op_registry program context - ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/opencl) + ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/backends/opencl) lite_cc_test(test_depthwise_conv2d_opencl SRCS depthwise_conv2d_compute_test.cc DEPS depthwise_conv2d_opencl op_registry program context - ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/opencl) + ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/backends/opencl) lite_cc_test(test_conv_opencl SRCS conv_compute_test.cc DEPS conv_opencl op_registry program context - ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/opencl) + ARGS --cl_path=${CMAKE_SOURCE_DIR}/lite/backends/opencl) diff --git a/lite/kernels/opencl/conv_compute.cc b/lite/kernels/opencl/conv_compute.cc index 0703566cc539f0f6dee99250da5617185602ef3e..04a78face2b9c07c42aceb53f0f797ded46e59d9 100644 --- a/lite/kernels/opencl/conv_compute.cc +++ b/lite/kernels/opencl/conv_compute.cc @@ -14,8 +14,8 @@ #include "lite/kernels/opencl/conv_compute.h" #include +#include "lite/backends/opencl/cl_include.h" #include "lite/core/op_registry.h" -#include "lite/opencl/cl_include.h" #include "lite/operators/op_params.h" namespace paddle { diff --git a/lite/kernels/opencl/conv_compute.h b/lite/kernels/opencl/conv_compute.h index 1a50f8b0ac11bfbdfdf973afb158256878d18e24..37c8893bb8420d782bf546dec250eba40dbe3c6d 100644 --- a/lite/kernels/opencl/conv_compute.h +++ b/lite/kernels/opencl/conv_compute.h @@ -17,9 +17,9 @@ #include #include #include +#include "lite/backends/opencl/cl_include.h" #include "lite/core/kernel.h" #include "lite/core/tensor.h" -#include "lite/opencl/cl_include.h" #include "lite/operators/op_params.h" namespace paddle { diff --git a/lite/kernels/opencl/conv_compute_test.cc b/lite/kernels/opencl/conv_compute_test.cc index 841271256085e9a5f8a4f1a13d440e82262cdaf0..a7417e3525605e208c8e25cd5d34200e6652053d 100644 --- a/lite/kernels/opencl/conv_compute_test.cc +++ b/lite/kernels/opencl/conv_compute_test.cc @@ -14,9 +14,9 @@ #include #include +#include "lite/backends/opencl/target_wrapper.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" -#include "lite/opencl/target_wrapper.h" namespace paddle { namespace lite { diff --git a/lite/kernels/opencl/depthwise_conv2d_compute.cc b/lite/kernels/opencl/depthwise_conv2d_compute.cc index 3abe8b3e23778da7f4c2a26ae7446b61b5ecee6b..62734610e280c89f9df2e367fd7251c7d25756e7 100644 --- a/lite/kernels/opencl/depthwise_conv2d_compute.cc +++ b/lite/kernels/opencl/depthwise_conv2d_compute.cc @@ -13,9 +13,9 @@ // limitations under the License. #include +#include "lite/backends/opencl/cl_include.h" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" -#include "lite/opencl/cl_include.h" #include "lite/operators/op_params.h" #include "lite/utils/replace_stl/stream.h" diff --git a/lite/kernels/opencl/depthwise_conv2d_compute_test.cc b/lite/kernels/opencl/depthwise_conv2d_compute_test.cc index 487c88f399a7b2f38ce4805bf70078a27dff69a3..a189acaf919e605b4810770e7136d00baeea4bfa 100644 --- a/lite/kernels/opencl/depthwise_conv2d_compute_test.cc +++ b/lite/kernels/opencl/depthwise_conv2d_compute_test.cc @@ -14,9 +14,9 @@ #include #include +#include "lite/backends/opencl/target_wrapper.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" -#include "lite/opencl/target_wrapper.h" namespace paddle { namespace lite { diff --git a/lite/kernels/opencl/elementwise_add_compute.cc b/lite/kernels/opencl/elementwise_add_compute.cc index 6c215bfffb4190479b53709f85af4e43eee34c26..ad831010f81a240c7eec0c3b3b36f070628636e9 100644 --- a/lite/kernels/opencl/elementwise_add_compute.cc +++ b/lite/kernels/opencl/elementwise_add_compute.cc @@ -14,8 +14,8 @@ #include "lite/kernels/opencl/elementwise_add_compute.h" #include +#include "lite/backends/opencl/cl_include.h" #include "lite/core/op_registry.h" -#include "lite/opencl/cl_include.h" #include "lite/utils/replace_stl/stream.h" namespace paddle { diff --git a/lite/kernels/opencl/elementwise_add_compute_test.cc b/lite/kernels/opencl/elementwise_add_compute_test.cc index 7aa798142aea470de294bccec717306bcbc1e818..69df2313bb93e7eb571858537eddeb1f6014d005 100644 --- a/lite/kernels/opencl/elementwise_add_compute_test.cc +++ b/lite/kernels/opencl/elementwise_add_compute_test.cc @@ -15,9 +15,9 @@ #include #include #include +#include "lite/backends/opencl/target_wrapper.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" -#include "lite/opencl/target_wrapper.h" namespace paddle { namespace lite { diff --git a/lite/kernels/opencl/fc_compute.cc b/lite/kernels/opencl/fc_compute.cc index 90afd70abb140d5b6415dd2b2fdf852efa57c2c9..1f8ba6ae2f603ba02e4025e63158249a49dbc815 100644 --- a/lite/kernels/opencl/fc_compute.cc +++ b/lite/kernels/opencl/fc_compute.cc @@ -13,9 +13,9 @@ // limitations under the License. #include +#include "lite/backends/opencl/cl_include.h" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" -#include "lite/opencl/cl_include.h" #include "lite/operators/op_params.h" #include "lite/utils/replace_stl/stream.h" #include "lite/utils/string.h" diff --git a/lite/kernels/opencl/fc_compute_test.cc b/lite/kernels/opencl/fc_compute_test.cc index d866a6d632c7c4aefb31b5e5580ae140a23c97ea..7f0c9c49a9920b10ceaa29cd1b548f59d5758f3b 100644 --- a/lite/kernels/opencl/fc_compute_test.cc +++ b/lite/kernels/opencl/fc_compute_test.cc @@ -14,9 +14,9 @@ #include #include +#include "lite/backends/opencl/target_wrapper.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" -#include "lite/opencl/target_wrapper.h" namespace paddle { namespace lite { diff --git a/lite/kernels/opencl/fusion_elementwise_add_activation_compute.cc b/lite/kernels/opencl/fusion_elementwise_add_activation_compute.cc index 3164fa4a6973435e573529139199b1b6a06d7206..ad17575d693862b02129ef0e506968f3cbabc42a 100644 --- a/lite/kernels/opencl/fusion_elementwise_add_activation_compute.cc +++ b/lite/kernels/opencl/fusion_elementwise_add_activation_compute.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "lite/backends/opencl/cl_include.h" #include "lite/core/op_registry.h" #include "lite/kernels/opencl/elementwise_add_compute.h" -#include "lite/opencl/cl_include.h" namespace paddle { namespace lite { diff --git a/lite/kernels/opencl/io_copy_compute.cc b/lite/kernels/opencl/io_copy_compute.cc index 4afd9f0aca58e7ff341db01a1d870f2cc1fe9f7b..1d43f7d97eef212393e316cbd12d8115bb773cdb 100644 --- a/lite/kernels/opencl/io_copy_compute.cc +++ b/lite/kernels/opencl/io_copy_compute.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "lite/backends/opencl/target_wrapper.h" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" -#include "lite/opencl/target_wrapper.h" namespace paddle { namespace lite { diff --git a/lite/kernels/opencl/io_copy_compute_test.cc b/lite/kernels/opencl/io_copy_compute_test.cc index b33ff1e2612ade7be473c8dbd61003ca70d7dfc7..320e257d39c8ada76a76765d403ed8ae65ee0e74 100644 --- a/lite/kernels/opencl/io_copy_compute_test.cc +++ b/lite/kernels/opencl/io_copy_compute_test.cc @@ -15,9 +15,9 @@ #include #include #include +#include "lite/backends/opencl/target_wrapper.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" -#include "lite/opencl/target_wrapper.h" namespace paddle { namespace lite { diff --git a/lite/kernels/opencl/mul_compute.cc b/lite/kernels/opencl/mul_compute.cc index 6a3b40ffa59b6133cac511a66ac30a10d6bfd323..78c91317744b4257ae83d03c9d53ae84ba3ec0fd 100644 --- a/lite/kernels/opencl/mul_compute.cc +++ b/lite/kernels/opencl/mul_compute.cc @@ -13,9 +13,9 @@ // limitations under the License. #include +#include "lite/backends/opencl/cl_include.h" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" -#include "lite/opencl/cl_include.h" #include "lite/operators/op_params.h" #include "lite/utils/replace_stl/stream.h" #include "lite/utils/string.h" diff --git a/lite/kernels/opencl/mul_compute_test.cc b/lite/kernels/opencl/mul_compute_test.cc index 11728ca2aaba7bc42d5205cdcd225c861d08e2bb..e35eca658c251ba4c203b49ab214f5cbbdb5ec81 100644 --- a/lite/kernels/opencl/mul_compute_test.cc +++ b/lite/kernels/opencl/mul_compute_test.cc @@ -14,9 +14,9 @@ #include #include +#include "lite/backends/opencl/target_wrapper.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" -#include "lite/opencl/target_wrapper.h" namespace paddle { namespace lite { diff --git a/lite/kernels/opencl/pool_compute.cc b/lite/kernels/opencl/pool_compute.cc index fe193abc367c11b46741d21e57ec61aa7cb72f60..dc2e851595b08e1ff401499502fab64df4dfa46f 100644 --- a/lite/kernels/opencl/pool_compute.cc +++ b/lite/kernels/opencl/pool_compute.cc @@ -13,9 +13,9 @@ // limitations under the License. #include +#include "lite/backends/opencl/cl_include.h" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" -#include "lite/opencl/cl_include.h" #include "lite/operators/op_params.h" #include "lite/utils/replace_stl/stream.h" #include "lite/utils/string.h" diff --git a/lite/kernels/opencl/pool_compute_test.cc b/lite/kernels/opencl/pool_compute_test.cc index 6f0cec77a0bf329bc9bc0a9ffe20a66f0d40fdfb..53f64e950500425655fbd450d5961a2a8dbc412d 100644 --- a/lite/kernels/opencl/pool_compute_test.cc +++ b/lite/kernels/opencl/pool_compute_test.cc @@ -14,9 +14,9 @@ #include #include +#include "lite/backends/opencl/target_wrapper.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" -#include "lite/opencl/target_wrapper.h" namespace paddle { namespace lite { diff --git a/lite/kernels/opencl/relu_compute.cc b/lite/kernels/opencl/relu_compute.cc index aba883f2c3e6cde5283be3081daa7c632415455b..93d1dec6743b6835b7a955994d4ebaeeef081597 100644 --- a/lite/kernels/opencl/relu_compute.cc +++ b/lite/kernels/opencl/relu_compute.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "lite/backends/opencl/cl_include.h" #include "lite/core/kernel.h" #include "lite/core/op_registry.h" -#include "lite/opencl/cl_include.h" #include "lite/operators/op_params.h" #include "lite/utils/replace_stl/stream.h" diff --git a/lite/kernels/opencl/relu_compute_test.cc b/lite/kernels/opencl/relu_compute_test.cc index ce4d9b268323139f9a203235fef8de3e26d8fd86..d2f0812bae608324a8ab31756981271fe1c334e4 100644 --- a/lite/kernels/opencl/relu_compute_test.cc +++ b/lite/kernels/opencl/relu_compute_test.cc @@ -14,9 +14,9 @@ #include #include +#include "lite/backends/opencl/target_wrapper.h" #include "lite/core/op_registry.h" #include "lite/core/tensor.h" -#include "lite/opencl/target_wrapper.h" namespace paddle { namespace lite { diff --git a/lite/tests/kernels/test_sgemm.cc b/lite/tests/kernels/test_sgemm.cc index e755aaf89a0589deb2bca3b07497347751ccf1da..4801b3086ee74c3256a7f127ff1b64f17d674547 100644 --- a/lite/tests/kernels/test_sgemm.cc +++ b/lite/tests/kernels/test_sgemm.cc @@ -19,7 +19,7 @@ #include "lite/tests/kernels/fill_data.h" #include "lite/tests/kernels/test_funcs.h" #ifdef LITE_WITH_ARM -#include "lite/arm/math/funcs.h" +#include "lite/backends/arm/math/funcs.h" #endif #include "lite/core/context.h" #include "lite/core/tensor.h"