diff --git a/CMakeLists.txt b/CMakeLists.txt index 033d4f9ddb..8ddd7e207b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,7 +159,6 @@ include_directories("${PADDLE_SOURCE_DIR}") include_directories("${PADDLE_SOURCE_DIR}/paddle/cuda/include") include_directories("${CMAKE_CURRENT_BINARY_DIR}/proto") include_directories("${CMAKE_CURRENT_BINARY_DIR}/go/pserver/client/c") -include_directories(${Boost_INCLUDE_DIRS}) set(EXTERNAL_LIBS ${GFLAGS_LIBRARIES} diff --git a/Dockerfile b/Dockerfile index 857d3f3e5f..6ac9901ac6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN apt-get update && \ curl sed grep graphviz libjpeg-dev zlib1g-dev \ python-matplotlib gcc-4.8 g++-4.8 \ automake locales clang-format swig doxygen cmake \ - liblapack-dev liblapacke-dev libboost-dev \ + liblapack-dev liblapacke-dev \ clang-3.8 llvm-3.8 libclang-3.8-dev \ net-tools libtool && \ apt-get clean -y diff --git a/cmake/external/boost.cmake b/cmake/external/boost.cmake index fea26c3f89..137f11da7f 100644 --- a/cmake/external/boost.cmake +++ b/cmake/external/boost.cmake @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -INCLUDE(ExternalProject) +include(ExternalProject) set(BOOST_PROJECT "extern_boost") set(BOOST_VER "1.66.0") @@ -20,24 +20,9 @@ set(BOOST_TAR "boost_1_66_0") set(BOOST_URL "https://dl.bintray.com/boostorg/release/${BOOST_VER}/source/${BOOST_TAR}.tar.gz") set(BOOST_SOURCES_DIR ${THIRD_PARTY_PATH}/boost) set(BOOST_DOWNLOAD_DIR "${BOOST_SOURCES_DIR}/src/${BOOST_PROJECT}") -set(BOOST_INSTALL_DIR ${THIRD_PARTY_PATH}/install/boost) -set(BOOST_ROOT ${BOOST_INSTALL_DIR} CACHE FILEPATH "boost root directory." FORCE) -set(BOOST_INCLUDE_DIR "${BOOST_INSTALL_DIR}/include" CACHE PATH "boost include directory." FORCE) +set(BOOST_INCLUDE_DIR "${BOOST_DOWNLOAD_DIR}/${BOOST_TAR}" CACHE PATH "boost include directory." FORCE) -set(BOOST_BOOTSTRAP_CMD) -set(BOOST_B2_CMD) - -if(UNIX) - set(BOOST_BOOTSTRAP_CMD ./bootstrap.sh) - set(BOOST_B2_CMD ./b2) -else() - if(WIN32) - set(BOOST_BOOTSTRAP_CMD bootstrap.bat) - set(BOOST_B2_CMD b2.exe) - endif() -endif() - -INCLUDE_DIRECTORIES(${BOOST_INCLUDE_DIR}) +include_directories(${BOOST_INCLUDE_DIR}) ExternalProject_Add( ${BOOST_PROJECT} @@ -47,8 +32,8 @@ ExternalProject_Add( && tar zxf ${BOOST_TAR}.tar.gz DOWNLOAD_NO_PROGRESS 1 PREFIX ${BOOST_SOURCES_DIR} - CONFIGURE_COMMAND sh -c "cd /${BOOST_TAR} && ${BOOST_BOOTSTRAP_CMD} --prefix=${BOOST_INSTALL_DIR}" - BUILD_COMMAND cd /${BOOST_TAR} && ${BOOST_B2_CMD} install --prefix=${BOOST_INSTALL_DIR} --with-program_options + CONFIGURE_COMMAND "" + BUILD_COMMAND "" INSTALL_COMMAND "" UPDATE_COMMAND "" ) @@ -61,13 +46,6 @@ else() add_library(boost INTERFACE) endif() -ADD_DEPENDENCIES(boost ${BOOST_PROJECT}) -LIST(APPEND external_project_dependencies boost) -if(WIN32) - set(Boost_INCLUDE_DIR ${BOOST_INSTALL_DIR}/include/boost) - set(BOOST_ROOT ${BOOST_INSTALL_DIR} ) -else() - set(Boost_INCLUDE_DIR ${BOOST_INSTALL_DIR}/include) -endif() - -set(Boost_LIBRARY_DIR ${BOOST_INSTALL_DIR}/lib) +add_dependencies(boost ${BOOST_PROJECT}) +list(APPEND external_project_dependencies boost) +set(Boost_INCLUDE_DIR ${BOOST_INCLUDE_DIR}) diff --git a/tools/manylinux1/Dockerfile.x64 b/tools/manylinux1/Dockerfile.x64 index 2c6ba650a5..0f1b833130 100644 --- a/tools/manylinux1/Dockerfile.x64 +++ b/tools/manylinux1/Dockerfile.x64 @@ -35,7 +35,7 @@ RUN cd /opt && wget -q --no-check-certificate https://github.com/google/protobuf cd protobuf-3.1.0 && ./configure && make -j4 && make install && cd .. && rm -f protobuf-cpp-3.1.0.tar.gz -RUN yum install -y sqlite-devel zlib-devel openssl-devel boost boost-devel pcre-devel vim tk-devel tkinter libtool +RUN yum install -y sqlite-devel zlib-devel openssl-devel pcre-devel vim tk-devel tkinter libtool RUN wget -O /root/requirements.txt https://raw.githubusercontent.com/PaddlePaddle/Paddle/develop/python/requirements.txt