From b276ce61b160a14b730a27af3d33e9444ed646b1 Mon Sep 17 00:00:00 2001 From: Justin Le Date: Fri, 1 Sep 2017 00:16:25 -0700 Subject: [PATCH 1/3] added type-combinators-singletons library added type-combinators-singletons library, maintained by me. --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1ac3ffc0..059c9bf0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1762,6 +1762,7 @@ packages: - hamilton - prompt - tagged-binary + - type-combinators-singletons - typelits-witnesses - uncertain - vector-sized From e1d31dd044791616c6fe21be79a6cd728386313f Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Fri, 1 Sep 2017 11:48:04 -0700 Subject: [PATCH 2/3] Re-enable cuda stuff, closes #2813 --- build-constraints.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 059c9bf0..f59e5e45 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -670,12 +670,11 @@ packages: - gloss-algorithms - gloss-raster - gloss-rendering - # https://github.com/fpco/stackage/issues/2813 - # - cuda - # - cublas - # - cusparse - # - cusolver - # - nvvm + - cuda + - cublas + - cusparse + - cusolver + - nvvm "Liam O'Connor @liamoc": [] From e2c05bab2bd0397e0a65eb272ad34fa626b88329 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Fri, 1 Sep 2017 12:12:59 -0700 Subject: [PATCH 3/3] Bake cuda env vars into Dockerfile --- Dockerfile | 6 +++++- debian-bootstrap.sh | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 56076512..710e7bbe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,11 @@ FROM fpco/pid1:16.04 ENV HOME /home/stackage ENV LANG en_US.UTF-8 -ENV PATH /opt/ghc/8.2.1/bin:/usr/sbin:/usr/bin:/sbin:/bin + +# NOTE: also update debian-bootstrap.sh when cuda version changes +ENV PATH /usr/local/cuda-8.0/bin:/opt/ghc/8.2.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 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 9c59f1d0..d294a690 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -207,6 +207,7 @@ curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-l && rm libtensorflow.tar.gz \ && ldconfig +# 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