git.iko.soy/stackage
on master help sign in
Merge pull request #4029 from tmcdonell/pr/cuda

unblock cuda packages

commit6fa8d013a855f9408a5e6679416d82c4e8aa7e6f authorAdam Bergmark <adam@bergmark.nl> dateWed 3 Oct 2018, 17:00 (8 years ago) parente1857cb6d54752
3 files changed+13−11
compare with master
unifiedsplit
Dockerfile+3−3 build-constraints.yaml+6−5 debian-bootstrap.sh+4−3
Dockerfile+3−3
@@ -4,9 +4,9 @@ ENV HOME /home/stackage
44ENV LANG en_US.UTF-8
55
66# NOTE: also update debian-bootstrap.sh when cuda version changes
7−ENV PATH /usr/local/cuda-8.0/bin:/opt/ghc/8.6.1/bin:/usr/sbin:/usr/bin:/sbin:/bin
8−ENV CUDA_PATH /usr/local/cuda-8.0
9−ENV LD_LIBRARY_PATH=/usr/local/cuda-8.0/lib64:/usr/local/cuda-8.0/nvvm/lib64
7+ENV PATH /usr/local/cuda-10.0/bin:/opt/ghc/8.6.1/bin:/usr/sbin:/usr/bin:/sbin:/bin
8+ENV CUDA_PATH /usr/local/cuda-10.0
9+ENV LD_LIBRARY_PATH=/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/nvvm/lib64
1010
1111ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh
1212RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh
build-constraints.yaml+6−5
@@ -805,11 +805,12 @@ packages:
805805 - colour-accelerate < 0 # GHC 8.4 via base-4.11.0.0
806806 - lens-accelerate < 0 # GHC 8.4 via base-4.11.0.0
807807 - mwc-random-accelerate < 0 # GHC 8.4 via accelerate
808− - cuda < 0 # build failure with GHC 8.4
809− - cublas < 0 # build failure with GHC 8.4
810− - cusparse < 0 # build failure with GHC 8.4
811− - cusolver < 0 # build failure with GHC 8.4
812− - nvvm < 0 # build failure with GHC 8.4
808+ - cuda
809+ - cufft
810+ - cublas
811+ - cusparse
812+ - cusolver
813+ - nvvm
813814 - wide-word
814815
815816 "Dan Burton <danburton.email@gmail.com> @DanBurton":
debian-bootstrap.sh+4−3
@@ -268,12 +268,13 @@ cd /tmp \
268268# NOTE: also update Dockerfile when cuda version changes
269269# Install CUDA toolkit
270270# The current version can be found at: https://developer.nvidia.com/cuda-downloads
271−CUDA_PKG=8.0.61-1 # update this on new version
272−CUDA_VER=${CUDA_PKG:0:3}
273−CUDA_APT=${CUDA_VER/./-}
271+CUDA_PKG=10.0.130-1
272+CUDA_VER=10.0
273+CUDA_APT=10-0
274274
275275pushd /tmp \
276276 && wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \
277+ && apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/7fa2af80.pub \
277278 && dpkg -i cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \
278279 && apt-get update -qq \
279280 && 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} \