hspec -> hspec-discover

Author: dmjio

.github/workflows/ci.yml

@@ -25,4 +25,4 @@ jobs:
         run: nix develop --command bash -c 'cabal update'
 
       - name: Build and run tests
-        run: nix develop --command bash -c 'cabal install hspec-discover && cabal test'
+        run: nix develop --command bash -c 'cabal install && cabal test'

src/ArrayFire/Data.hs

@@ -303,7 +303,7 @@ identity dims = unsafePerformIO . mask_ $ do
 --    1.0000     0.0000
 --    0.0000     2.0000
 diagCreate
-  :: AFType (a :: *)
+  :: AFType a
   => Array a
   -- ^	is the input array which is the diagonal
   -> Int
@@ -320,7 +320,7 @@ diagCreate x (fromIntegral -> n) =
 --     1.0000
 --     4.0000
 diagExtract
-  :: AFType (a :: *)
+  :: AFType a
   => Array a
   -> Int
   -> Array a
@@ -339,7 +339,7 @@ diagExtract x (fromIntegral -> n) =
 --
 join
   :: Int
-  -> Array (a :: *)
+  -> Array a
   -> Array a
   -> Array a
 join (fromIntegral -> n) arr1 arr2 = op2 arr1 arr2 (\p a b -> af_join p n a b)
@@ -385,7 +385,7 @@ withManyForeignPtr fptrs action = go [] fptrs
 -- 22.0000    22.0000    22.0000    22.0000    22.0000
 --
 tile
-  :: Array (a :: *)
+  :: Array a
   -> [Int]
   -> Array a
 tile a (take 4 . (++repeat 1) -> [x,y,z,w]) =
@@ -406,7 +406,7 @@ tile _ _ = error "impossible"
 -- 22.0000    22.0000    22.0000    22.0000    22.0000
 --
 reorder
-  :: Array (a :: *)
+  :: Array a
   -> [Int]
   -> Array a
 reorder a (take 4 . (++ repeat 0) -> [x,y,z,w]) =
@@ -424,7 +424,7 @@ reorder _ _ = error "impossible"
 --     2.0000
 --
 shift
-  :: Array (a :: *)
+  :: Array a
   -> Int
   -> Int
   -> Int
@@ -441,8 +441,7 @@ shift a (fromIntegral -> x) (fromIntegral -> y) (fromIntegral -> z) (fromIntegra
 --     1.0000     2.0000     3.0000
 --
 moddims
-  :: forall a
-   . Array (a :: *)
+  :: Array a
   -> [Int]
   -> Array a
 moddims (Array fptr) dims =

src/ArrayFire/Image.hs

@@ -25,7 +25,6 @@ import Data.Word
 import ArrayFire.Internal.Types
 import ArrayFire.Internal.Image
 import ArrayFire.FFI
-import ArrayFire.Arith
 
 -- | Calculates the gradient of an image
 --

src/ArrayFire/Index.hs

@@ -18,7 +18,6 @@ import ArrayFire.FFI
 import ArrayFire.Exception
 
 import Foreign
-import Foreign.ForeignPtr (touchForeignPtr)
 
 import System.IO.Unsafe
 import Control.Exception

src/ArrayFire/Orphans.hs

@@ -23,7 +23,6 @@ import           Control.DeepSeq (NFData(..))
 import qualified ArrayFire.Arith     as A
 import qualified ArrayFire.Array     as A
 import qualified ArrayFire.Algorithm as A
-import qualified ArrayFire.Data      as A
 import           ArrayFire.Types
 import           ArrayFire.Util
 

test/ArrayFire/StatisticsSpec.hs

@@ -80,7 +80,9 @@ spec =
       let (m, v) = meanVar (vector @Double 4 [1,2,3,4]) VarianceSample 0
       m `shouldBe` scalar @Double 2.5
       -- sample variance of [1,2,3,4] = 5/3 ≈ 1.6667
-      head (toList v) `shouldBeApprox` (5.0/3.0 :: Double)
+      case listToMaybe (toList v) of
+        Just k -> k `shouldBeApprox` (5.0/3.0)
+        _ -> error "failure"
     it "Should compute weighted mean and variance together" $ do
       let uniform = vector @Double 4 (repeat 1.0)
           (m, v)  = meanVarWeighted (vector @Double 4 [1,2,3,4]) uniform VariancePopulation 0