on master help sign in
Merge remote-tracking branch 'origin/master' into nightly
commit0f777476a14df4e7a2661d8b1739b15d6461dd70 authorAdam Bergmark <adam@bergmark.nl> dateWed 3 Oct 2018, 17:05 (8 years ago) parent523a2f76fa8d01
3 files changed+25−30
Dockerfile+3−3 build-constraints.yaml+18−24 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+18−24
@@ -8,6 +8,9 @@ cabal-format-version: "2.2"
88# Constraints for brand new builds
99packages:
1010
11+ "Laurent P. René de Cotret <laurent.decotret@outlook.com> @LaurentRDC":
12+ - pandoc-pyplot
13+
1114 "Andrew Newman <andrewfnewman@gmail.com> @andrewfnewman":
1215 - geojson
1316
@@ -384,6 +387,7 @@ packages:
384387 - markdown
385388 - mime-mail
386389 - mime-mail-ses
390+ - mime-types
387391 - network-conduit-tls
388392 - persistent
389393 - persistent-mysql
@@ -584,6 +588,7 @@ packages:
584588 - pem
585589 - siphash
586590 - socks
591+ - tasty-kat
587592 - tls
588593 - tls-debug
589594 - vhd < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build
@@ -789,8 +794,8 @@ packages:
789794 - accelerate-llvm-ptx < 0 # GHC 8.4 via base-4.11.0.0
790795 - accelerate-examples < 0 # GHC 8.4 via accelerate
791796 - repa
792− - repa-algorithms < 0 # GHC 8.4 via repa
793− - repa-io < 0 # GHC 8.4 via repa
797+ - repa-algorithms
798+ - repa-io
794799 - gloss
795800 - gloss-accelerate < 0 # GHC 8.4 via base-4.11.0.0
796801 - gloss-algorithms < 0 # GHC 8.4 via base-4.11.0.0
@@ -800,11 +805,12 @@ packages:
800805 - colour-accelerate < 0 # GHC 8.4 via base-4.11.0.0
801806 - lens-accelerate < 0 # GHC 8.4 via base-4.11.0.0
802807 - mwc-random-accelerate < 0 # GHC 8.4 via accelerate
803− - cuda < 0 # build failure with GHC 8.4
804− - cublas < 0 # build failure with GHC 8.4
805− - cusparse < 0 # build failure with GHC 8.4
806− - cusolver < 0 # build failure with GHC 8.4
807− - nvvm < 0 # build failure with GHC 8.4
808+ - cuda
809+ - cufft
810+ - cublas
811+ - cusparse
812+ - cusolver
813+ - nvvm
808814 - wide-word
809815
810816 "Dan Burton <danburton.email@gmail.com> @DanBurton":
@@ -1306,7 +1312,7 @@ packages:
13061312
13071313 "Tomas Carnecky @wereHamster":
13081314 - avers
1309− # - avers-api # cryptonite 0.25
1315+ # - avers-api # avers, GHC 8.6
13101316 # - avers-server # cryptonite 0.25
13111317 - css-syntax
13121318 # - etcd # https://github.com/wereHamster/etcd-hs/issues/5
@@ -2568,6 +2574,7 @@ packages:
25682574 # - marvin # https://github.com/JustusAdam/marvin/issues/22
25692575 - marvin-interpolate
25702576 - mustache
2577+ - exit-codes >= 1.0.0
25712578
25722579 "Cindy Wang <cindylinz@gmail.com> @CindyLinz":
25732580 - NoTrace < 0 # GHC 8.4 via base-4.11.0.0
@@ -2685,6 +2692,7 @@ packages:
26852692 - hw-balancedparens
26862693 - hw-bits
26872694 - hw-conduit
2695+ - hw-conduit-merges
26882696 - hw-diagnostics
26892697 - hw-dsv
26902698 - hw-eliasfano
@@ -3188,6 +3196,7 @@ packages:
31883196 - tensorflow-test
31893197 - pier-core
31903198 - pier
3199+ - haskeline
31913200
31923201 "Christof Schramm <christof.schramm@campus.lmu.de>":
31933202 - mnist-idx
@@ -3612,7 +3621,7 @@ packages:
36123621
36133622 "asakamirai <asakamirai_hackage@towanowa.net> @asakamirai":
36143623 - kazura-queue
3615−
3624+
36163625 "Eric Torreborre <etorreborre@yahoo.com> @etorreborre":
36173626 - registry
36183627
@@ -3679,7 +3688,6 @@ packages:
36793688 - Allure < 0
36803689 - DAV < 0
36813690 - DRBG < 0
3682− - FontyFruity < 0
36833691 - HTF < 0
36843692 - HTTP < 0
36853693 - HaTeX < 0
@@ -3688,7 +3696,6 @@ packages:
36883696 - HaskellNet-SSL < 0
36893697 - IPv6Addr < 0
36903698 - IPv6DB < 0
3691− - JuicyPixels < 0
36923699 - JuicyPixels-extra < 0
36933700 - JuicyPixels-scale-dct < 0
36943701 - LambdaHack < 0
@@ -3697,7 +3704,6 @@ packages:
36973704 - Network-NineP < 0
36983705 - QuasiText < 0
36993706 - RSA < 0
3700− - Rasterific < 0
37013707 - RefSerialize < 0
37023708 - SCalendar < 0
37033709 - ShellCheck < 0
@@ -3806,7 +3812,6 @@ packages:
38063812 - antiope-s3 < 0
38073813 - antiope-sns < 0
38083814 - antiope-sqs < 0
3809− - app-settings < 0
38103815 - apply-refact < 0
38113816 - approximate < 0
38123817 - arrow-list < 0
@@ -3829,7 +3834,6 @@ packages:
38293834 - beam-migrate < 0
38303835 - beam-sqlite < 0
38313836 - bench < 0
3832− - benchpress < 0
38333837 - bhoogle < 0
38343838 - binary-orphans < 0
38353839 - bins < 0
@@ -3962,7 +3966,6 @@ packages:
39623966 - fswatch < 0
39633967 - gdax < 0
39643968 - generic-aeson < 0
3965− - generic-random < 0
39663969 - generic-xmlpickler < 0
39673970 - generics-eot < 0
39683971 - ghc-parser < 0
@@ -4044,7 +4047,6 @@ packages:
40444047 - hpqtypes < 0
40454048 - hquantlib < 0
40464049 - hsebaysdk < 0
4047− - hsexif < 0
40484050 - hslua < 0
40494051 - hslua-aeson < 0
40504052 - hslua-module-text < 0
@@ -4053,7 +4055,6 @@ packages:
40534055 - hspec-wai-json < 0
40544056 - hsx-jmacro < 0
40554057 - hsyslog-udp < 0
4056− - http-client < 0
40574058 - http-client-openssl < 0
40584059 - http-client-tls < 0
40594060 - http-conduit < 0
@@ -4131,7 +4132,6 @@ packages:
41314132 - massiv-io < 0
41324133 - mbug < 0
41334134 - mega-sdist < 0
4134− - memory < 0
41354135 - messagepack < 0
41364136 - messagepack-rpc < 0
41374137 - microformats2-parser < 0
@@ -4239,7 +4239,6 @@ packages:
42394239 - rebase < 0
42404240 - ref-fd < 0
42414241 - registry < 0
4242− - repa < 0
42434242 - repline < 0
42444243 - req < 0
42454244 - req-conduit < 0
@@ -4453,7 +4452,6 @@ packages:
44534452 - exinst < 0
44544453 - extensible < 0
44554454 - fgl < 0
4456− - first-class-families < 0
44574455 - gtk2hs-buildtools < 0
44584456 - hdevtools < 0
44594457 - histogram-fill < 0
@@ -4461,7 +4459,6 @@ packages:
44614459 - jni < 0
44624460 - large-hashable < 0
44634461 - libmpd < 0
4464− - llvm-hs
44654462 - llvm-hs-pretty < 0
44664463 - matrix-static < 0
44674464 - med-module < 0
@@ -4470,7 +4467,6 @@ packages:
44704467 - o-clock < 0
44714468 - stm-stats < 0
44724469 - teardown < 0
4473− - typelits-witnesses < 0
44744470 - typenums < 0
44754471 - typography-geometry < 0
44764472 - universe-instances-extended < 0
@@ -4756,7 +4752,6 @@ skipped-tests:
47564752 - github-types
47574753 - graph-core
47584754 - hexml-lens
4759− - higher-leveldb
47604755 - hspec-core
47614756 - inflections
47624757 - inline-r
@@ -5005,7 +5000,6 @@ expected-test-failures:
50055000 - serialport # "The tests need two serial ports as command line arguments" https://github.com/jputcu/serialport/issues/30
50065001 - serversession-backend-redis # redis
50075002 - shake # Needs ghc on $PATH with some installed haskell packages
5008− - singletons # Needs ghc on $PATH with som installed haskell packages
50095003 - stack # https://github.com/fpco/stackage/issues/3707
50105004 - stripe-http-streams # https://github.com/fpco/stackage/issues/2945, needs Stripe account
50115005 - users-persistent # sqlite
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} \