From 6227fbdd9f95137a4b9d04da69bffb73760c9c80 Mon Sep 17 00:00:00 2001 From: huzhiqiang <912790387@qq.com> Date: Thu, 28 Nov 2019 01:33:10 -0600 Subject: [PATCH] X86 compiling cherry pick (#2510) * change url type from https:// to http:// to support curl of low edition test=develop (#2496) * add head_file into beam_search.cc test=develop (#2506) --- cmake/external/eigen.cmake | 8 ++++---- cmake/external/xbyak.cmake | 2 +- cmake/external/xxhash.cmake | 4 ++-- lite/backends/x86/math/beam_search.cc | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cmake/external/eigen.cmake b/cmake/external/eigen.cmake index c484688d1b..599e7bba7e 100644 --- a/cmake/external/eigen.cmake +++ b/cmake/external/eigen.cmake @@ -17,8 +17,8 @@ if(WITH_AMD_GPU) ExternalProject_Add( extern_eigen3 ${EXTERNAL_PROJECT_LOG_ARGS} - GIT_TAG 7cb2b6e5a4b4a1efe658abb215cd866c6fb2275e - URL https://paddle-inference-dist.bj.bcebos.com/PaddleLite_ThirdParty%2Fhipeigen-upstream-702834151eaebcf955fd09ed0ad83c06.zip + GIT_TAG + URL http://paddle-inference-dist.bj.bcebos.com/PaddleLite_ThirdParty%2Fhipeigen-upstream-702834151eaebcf955fd09ed0ad83c06.zip DOWNLOAD_DIR ${EIGEN_SOURCECODE_DIR} DOWNLOAD_NO_PROGRESS 1 PREFIX ${EIGEN_SOURCE_DIR} @@ -35,8 +35,8 @@ else() ${EXTERNAL_PROJECT_LOG_ARGS} # eigen on cuda9.1 missing header of math_funtions.hpp # https://stackoverflow.com/questions/43113508/math-functions-hpp-not-found-when-using-cuda-with-eigen - GIT_TAG 917060c364181f33a735dc023818d5a54f60e54c - URL https://paddle-inference-dist.bj.bcebos.com/PaddleLite_ThirdParty%2Feigen-git-mirror-master-9ab917e9db99f5907d086aa73d5f9103.zip + GIT_TAG + URL http://paddle-inference-dist.bj.bcebos.com/PaddleLite_ThirdParty%2Feigen-git-mirror-master-9ab917e9db99f5907d086aa73d5f9103.zip DOWNLOAD_DIR ${EIGEN_SOURCECODE_DIR} DOWNLOAD_NO_PROGRESS 1 PREFIX ${EIGEN_SOURCE_DIR} diff --git a/cmake/external/xbyak.cmake b/cmake/external/xbyak.cmake index 17679bb0dd..5166b494c4 100644 --- a/cmake/external/xbyak.cmake +++ b/cmake/external/xbyak.cmake @@ -40,7 +40,7 @@ ExternalProject_Add( ${EXTERNAL_PROJECT_LOG_ARGS} DEPENDS "" GIT_TAG "v5.661" # Jul 26th - URL https://paddle-inference-dist.bj.bcebos.com/PaddleLite_ThirdParty%2Fxbyak-5.66.zip + URL http://paddle-inference-dist.bj.bcebos.com/PaddleLite_ThirdParty%2Fxbyak-5.66.zip DOWNLOAD_DIR ${XBYAK_SOURCECODE_DIR} DOWNLOAD_NAME "xbyak-5.66.zip" DOWNLOAD_NO_PROGRESS 1 diff --git a/cmake/external/xxhash.cmake b/cmake/external/xxhash.cmake index 781c7145f2..fdc20351e8 100644 --- a/cmake/external/xxhash.cmake +++ b/cmake/external/xxhash.cmake @@ -20,7 +20,7 @@ if(WIN32) extern_xxhash ${EXTERNAL_PROJECT_LOG_ARGS} GIT_TAG "v0.6.5" - URL https://paddle-inference-dist.bj.bcebos.com/PaddleLite_ThirdParty%2FxxHash-0.6.5.zip + URL http://paddle-inference-dist.bj.bcebos.com/PaddleLite_ThirdParty%2FxxHash-0.6.5.zip DOWNLOAD_DIR ${XXHASH_SOURCECODE_DIR} DOWNLOAD_NAME "xxHash-0.6.5.zip" DOWNLOAD_NO_PROGRESS 1 @@ -45,7 +45,7 @@ else() extern_xxhash ${EXTERNAL_PROJECT_LOG_ARGS} GIT_TAG "v0.6.5" - URL https://paddle-inference-dist.bj.bcebos.com/PaddleLite_ThirdParty%2FxxHash-0.6.5.zip + URL http://paddle-inference-dist.bj.bcebos.com/PaddleLite_ThirdParty%2FxxHash-0.6.5.zip DOWNLOAD_DIR ${XXHASH_SOURCECODE_DIR} DOWNLOAD_NO_PROGRESS 1 PREFIX ${XXHASH_SOURCE_DIR} diff --git a/lite/backends/x86/math/beam_search.cc b/lite/backends/x86/math/beam_search.cc index bbe35b4de5..8d61fb3bbb 100644 --- a/lite/backends/x86/math/beam_search.cc +++ b/lite/backends/x86/math/beam_search.cc @@ -14,6 +14,7 @@ limitations under the License. */ #include "lite/backends/x86/math/beam_search.h" #include +#include #include #include "lite/fluid/lod.h" -- GitLab