From f6276b5b0f38201b0ee3abfa53cbd13b31d1f85d Mon Sep 17 00:00:00 2001 From: tqchen Date: Tue, 29 Oct 2019 16:23:19 -0700 Subject: [PATCH] [CI] Update the ci-gpu to use cuda10 --- cmake/modules/contrib/NNPack.cmake | 3 ++- docker/Dockerfile.ci_gpu | 6 +++--- docker/install/ubuntu_install_nnpack.sh | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cmake/modules/contrib/NNPack.cmake b/cmake/modules/contrib/NNPack.cmake index 3b289d636dae8..46693fc916369 100644 --- a/cmake/modules/contrib/NNPack.cmake +++ b/cmake/modules/contrib/NNPack.cmake @@ -24,10 +24,11 @@ if(USE_NNPACK) list(APPEND RUNTIME_SRCS ${NNPACK_CONTRIB_SRC}) include_directories(${NNPACK_PATH}/include) include_directories(${PTHREAD_POOL_PATH}/include) - find_library(NNPACK_CONTRIB_LIB nnpack ${NNPACK_PATH}/lib) + find_library(NNPACK_CONTRIB_LIB nnpack ${NNPACK_PATH}/lib) find_library(NNPACK_PTHREAD_CONTRIB_LIB pthreadpool ${NNPACK_PATH}/lib) find_library(NNPACK_CPUINFO_CONTRIB_LIB cpuinfo ${NNPACK_PATH}/lib) find_library(NNPACK_CLOG_CONTRIB_LIB clog ${NNPACK_PATH}/lib) + list(APPEND TVM_RUNTIME_LINKER_LIBS ${NNPACK_CONTRIB_LIB}) list(APPEND TVM_RUNTIME_LINKER_LIBS ${NNPACK_PTHREAD_CONTRIB_LIB}) list(APPEND TVM_RUNTIME_LINKER_LIBS ${NNPACK_CPUINFO_CONTRIB_LIB}) diff --git a/docker/Dockerfile.ci_gpu b/docker/Dockerfile.ci_gpu index b648eac0e8bff..57442a99abc2b 100644 --- a/docker/Dockerfile.ci_gpu +++ b/docker/Dockerfile.ci_gpu @@ -17,7 +17,7 @@ # CI docker GPU env # tag: v0.54 -FROM nvidia/cuda:8.0-cudnn7-devel +FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu16.04 # Base scripts RUN apt-get update --fix-missing @@ -108,8 +108,8 @@ ENV PATH=/usr/local/nvidia/bin:${PATH} ENV PATH=/usr/local/cuda/bin:${PATH} ENV CPLUS_INCLUDE_PATH=/usr/local/cuda/include:${CPLUS_INCLUDE_PATH} ENV C_INCLUDE_PATH=/usr/local/cuda/include:${C_INCLUDE_PATH} -ENV LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/nvidia/lib64:${LIBRARY_PATH} -ENV LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/nvidia/lib64:${LD_LIBRARY_PATH} +ENV LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/compact:${LIBRARY_PATH} +ENV LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/compact:${LD_LIBRARY_PATH} ENV LD_LIBRARY_PATH=/opt/rocm/lib:${LD_LIBRARY_PATH} ENV PATH=/node_modules/.bin:${PATH} diff --git a/docker/install/ubuntu_install_nnpack.sh b/docker/install/ubuntu_install_nnpack.sh index dc51fc28d4922..6eb94ae6f5c2f 100755 --- a/docker/install/ubuntu_install_nnpack.sh +++ b/docker/install/ubuntu_install_nnpack.sh @@ -31,5 +31,5 @@ git clone https://github.com/Maratyszcza/pthreadpool NNPACK/pthreadpool mkdir -p NNPACK/build cd NNPACK/build -cmake -DCMAKE_INSTALL_PREFIX:PATH=. -DNNPACK_INFERENCE_ONLY=OFF -DNNPACK_CONVOLUTION_ONLY=OFF -DNNPACK_BUILD_TESTS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DPTHREADPOOL_SOURCE_DIR=pthreadpool .. && make -j4 && make install +cmake -DCMAKE_INSTALL_PREFIX:PATH=. -DNNPACK_INFERENCE_ONLY=OFF -DNNPACK_CONVOLUTION_ONLY=OFF -DNNPACK_BUILD_TESTS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DPTHREADPOOL_SOURCE_DIR=pthreadpool .. && make -j2 && make install cd -