Merge branch 'release/1.2.0.0' into stable

Author: tmcdonell

.travis

@@ -4,18 +4,18 @@
 # relevant version of LLVM as (a very old version of) the CUDA toolkit (4.0).
 # Caches the 'stack' build directory to speed subsequent compilations.
 #
-language: generic
+language: minimal
 dist: trusty
 sudo: required
 
 cache:
+  timeout: 600
   directories:
-    - $HOME/.stack
-    - $HOME/llvm
+    - $HOME/.stack/snapshots
     - .stack-work/install
 
 before_cache:
-  # - rm -rf $(stack path --local-install-root)/bin
+#   - rm -rf $(stack path --local-install-root)/bin
   - rm -rf $(stack path --local-install-root)/doc
 
 addons:
@@ -24,17 +24,16 @@ addons:
       - hvr-ghc
       - ubuntu-toolchain-r-test
       - llvm-toolchain-trusty
-      # - llvm-toolchain-precise-4.0  # not white-listed yet
-      - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-4.0 main'
-        key_url: 'http://apt.llvm.org/llvm-snapshot.gpg.key'
+      - llvm-toolchain-trusty-4.0
+      - llvm-toolchain-trusty-5.0
+      - llvm-toolchain-trusty-6.0
 
     packages: &apt_packages
       - g++-4.8
       - libgmp-dev
       - libfftw3-dev
       - happy-1.19.5
       - alex-3.1.4
-      - llvm-4.0-dev
 
 matrix:
   include:
@@ -46,6 +45,7 @@ matrix:
           packages:
             - *apt_packages
             - cabal-install-1.22
+            - llvm-4.0-dev
 
     - env: GHC=8.0.2 CABAL=1.24 LLVM=4.0.0 CUDA=8.0.61-1
       compiler: "GHC 8.0"
@@ -55,15 +55,27 @@ matrix:
           packages:
             - *apt_packages
             - cabal-install-1.24
+            - llvm-4.0-dev
 
-    - env: GHC=8.2.1 CABAL=2.0 LLVM=4.0.0 CUDA=8.0.61-1
+    - env: GHC=8.2.2 CABAL=2.0 LLVM=5.0.0 CUDA=8.0.61-1
       compiler: "GHC 8.2"
       addons:
         apt:
           sources: *apt_sources
           packages:
             - *apt_packages
             - cabal-install-2.0
+            - llvm-5.0-dev
+
+    - env: GHC=8.4.1 CABAL=2.0 LLVM=6.0.0 CUDA=8.0.61-1
+      compiler: "GHC 8.4"
+      addons:
+        apt:
+          sources: *apt_sources
+          packages:
+            - *apt_packages
+            - cabal-install-2.0
+            - llvm-6.0-dev
 
     # - env: GHC=head CABAL=head LLVM=3.9.1
     #   compiler: "GHC HEAD"
@@ -87,30 +99,37 @@ before_install:
   - source .travis/install-cuda-trusty.sh
   - source .travis/install-stack.sh
   - source .travis/update-ghc-settings.sh
-  - travis_retry stack install c2hs
+  - travis_retry stack install c2hs --fast --no-terminal
+
+  # ghc bug? error while loading shared libraries: libffi.so.7
+  - |
+      case ${GHC} in
+        8.4.1) export LD_LIBRARY_PATH=$(stack path --compiler-bin)/../lib/ghc-8.4.1/rts:$LD_LIBRARY_PATH ;;
+      esac
 
 install:
-  - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
+  - echo "$(stack exec ghc -- --version) [$(stack exec ghc -- --print-project-git-commit-id 2> /dev/null || echo '?')]"
   - cabal --version
   - stack --version
   - c2hs --version
-  - llc --version; true
-  - opt --version; true
-  - |
-      if [ ${GHC} == head -o ! -e stack.yaml ]; then
-        travis_retry cabal install --only-dependencies || exit 1
-      else
-        travis_retry stack build --only-dependencies --fast --no-terminal --no-haddock-deps || exit 1
-      fi
+  - llc-${LLVM:0:3} --version; true
+  - opt-${LLVM:0:3} --version; true
+
+  # bootstrap
+  # - travis_retry travis_wait 60 stack build --test --only-dependencies --no-run-tests --fast --jobs=2 --no-terminal accelerate
+  # - travis_retry travis_wait 60 stack build --test --only-dependencies --no-run-tests --fast --jobs=2 --no-terminal accelerate-llvm-native accelerate-llvm-ptx
+
+  # regular build
+  - stack build --dry-run
+  - travis_retry travis_wait 60 stack build --test --only-dependencies --no-run-tests --fast --jobs=2 --no-terminal --no-copy-bins
 
 script:
-  - |
-      if [ ${GHC} == head -o ! -e stack.yaml ]; then
-        travis_retry cabal install || exit 1
-        travis_retry cabal haddock || exit 1
-      else
-        travis_retry stack build --fast --no-terminal --haddock --no-haddock-deps || exit 1
-      fi
+  # build
+  - stack build --fast --jobs=2 --test --no-run-tests --no-terminal --haddock --no-haddock-deps
+
+  # run test suite (CPU backend only)
+  # retry because the tests have intermittent failurs \:
+  - travis_retry stack test accelerate-fft:test-llvm-native --test-arguments='--timeout=30s --hedgehog-tests=50 --hedgehog-shrinks=0 --num-threads=1'
 
 after_success:
   - source .travis/update-accelerate-buildbot.sh

.travis.yml

@@ -6,14 +6,33 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and the
 project adheres to the [Haskell Package Versioning
 Policy (PVP)](https://pvp.haskell.org)
 
+## [1.2.0.0] - 2018-04-03
+### Changed
+  * update for AoS representation of complex numbers
+  * improve pure FFT implementation
+
+### Contributors
+
+Special thanks to those who contributed patches as part of this release:
+
+  * Trevor L. McDonell (@tmcdonell)
+  * Rinat Striungis (@Haskell-mouse)
+
+
 ## [1.1.0.0] - 2017-09-21
-  * [#5]: fix to ignore `sh` parameter in inverse mode
+### Changed
+  * build against FFTW and cuFFT foreign implementations by default
+
+### Fixed
+  * fix to ignore `sh` parameter in inverse mode ([#5])
+
+### Removed
   * Drop support for (deprecated) `accelerate-cuda` backend
-  * Build against FFTW and CUFFT foreign implementations by default
 
 
 ## 1.0.0.0 - 2017-03-31
 
+[1.2.0.0]:          https://github.com/AccelerateHS/accelerate-fft/compare/1.1.0.0...1.2.0.0
 [1.1.0.0]:          https://github.com/AccelerateHS/accelerate-fft/compare/1.0.0.0...1.1.0.0
 
 [#5]:               https://github.com/AccelerateHS/accelerate-fft/pull/5