From a6e774aed6994630816dd255d0d896cc7ab0fba4 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Fri, 13 Dec 2019 21:21:33 +0800 Subject: [PATCH] enable build milvus on centos7 --- .../index/cmake/ThirdPartyPackagesCore.cmake | 7 +++--- docker/build_env/gpu/centos7/Dockerfile | 22 +++++++++++++++++++ .../gpu/centos7/docker-entrypoint.sh | 10 +++++++++ 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 docker/build_env/gpu/centos7/Dockerfile create mode 100755 docker/build_env/gpu/centos7/docker-entrypoint.sh diff --git a/core/src/index/cmake/ThirdPartyPackagesCore.cmake b/core/src/index/cmake/ThirdPartyPackagesCore.cmake index 9c9187d2cc..9ae0391f54 100644 --- a/core/src/index/cmake/ThirdPartyPackagesCore.cmake +++ b/core/src/index/cmake/ThirdPartyPackagesCore.cmake @@ -270,10 +270,10 @@ set(ARROW_PREFIX "${INDEX_BINARY_DIR}/arrow_ep-prefix/src/arrow_ep/cpp") macro(build_arrow) message(STATUS "Building Apache ARROW-${ARROW_VERSION} from source") set(ARROW_STATIC_LIB_NAME arrow) - set(ARROW_STATIC_LIB - "${ARROW_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${ARROW_STATIC_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}" - ) set(ARROW_LIB_DIR "${ARROW_PREFIX}/lib") + set(ARROW_STATIC_LIB + "${ARROW_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${ARROW_STATIC_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}" + ) set(ARROW_INCLUDE_DIR "${ARROW_PREFIX}/include") set(ARROW_CMAKE_ARGS @@ -282,6 +282,7 @@ macro(build_arrow) -DARROW_BUILD_SHARED=OFF -DARROW_USE_GLOG=OFF -DCMAKE_INSTALL_PREFIX=${ARROW_PREFIX} + -DCMAKE_INSTALL_LIBDIR=${ARROW_LIB_DIR} -DARROW_CUDA=OFF -DARROW_FLIGHT=OFF -DARROW_GANDIVA=OFF diff --git a/docker/build_env/gpu/centos7/Dockerfile b/docker/build_env/gpu/centos7/Dockerfile new file mode 100644 index 0000000000..0f8ef6c85c --- /dev/null +++ b/docker/build_env/gpu/centos7/Dockerfile @@ -0,0 +1,22 @@ +FROM nvidia/cuda:10.1-devel-centos7 + +ENV NVIDIA_DRIVER_CAPABILITIES compute,utility + +RUN yum install -y epel-release centos-release-scl-rh && yum install -y wget curl && \ + wget -qO- "https://cmake.org/files/v3.14/cmake-3.14.3-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local && \ + yum install -y ccache make automake git python3-pip libcurl-devel python3-devel boost-static devtoolset-7-gcc llvm-toolset-7.0-clang lcov \ + && \ + rm -rf /var/cache/yum/* + +RUN scl enable devtoolset-7 bash + +ENV CLANG_TOOLS_PATH="/opt/rh/llvm-toolset-7.0/root/usr/bin" +ENV PATH="/opt/rh/llvm-toolset-7.0/root/usr/bin:$PATH" +ENV LD_LIBRARY_PATH="/opt/rh/llvm-toolset-7.0/root/usr/lib64:$LD_LIBRARY_PATH" + +COPY docker-entrypoint.sh /app/docker-entrypoint.sh + +WORKDIR /root + +ENTRYPOINT [ "/app/docker-entrypoint.sh" ] +CMD [ "start" ] diff --git a/docker/build_env/gpu/centos7/docker-entrypoint.sh b/docker/build_env/gpu/centos7/docker-entrypoint.sh new file mode 100755 index 0000000000..1e85e7e9e1 --- /dev/null +++ b/docker/build_env/gpu/centos7/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +set -e + +if [ "$1" = 'start' ]; then + tail -f /dev/null +fi + +exec "$@" +