Merge pull request #4029 from tmcdonell/pr/cuda

unblock cuda packages
This commit is contained in:
Adam Bergmark 2018-10-03 17:00:49 +02:00 committed by GitHub
commit 6fa8d013a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 11 deletions

View File

@ -4,9 +4,9 @@ ENV HOME /home/stackage
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
# NOTE: also update debian-bootstrap.sh when cuda version changes # 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 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-8.0 ENV CUDA_PATH /usr/local/cuda-10.0
ENV LD_LIBRARY_PATH=/usr/local/cuda-8.0/lib64:/usr/local/cuda-8.0/nvvm/lib64 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 ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh
RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh

View File

@ -805,11 +805,12 @@ packages:
- colour-accelerate < 0 # GHC 8.4 via base-4.11.0.0 - colour-accelerate < 0 # GHC 8.4 via base-4.11.0.0
- lens-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 - mwc-random-accelerate < 0 # GHC 8.4 via accelerate
- cuda < 0 # build failure with GHC 8.4 - cuda
- cublas < 0 # build failure with GHC 8.4 - cufft
- cusparse < 0 # build failure with GHC 8.4 - cublas
- cusolver < 0 # build failure with GHC 8.4 - cusparse
- nvvm < 0 # build failure with GHC 8.4 - cusolver
- nvvm
- wide-word - wide-word
"Dan Burton <danburton.email@gmail.com> @DanBurton": "Dan Burton <danburton.email@gmail.com> @DanBurton":

View File

@ -268,12 +268,13 @@ cd /tmp \
# NOTE: also update Dockerfile when cuda version changes # NOTE: also update Dockerfile when cuda version changes
# Install CUDA toolkit # Install CUDA toolkit
# The current version can be found at: https://developer.nvidia.com/cuda-downloads # 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_PKG=10.0.130-1
CUDA_VER=${CUDA_PKG:0:3} CUDA_VER=10.0
CUDA_APT=${CUDA_VER/./-} CUDA_APT=10-0
pushd /tmp \ pushd /tmp \
&& wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \ && 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 \ && dpkg -i cuda-repo-ubuntu1604_${CUDA_PKG}_amd64.deb \
&& apt-get update -qq \ && 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} \ && 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} \