diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,3 +1,2 @@ # hw-simd -[![CircleCI](https://circleci.com/gh/haskell-works/hw-simd.svg?style=svg)](https://circleci.com/gh/haskell-works/hw-simd) -[![Travis](https://travis-ci.org/haskell-works/hw-simd.svg?branch=master)](https://travis-ci.org/haskell-works/hw-simd) +[![Binaries](https://github.com/haskell-works/hw-simd/actions/workflows/haskell.yml/badge.svg)](https://github.com/haskell-works/hw-simd/actions/workflows/haskell.yml) diff --git a/bench/Main.hs b/bench/Main.hs --- a/bench/Main.hs +++ b/bench/Main.hs @@ -3,11 +3,11 @@ import Control.Monad import Criterion.Main import Data.Char -import Data.List import Data.Word import HaskellWorks.Data.Vector.AsVector64s import qualified Data.ByteString.Lazy as LBS +import qualified Data.List as L import qualified Data.Vector.Storable as DVS import qualified HaskellWorks.Data.Simd.Capabilities as CAP import qualified HaskellWorks.Data.Simd.Comparison.Avx2 as AVX2 @@ -41,7 +41,7 @@ benchcmpEqWord8s :: IO [Benchmark] benchcmpEqWord8s = do entries <- IO.listDirectory "data/bench" - let files = ("data/bench/" ++) <$> (".csv" `isSuffixOf`) `filter` entries + let files = ("data/bench/" ++) <$> (".csv" `L.isSuffixOf`) `filter` entries benchmarks <- forM files $ \file -> return $ [ env (LBS.readFile file) $ \bs -> bgroup file [ bench ("hw-simd/cmpEqWord8s/avx2/" <> file) (nfIO (runCmpEqWord8sAvx2 bs)) @@ -53,7 +53,7 @@ benchAndBits :: IO [Benchmark] benchAndBits = do entries <- IO.listDirectory "data/bench" - let files = ("data/bench/" ++) <$> (".csv" `isSuffixOf`) `filter` entries + let files = ("data/bench/" ++) <$> (".csv" `L.isSuffixOf`) `filter` entries benchmarks <- forM files $ \file -> return $ [ env (LBS.readFile file) $ \bs -> bgroup file [ bench ("hw-simd/andBits/avx2/" <> file) (nfIO (runAndBitsAvx2 bs)) diff --git a/hw-simd.cabal b/hw-simd.cabal --- a/hw-simd.cabal +++ b/hw-simd.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: hw-simd -version: 0.1.2.0 +version: 0.1.2.1 synopsis: SIMD library description: Please see the README on Github at category: Data, Bit, SIMD @@ -9,10 +9,10 @@ bug-reports: https://github.com/haskell-works/hw-simd/issues author: John Ky maintainer: newhoggy@gmail.com -copyright: 2018-2020 John Ky +copyright: 2018-2021 John Ky license: BSD-3-Clause license-file: LICENSE -tested-with: GHC == 8.10.1, GHC == 8.8.3, GHC == 8.6.5, GHC == 8.4.4 +tested-with: GHC == 9.2.2, GHC == 9.0.2, GHC == 8.10.7, GHC == 8.8.4, GHC == 8.6.5 build-type: Simple extra-source-files: README.md ChangeLog.md @@ -41,15 +41,15 @@ common base { build-depends: base >= 4.11 && < 5 } common bits-extra { build-depends: bits-extra >= 0.0.1.2 && < 0.1 } -common bytestring { build-depends: bytestring >= 0.10 && < 0.11 } +common bytestring { build-depends: bytestring >= 0.10 && < 0.12 } common cassava { build-depends: cassava >= 0.5.1.0 && < 0.6 } common containers { build-depends: containers >= 0.5 && < 0.7 } common criterion { build-depends: criterion >= 1.4.1.0 && < 1.6 } common deepseq { build-depends: deepseq >= 1.4 && < 1.5 } common directory { build-depends: directory >= 1.2.2 && < 1.4 } -common doctest { build-depends: doctest >= 0.16.2 && < 0.17 } +common doctest { build-depends: doctest >= 0.16.2 && < 0.21 } common doctest-discover { build-depends: doctest-discover >= 0.2 && < 0.3 } -common hedgehog { build-depends: hedgehog >= 0.5 && < 1.1 } +common hedgehog { build-depends: hedgehog >= 0.5 && < 1.2 } common hspec { build-depends: hspec >= 2.4 && < 3 } common hw-bits { build-depends: hw-bits >= 0.7.0.2 && < 0.8 } common hw-hedgehog { build-depends: hw-hedgehog >= 0.1.0.1 && < 0.2 } @@ -57,10 +57,10 @@ common hw-prim { build-depends: hw-prim >= 0.6.2.12 && < 0.7 } common hw-rankselect { build-depends: hw-rankselect >= 0.13 && < 0.14 } common hw-rankselect-base { build-depends: hw-rankselect-base >= 0.3.2.0 && < 0.4 } -common lens { build-depends: lens >= 4 && < 5 } +common lens { build-depends: lens >= 4 && < 6 } common mmap { build-depends: mmap >= 0.5.9 && < 0.6 } -common text { build-depends: text >= 1.2.2 && < 2.0 } -common transformers { build-depends: transformers >= 0.4 && < 0.6 } +common text { build-depends: text >= 1.2.2 && < 2.1 } +common transformers { build-depends: transformers >= 0.4 && < 0.7 } common vector { build-depends: vector >= 0.12.0.1 && < 0.13 } common config @@ -170,7 +170,7 @@ , doctest-discover , hw-simd type: exitcode-stdio-1.0 - ghc-options: -threaded + ghc-options: -threaded -rtsopts -with-rtsopts=-N main-is: DoctestDriver.hs HS-Source-Dirs: doctest build-tool-depends: doctest-discover:doctest-discover diff --git a/src/HaskellWorks/Data/Simd/Comparison/Avx2.hs b/src/HaskellWorks/Data/Simd/Comparison/Avx2.hs --- a/src/HaskellWorks/Data/Simd/Comparison/Avx2.hs +++ b/src/HaskellWorks/Data/Simd/Comparison/Avx2.hs @@ -20,7 +20,7 @@ import qualified HaskellWorks.Data.Vector.AsVector8 as V import qualified HaskellWorks.Data.Vector.Storable as DVS -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} +{- HLINT ignore "Redundant do" -} class CmpEqWord8s a where type Target a diff --git a/src/HaskellWorks/Data/Simd/Internal/Marshal.hs b/src/HaskellWorks/Data/Simd/Internal/Marshal.hs --- a/src/HaskellWorks/Data/Simd/Internal/Marshal.hs +++ b/src/HaskellWorks/Data/Simd/Internal/Marshal.hs @@ -7,7 +7,7 @@ import qualified Data.Vector.Storable as DVS import qualified Foreign.ForeignPtr as F -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} +{- HLINT ignore "Redundant do" -} unsafeToElemSizedForeignPtr :: Int -> DVS.Vector Word64 -> (F.ForeignPtr Word8, Int, Int) unsafeToElemSizedForeignPtr elemSize v = case DVS.unsafeCast v :: DVS.Vector Word8 of diff --git a/src/HaskellWorks/Data/Simd/Logical/Avx2.hs b/src/HaskellWorks/Data/Simd/Logical/Avx2.hs --- a/src/HaskellWorks/Data/Simd/Logical/Avx2.hs +++ b/src/HaskellWorks/Data/Simd/Logical/Avx2.hs @@ -11,8 +11,8 @@ import qualified Foreign.Ptr as F import qualified HaskellWorks.Data.Simd.Internal.Foreign as F -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} +{- HLINT ignore "Redundant do" -} +{- HLINT ignore "Reduce duplication" -} class XorBits a where xorBits :: a -> a -> a diff --git a/test/HaskellWorks/Data/Simd/ComparisonSpec.hs b/test/HaskellWorks/Data/Simd/ComparisonSpec.hs --- a/test/HaskellWorks/Data/Simd/ComparisonSpec.hs +++ b/test/HaskellWorks/Data/Simd/ComparisonSpec.hs @@ -19,9 +19,9 @@ import qualified Hedgehog.Gen as G import qualified Hedgehog.Range as R -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} -{-# ANN module ("HLint: ignore Redundant bracket" :: String) #-} +{- HLINT ignore "Redundant do" -} +{- HLINT ignore "Redundant bracket" -} +{- HLINT ignore "Reduce duplication" -} spec :: Spec spec = describe "HaskellWorks.Data.Simd.ComparisonSpec" $ do diff --git a/test/HaskellWorks/Data/Simd/Internal/BroadwordSpec.hs b/test/HaskellWorks/Data/Simd/Internal/BroadwordSpec.hs --- a/test/HaskellWorks/Data/Simd/Internal/BroadwordSpec.hs +++ b/test/HaskellWorks/Data/Simd/Internal/BroadwordSpec.hs @@ -12,9 +12,9 @@ import Hedgehog import Test.Hspec -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} -{-# ANN module ("HLint: ignore Redundant bracket" :: String) #-} +{- HLINT ignore "Redundant do" -} +{- HLINT ignore "Redundant bracket" -} +{- HLINT ignore "Reduce duplication" -} spec :: Spec spec = describe "HaskellWorks.Data.Simd.Internal.BroadwordSpec" $ do diff --git a/test/HaskellWorks/Data/Simd/LogicalSpec.hs b/test/HaskellWorks/Data/Simd/LogicalSpec.hs --- a/test/HaskellWorks/Data/Simd/LogicalSpec.hs +++ b/test/HaskellWorks/Data/Simd/LogicalSpec.hs @@ -15,9 +15,9 @@ import qualified Hedgehog.Gen as G import qualified Hedgehog.Range as R -{-# ANN module ("HLint: ignore Redundant do" :: String) #-} -{-# ANN module ("HLint: ignore Reduce duplication" :: String) #-} -{-# ANN module ("HLint: ignore Redundant bracket" :: String) #-} +{- HLINT ignore "Redundant do" -} +{- HLINT ignore "Redundant bracket" -} +{- HLINT ignore "Reduce duplication" -} spec :: Spec spec = describe "HaskellWorks.Data.Simd.LogicalSpec" $ do