From fa36b1c426a2e6c739500862cb1c4c4a2f89b431 Mon Sep 17 00:00:00 2001 From: "Trevor L. McDonell" Date: Tue, 2 Oct 2018 17:43:47 +0200 Subject: [PATCH 1/2] unblock cuda packages --- build-constraints.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1d2abb63..f7e1eb1f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -803,11 +803,12 @@ packages: - colour-accelerate < 0 # GHC 8.4 via base-4.11.0.0 - lens-accelerate < 0 # GHC 8.4 via base-4.11.0.0 - mwc-random-accelerate < 0 # GHC 8.4 via accelerate - - cuda < 0 # build failure with GHC 8.4 - - cublas < 0 # build failure with GHC 8.4 - - cusparse < 0 # build failure with GHC 8.4 - - cusolver < 0 # build failure with GHC 8.4 - - nvvm < 0 # build failure with GHC 8.4 + - cuda + - cufft + - cublas + - cusparse + - cusolver + - nvvm - wide-word "Dan Burton @DanBurton": From 6d54752a259fccc5716608630b7dece817872bdc Mon Sep 17 00:00:00 2001 From: "Trevor L. McDonell" Date: Tue, 2 Oct 2018 17:51:47 +0200 Subject: [PATCH 2/2] update to cuda-10 --- Dockerfile | 6 +++--- debian-bootstrap.sh | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index f37e09ae..cf8c7ccc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,9 @@ ENV HOME /home/stackage ENV LANG en_US.UTF-8 # NOTE: also update debian-bootstrap.sh when cuda version changes -ENV PATH /usr/local/cuda-8.0/bin:/opt/ghc/8.6.1/bin:/usr/sbin:/usr/bin:/sbin:/bin -ENV CUDA_PATH /usr/local/cuda-8.0 -ENV LD_LIBRARY_PATH=/usr/local/cuda-8.0/lib64:/usr/local/cuda-8.0/nvvm/lib64 +ENV PATH /usr/local/cuda-10.0/bin:/opt/ghc/8.6.1/bin:/usr/sbin:/usr/bin:/sbin:/bin +ENV CUDA_PATH /usr/local/cuda-10.0 +ENV LD_LIBRARY_PATH=/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/nvvm/lib64 ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 308becc8..842bcaf4 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -268,12 +268,13 @@ cd /tmp \ # NOTE: also update Dockerfile when cuda version changes # Install CUDA toolkit # The current version can be found at: https://developer.nvidia.com/cuda-downloads -CUDA_PKG=8.0.61-1 # update this on new version -CUDA_VER=${CUDA_PKG:0:3} -CUDA_APT=${CUDA_VER/./-} +CUDA_PKG=10.0.130-1 +CUDA_VER=10.0 +CUDA_APT=10-0 pushd /tmp \ && wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \ + && apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/7fa2af80.pub \ && dpkg -i cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \ && apt-get update -qq \ && apt-get install -y cuda-drivers cuda-core-${CUDA_APT} cuda-cudart-dev-${CUDA_APT} cuda-cufft-dev-${CUDA_APT} cuda-cublas-dev-${CUDA_APT} cuda-cusparse-dev-${CUDA_APT} cuda-cusolver-dev-${CUDA_APT} \