From af335026baf7a41207fc68ce1d0e480a34ec05f9 Mon Sep 17 00:00:00 2001 From: tqchen Date: Mon, 11 May 2020 10:12:46 -0700 Subject: [PATCH] [DOCKER] Fix vulkansdk in the ci-gpu --- docker/Dockerfile.ci_gpu | 5 +---- docker/install/ubuntu_install_vulkan.sh | 11 ++++------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/docker/Dockerfile.ci_gpu b/docker/Dockerfile.ci_gpu index 162549650994..d8290148b792 100644 --- a/docker/Dockerfile.ci_gpu +++ b/docker/Dockerfile.ci_gpu @@ -111,7 +111,4 @@ ENV LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/compact:${LD_LIBRARY_P ENV LD_LIBRARY_PATH=/opt/rocm/lib:${LD_LIBRARY_PATH} ENV PATH=/node_modules/.bin:${PATH} -ENV VULKAN_SDK=/usr/local/VulkanSDK/1.0.65.0/x86_64 -ENV PATH=${PATH}:${VULKAN_SDK}/bin -ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${VULKAN_SDK}/lib -ENV VK_LAYER_PATH=${VULKAN_SDK}/etc/explicit_layer.d +ENV VULKAN_SDK=/usr diff --git a/docker/install/ubuntu_install_vulkan.sh b/docker/install/ubuntu_install_vulkan.sh index 5fb40829e0bc..b7d2d4672b0c 100755 --- a/docker/install/ubuntu_install_vulkan.sh +++ b/docker/install/ubuntu_install_vulkan.sh @@ -20,10 +20,7 @@ set -e set -u set -o pipefail -wget -q https://sdk.lunarg.com/sdk/download/1.0.65.0/linux/vulkansdk-linux-x86_64-1.0.65.0.run - -bash vulkansdk-linux-x86_64-1.0.65.0.run -mv VulkanSDK /usr/local/VulkanSDK -cd /usr/local/VulkanSDK/1.0.65.0 -./build_tools.sh -./build_samples.sh +wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | apt-key add - +wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.2.135-xenial.list http://packages.lunarg.com/vulkan/1.2.135/lunarg-vulkan-1.2.135-xenial.list +apt update +apt install -y vulkan-sdk