From 43aefa4b45932a6d8035e6a73d3eff88d196909c Mon Sep 17 00:00:00 2001 From: David Johnson Date: Tue, 5 Nov 2019 01:34:16 -0500 Subject: [PATCH] Add .travis.yml - use haskell-ci - download arrayfire installer and unpack to /opt/arrayfire/ - remove Ord tests from test suite - use shouldBeEps for comparing Array Double --- .travis.yml | 151 ++++++++++++++++++++++++++++++++++++ Setup.hs | 4 +- arrayfire.cabal | 12 +-- shell.nix | 4 + test/ArrayFire/ArithSpec.hs | 40 +++++++--- 5 files changed, 188 insertions(+), 23 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..7b6fecc --- /dev/null +++ b/.travis.yml @@ -0,0 +1,151 @@ +# This Travis job script has been generated by a script via +# +# haskell-ci 'travis' 'arrayfire.cabal' +# +# For more information, see https://github.com/haskell-CI/haskell-ci +# +# version: 0.3.20190814 +# +language: c +dist: xenial +sudo: required +git: + # whether to recursively clone submodules + submodules: false +cache: + directories: + - $HOME/.cabal/packages + - $HOME/.cabal/store +before_cache: + - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log + # remove files that are regenerated by 'cabal update' + - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.* + - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json + - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache + - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar + - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx + - rm -rfv $CABALHOME/packages/head.hackage +matrix: + include: + - compiler: ghc-8.8.1 + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}} + - compiler: ghc-8.6.5 + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}} + - compiler: ghc-8.4.4 + addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}} +before_install: + - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//') + - WITHCOMPILER="-w $HC" + - HCPKG="$HC-pkg" + - unset CC + - CABAL=/opt/ghc/bin/cabal + - CABALHOME=$HOME/.cabal + - export PATH="$CABALHOME/bin:$PATH" + - export LD_LIBRARY_PATH="/opt/arrayfire/lib64:$LD_LIBRARY_PATH" + - TOP=$(pwd) + - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')" + - echo $HCNUMVER + - CABAL="$CABAL -vnormal+nowrap+markoutput" + - set -o pipefail + - | + echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk + echo 'BEGIN { state = "output"; }' >> .colorful.awk + echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk + echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk + echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk + echo ' if (state == "cabal") {' >> .colorful.awk + echo ' print blue($0)' >> .colorful.awk + echo ' } else {' >> .colorful.awk + echo ' print $0' >> .colorful.awk + echo ' }' >> .colorful.awk + echo '}' >> .colorful.awk + - cat .colorful.awk + - | + color_cabal_output () { + awk -f $TOP/.colorful.awk + } + - echo text | color_cabal_output +install: + - echo "Downloading ArrayFire-3.6.4" + - curl -O http://arrayfire.s3.amazonaws.com/3.6.4/ArrayFire-v3.6.4_Linux_x86_64.sh + - chmod +x ArrayFire-v3.6.4_Linux_x86_64.sh + - ./ArrayFire-v3.6.4_Linux_x86_64.sh --include-subdir --prefix=/opt + - ls -lah /opt/arrayfire/ + - ${CABAL} --version + - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]" + - TEST=--enable-tests + - BENCH=--enable-benchmarks + - HEADHACKAGE=false + - rm -f $CABALHOME/config + - | + echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config + echo "remote-build-reporting: anonymous" >> $CABALHOME/config + echo "write-ghc-environment-files: always" >> $CABALHOME/config + echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config + echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config + echo "world-file: $CABALHOME/world" >> $CABALHOME/config + echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config + echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config + echo "installdir: $CABALHOME/bin" >> $CABALHOME/config + echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config + echo "store-dir: $CABALHOME/store" >> $CABALHOME/config + echo "install-dirs user" >> $CABALHOME/config + echo " prefix: $CABALHOME" >> $CABALHOME/config + echo "repository hackage.haskell.org" >> $CABALHOME/config + echo " url: http://hackage.haskell.org/" >> $CABALHOME/config + - cat $CABALHOME/config + - rm -fv cabal.project cabal.project.local cabal.project.freeze + - travis_retry ${CABAL} v2-update -v + # Generate cabal.project + - rm -rf cabal.project cabal.project.local cabal.project.freeze + - touch cabal.project + - | + echo "packages: ." >> cabal.project + - | + - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(arrayfire)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" + - cat cabal.project || true + - cat cabal.project.local || true + - ${CABAL} install $WITHCOMPILER hspec-discover | color_cabal_output # needed on $PATH for tests + - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi + - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output + - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'" + - rm cabal.project.freeze + - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output + - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output +script: + - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX) + # Packaging... + - ${CABAL} v2-sdist all | color_cabal_output + # Unpacking... + - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/ + - cd ${DISTDIR} || false + - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \; + - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \; + - PKGDIR_arrayfire="$(find . -maxdepth 1 -type d -regex '.*/arrayfire-[0-9.]*')" + # Generate cabal.project + - rm -rf cabal.project cabal.project.local cabal.project.freeze + - touch cabal.project + - | + echo "packages: ${PKGDIR_arrayfire}" >> cabal.project + - | + - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(arrayfire)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" + - cat cabal.project || true + - cat cabal.project.local || true + # Building... + # this builds all libraries and executables (without tests/benchmarks) + - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output + # Building with tests and benchmarks... + # build & run tests, build benchmarks + - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output + # Testing... + - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output + # cabal check... + - (cd ${PKGDIR_arrayfire} && ${CABAL} -vnormal check) + # haddock... + - ${CABAL} v2-haddock $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output + # Building without installed constraints for packages in global-db... + - rm -f cabal.project.local + - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output + +# REGENDATA ["travis","arrayfire.cabal"] +# EOF diff --git a/Setup.hs b/Setup.hs index c0bc21b..cd7b151 100644 --- a/Setup.hs +++ b/Setup.hs @@ -1,6 +1,6 @@ module Main where -import Distribution.Extra.Doctest (defaultMainWithDoctests) +import Distribution.Simple main :: IO () -main = defaultMainWithDoctests "doctests" +main = defaultMain diff --git a/arrayfire.cabal b/arrayfire.cabal index 9f9a079..723cc93 100644 --- a/arrayfire.cabal +++ b/arrayfire.cabal @@ -8,25 +8,20 @@ author: David Johnson maintainer: djohnson.m@gmail.com copyright: David Johnson (c) 2018-2020 category: Math -build-type: Custom +build-type: Simple extra-source-files: CHANGELOG.md cabal-version: >=1.10 description: High-level Haskell bindings to the ArrayFire General-purpose GPU library . <> . +tested-with: GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.1 flag disable-default-paths description: When enabled, don't add default hardcoded include/link dirs by default. Needed for hermetic builds like in nix. default: False manual: True -custom-setup - setup-depends: - base <5, - Cabal, - cabal-doctest >=1 && <1.1 - library exposed-modules: ArrayFire @@ -94,9 +89,8 @@ library include-dirs: /opt/arrayfire/include extra-lib-dirs: + /opt/arrayfire/lib64 /opt/arrayfire/lib - ld-options: - -Wl,-rpath /opt/arrayfire/lib executable main hs-source-dirs: diff --git a/shell.nix b/shell.nix index 8abcfde..3eb7b4c 100644 --- a/shell.nix +++ b/shell.nix @@ -16,6 +16,10 @@ in 'cabal v1-configure --enable-tests && \ cabal v1-build test && dist/build/test/test' } + function test () { + cabal v1-configure --enable-tests && \ + cabal v1-build test && dist/build/test/test + } function doctest-runner () { ${pkgs.ag}/bin/ag -l | \ ${pkgs.entr}/bin/entr sh -c \ diff --git a/test/ArrayFire/ArithSpec.hs b/test/ArrayFire/ArithSpec.hs index d0eb16b..a858462 100644 --- a/test/ArrayFire/ArithSpec.hs +++ b/test/ArrayFire/ArithSpec.hs @@ -6,6 +6,9 @@ import Prelude hiding (sqrt, div, and, or, not, isNaN) import Test.Hspec import Foreign.C +import qualified ArrayFire as A +import qualified System.Exit as E + spec :: Spec spec = describe "Arith tests" $ do @@ -20,25 +23,21 @@ spec = it "Should subtract two scalar arrays" $ do scalar @Int 4 - 2 `shouldBe` 2 it "Should multiply two scalar arrays" $ do - scalar @Double 4 `mul` 2 `shouldBe` 8 + scalar @Double 4 `mul` 2 `shouldBeEps` 8 it "Should divide two scalar arrays" $ do - div @Double 8 2 `shouldBe` 4 + div @Double 8 2 `shouldBeEps` 4 it "Should add two matrices" $ do matrix @Int (2,2) [[1,1],[1,1]] + matrix @Int (2,2) [[1,1],[1,1]] `shouldBe` matrix @Int (2,2) [[2,2],[2,2]] it "Should take cubed root" $ do - 3 `shouldBe` cbrt @Double 27 + 3 `shouldBeEps` cbrt @Double 27 it "Should take square root" $ do - 2 `shouldBe` sqrt @Double 4 - it "Should lt Array" $ do - 2 < (3 :: Array Double) `shouldBe` True - it "Should lte Array" $ do - 2 <= (3 :: Array Double) `shouldBe` True - it "Should gte Array" $ do - 2 >= (3 :: Array Double) `shouldBe` False - it "Should gt Array" $ do - 2 > (3 :: Array Double) `shouldBe` False + 2 `shouldBeEps` sqrt @Double 4 + --it "Should lt Array" $ do + -- 2 `A.lt` (3 :: Array Double) `shouldBe` 1 + --it "Should gt Array" $ do + -- 2 `A.gt` (3 :: Array Double) `shouldBe` 1 it "Should eq Array" $ do 3 == (3 :: Array Double) `shouldBe` True it "Should and Array" $ do @@ -94,3 +93,20 @@ spec = isZero (scalar @Double (acos 2)) `shouldBe` scalar @Double 0 isZero (scalar @Double 0) `shouldBe` scalar @Double 1 isZero (scalar @Double 1) `shouldBe` scalar @Double 0 + +shouldBeEps :: Array Double -> Array Double -> Expectation +actual `shouldBeEps` expected = expect err_msg (cmpEps actual expected) + where + err_msg = "expected: " ++ show expected ++ "\n but got: " ++ show actual + cmpEps :: Array Double -> Array Double -> Bool + cmpEps a b = + let x :: Double + x = getScalar $ Prelude.abs $ a - b + in x <= 1e-14 + +expect :: String -> Bool -> Expectation +expect label f = if f + then pure () + else do + putStrLn label + E.exitFailure