Merge branch 'master' into nightly
commit20afa927e8cf23a072bd3eeb7b53aa294a526d7b
authorDan Burton <danburton.email@gmail.com>
dateFri 1 Sep 2017, 12:13 (9 years ago)
parentce5e23ce2c05ba
Dockerfile+5−1
@@ -2,7 +2,11 @@ FROM fpco/pid1:16.04
22
33ENV HOME /home/stackage
44ENV LANG en_US.UTF-8
5−ENV PATH /opt/ghc/8.2.1/bin:/usr/sbin:/usr/bin:/sbin:/bin
5+
6+# NOTE: also update debian-bootstrap.sh when cuda version changes
7+ENV PATH /usr/local/cuda-8.0/bin:/opt/ghc/8.2.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
610
711ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh
812RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh
build-constraints.yaml+6−6
@@ -670,12 +670,11 @@ packages:
670670 - gloss-algorithms
671671 - gloss-raster
672672 - gloss-rendering
673− # https://github.com/fpco/stackage/issues/2813
674− # - cuda
675− # - cublas
676− # - cusparse
677− # - cusolver
678− # - nvvm
673+ - cuda
674+ - cublas
675+ - cusparse
676+ - cusolver
677+ - nvvm
679678
680679 "Liam O'Connor <liamoc@cse.unsw.edu.au> @liamoc":
681680 []
@@ -1762,6 +1761,7 @@ packages:
17621761 - hamilton
17631762 - prompt
17641763 - tagged-binary
1764+ - type-combinators-singletons
17651765 - typelits-witnesses
17661766 - uncertain
17671767 - vector-sized
debian-bootstrap.sh+1
@@ -207,6 +207,7 @@ curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-l
207207 && rm libtensorflow.tar.gz \
208208 && ldconfig
209209
210+# NOTE: also update Dockerfile when cuda version changes
210211# Install CUDA toolkit
211212# The current version can be found at: https://developer.nvidia.com/cuda-downloads
212213CUDA_PKG=8.0.61-1 # update this on new version