Bump version, NOINLINE.

Author: dmjio

arrayfire.cabal

@@ -1,6 +1,6 @@
 cabal-version:       3.0
 name:                arrayfire
-version:             0.7.1.0
+version:             0.8.0.0
 synopsis:            Haskell bindings to the ArrayFire general-purpose GPU library
 homepage:            https://github.com/arrayfire/arrayfire-haskell
 license:             BSD-3-Clause

src/ArrayFire/Algorithm.hs

@@ -667,11 +667,11 @@ setIntersect a1 a2 (fromIntegral . fromEnum -> b) =
 --
 -- >>> sumByKey (vector @Int 5 [1,1,2,2,2]) (vector @Double 5 [10,20,1,2,3]) 0
 -- (ArrayFire Array
--- [3 1 1 1]
---    1   2   3,
+-- [2 1 1 1]
+--    1   2,
 -- ArrayFire Array
--- [3 1 1 1]
---    30.0000   6.0000   ...)
+-- [2 1 1 1]
+--    30.0000   6.0000)
 sumByKey
   :: AFType a
   => Array Int

src/ArrayFire/Array.hs

@@ -479,7 +479,8 @@ isSparse a = toEnum . fromIntegral $ (a `infoFromArray` af_is_sparse)
 -- >>> toVector (vector @Double 10 [1..])
 -- [1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0,9.0,10.0]
 toVector :: forall a . AFType a => Array a -> Vector a
-toVector arr@(Array fptr) = do
+{-# NOINLINE toVector #-}
+toVector arr@(Array fptr) =
   unsafePerformIO . mask_ . withForeignPtr fptr $ \arrPtr -> do
     let len = getElements arr
         size = len * getSizeOf (Proxy @a)
@@ -500,6 +501,7 @@ toList = V.toList . toVector
 -- >>> getScalar (scalar @Double 22.0) :: Double
 -- 22.0
 getScalar :: forall a b . (Storable a, AFType b) => Array b -> a
+{-# NOINLINE getScalar #-}
 getScalar (Array fptr) =
   unsafePerformIO . mask_ . withForeignPtr fptr $ \arrPtr -> do
     alloca $ \ptr -> do

src/ArrayFire/Data.hs

@@ -63,6 +63,7 @@ constant
   -> a
   -- ^ Scalar value
   -> Array a
+{-# NOINLINE constant #-}
 constant dims val =
   case dtyp of
     x | x == c64 ->
@@ -210,8 +211,9 @@ range
   => [Int]
   -> Int
   -> Array a
-range dims (fromIntegral -> k) = unsafePerformIO $ do
-  ptr <- alloca $ \ptrPtr -> mask_ $ do
+{-# NOINLINE range #-}
+range dims (fromIntegral -> k) = unsafePerformIO . mask_ $ do
+  ptr <- alloca $ \ptrPtr -> do
     withArray (fromIntegral <$> dims) $ \dimArray -> do
       throwAFError =<< af_range ptrPtr n dimArray k typ
       peek ptrPtr
@@ -252,10 +254,11 @@ iota
   -- ^ is array containing the number of repetitions of the unit dimensions
   -> Array a
   -- ^ is the generated array
-iota dims tdims = unsafePerformIO $ do
+{-# NOINLINE iota #-}
+iota dims tdims = unsafePerformIO . mask_ $ do
   let dims' = take 4 (dims ++ repeat 1)
       tdims' =  take 4 (tdims ++ repeat 1)
-  ptr <- alloca $ \ptrPtr -> mask_ $ do
+  ptr <- alloca $ \ptrPtr -> do
     zeroOutArray ptrPtr
     withArray (fromIntegral <$> dims') $ \dimArray ->
       withArray (fromIntegral <$> tdims') $ \tdimArray -> do
@@ -280,6 +283,7 @@ identity
   => [Int]
   -- ^ Dimensions
   -> Array a
+{-# NOINLINE identity #-}
 identity dims = unsafePerformIO . mask_ $ do
   let dims' = take 4 (dims ++ repeat 1)
   ptr <- alloca $ \ptrPtr -> mask_ $ do
@@ -357,6 +361,7 @@ joinMany
   :: Int
   -> [Array a]
   -> Array a
+{-# NOINLINE joinMany #-}
 joinMany (fromIntegral -> n) (fmap (\(Array fp) -> fp) -> arrays) = unsafePerformIO . mask_ $ do
   newPtr <- alloca $ \aPtr -> do
     zeroOutArray aPtr
@@ -444,6 +449,7 @@ moddims
   :: Array a
   -> [Int]
   -> Array a
+{-# NOINLINE moddims #-}
 moddims (Array fptr) dims =
   unsafePerformIO . mask_ . withForeignPtr fptr $ \ptr -> do
     newPtr <- alloca $ \aPtr -> do

src/ArrayFire/Features.hs

@@ -17,6 +17,7 @@
 --------------------------------------------------------------------------------
 module ArrayFire.Features where
 
+import Control.Exception (mask_)
 import Foreign.Marshal
 import Foreign.Storable
 import Foreign.ForeignPtr
@@ -34,8 +35,9 @@ import ArrayFire.Exception
 createFeatures
   :: Int
   -> Features
+{-# NOINLINE createFeatures #-}
 createFeatures (fromIntegral -> n) =
-  unsafePerformIO $ do
+  unsafePerformIO . mask_ $ do
     ptr <-
       alloca $ \ptrInput -> do
         throwAFError =<< ptrInput `af_create_features` n

src/ArrayFire/Index.hs

@@ -29,6 +29,7 @@ index
   -> [Seq]
   -- ^ 'Seq' to use for indexing
   -> Array a
+{-# NOINLINE index #-}
 index (Array fptr) seqs =
   unsafePerformIO . mask_ . withForeignPtr fptr $ \ptr -> do
     alloca $ \aptr ->
@@ -66,6 +67,7 @@ assignSeq
   -- ^ Source array
   -> Array a
   -- ^ Result with values written at the specified indices
+{-# NOINLINE assignSeq #-}
 assignSeq (Array fptr) seqs (Array rhsFptr) =
   unsafePerformIO . mask_ $
     withForeignPtr fptr $ \ptr ->
@@ -90,6 +92,7 @@ indexGen
   -- ^ List of 'Index' values (one per dimension)
   -> Array a
   -- ^ Indexed result
+{-# NOINLINE indexGen #-}
 indexGen (Array fptr) indices =
   unsafePerformIO . mask_ $
     withForeignPtr fptr $ \ptr -> do
@@ -120,6 +123,7 @@ assignGen
   -- ^ Source array
   -> Array a
   -- ^ Result with values written at the specified indices
+{-# NOINLINE assignGen #-}
 assignGen (Array fptr) indices (Array rhsFptr) =
   unsafePerformIO . mask_ $
     withForeignPtr fptr $ \ptr ->

src/ArrayFire/Util.hs

@@ -258,6 +258,7 @@ arrayToString
   -- ^ If 'True', performs takes the transpose before rendering to 'String'
   -> String
   -- ^ 'Array' rendered to 'String'
+{-# NOINLINE arrayToString #-}
 arrayToString expr (Array fptr) (fromIntegral -> prec) (fromIntegral . fromEnum -> trans) =
   unsafePerformIO . mask_ . withForeignPtr fptr $ \aptr ->
     withCString expr $ \expCstr ->
@@ -279,6 +280,7 @@ getSizeOf
   -- ^ Witness of Haskell type that mirrors ArrayFire type.
   -> Int
   -- ^ Size of ArrayFire type
+{-# NOINLINE getSizeOf #-}
 getSizeOf proxy =
   unsafePerformIO . mask_ . alloca $ \csize -> do
     throwAFError =<< af_get_size_of csize (afType proxy)

src/ArrayFire/Vision.hs

@@ -50,6 +50,7 @@ fast
   -- ^ Is the length of the edges in the image to be discarded by FAST (minimum is 3, as the radius of the circle)
   -> Features
   -- ^ Struct containing arrays for x and y coordinates and score, while array orientation is set to 0 as FAST does not compute orientation, and size is set to 1 as FAST does not compute multiple scales
+{-# NOINLINE fast #-}
 fast (Array fptr) thr (fromIntegral -> arc) (fromIntegral . fromEnum -> non) ratio (fromIntegral -> edge)
   = unsafePerformIO . mask_ . withForeignPtr fptr $ \aptr ->
       do feat <- alloca $ \ptr -> do
@@ -78,6 +79,7 @@ harris
   -> Float
   -- ^ struct containing arrays for x and y coordinates and score (Harris response), while arrays orientation and size are set to 0 and 1, respectively, because Harris does not compute that information
   -> Features
+{-# NOINLINE harris #-}
 harris (Array fptr) (fromIntegral -> maxc) minresp sigma (fromIntegral -> bs) thr
   = unsafePerformIO . mask_ . withForeignPtr fptr $ \aptr ->
       do feat <- alloca $ \ptr -> do
@@ -107,6 +109,7 @@ orb
   -- ^ blur image with a Gaussian filter with sigma=2 before computing descriptors to increase robustness against noise if true
   -> (Features, Array a)
   -- ^ 'Features' struct composed of arrays for x and y coordinates, score, orientation and size of selected features
+{-# NOINLINE orb #-}
 orb (Array fptr) thr (fromIntegral -> feat) scl (fromIntegral -> levels) (fromIntegral . fromEnum -> blur)
   = unsafePerformIO . mask_ . withForeignPtr fptr $ \inptr ->
       do (feature, arr) <-
@@ -144,6 +147,7 @@ sift
   -> (Features, Array a)
   -- ^ Features object composed of arrays for x and y coordinates, score, orientation and size of selected features
   -- Nx128 array containing extracted descriptors, where N is the number of features found by SIFT
+{-# NOINLINE sift #-}
 sift (Array fptr) (fromIntegral -> a) b c d (fromIntegral . fromEnum -> e) f g
   = unsafePerformIO . mask_ . withForeignPtr fptr $ \inptr ->
       do (feat, arr) <-
@@ -181,6 +185,7 @@ gloh
   -> (Features, Array a)
   -- ^ 'Features' object composed of arrays for x and y coordinates, score, orientation and size of selected features
   -- ^ Nx272 array containing extracted GLOH descriptors, where N is the number of features found by SIFT
+{-# NOINLINE gloh #-}
 gloh (Array fptr) (fromIntegral -> a) b c d (fromIntegral . fromEnum -> e) f g
   = unsafePerformIO . mask_ . withForeignPtr fptr $ \inptr ->
       do (feat, arr) <-
@@ -274,6 +279,7 @@ susan
   -> Int
   -- ^ indicates how many pixels width area should be skipped for corner detection
   -> Features
+{-# NOINLINE susan #-}
 susan (Array fptr) (fromIntegral -> a) b c d (fromIntegral -> e)
   = unsafePerformIO . mask_ . withForeignPtr fptr $ \inptr ->
       do feat <-
@@ -329,6 +335,7 @@ homography
  -> (Int, Array a)
  -- ^ is a 3x3 array containing the estimated homography.
  -- is the number of inliers that the homography was estimated to comprise, in the case that htype is AF_HOMOGRAPHY_RANSAC, a higher inlier_thr value will increase the estimated inliers. Note that if the number of inliers is too low, it is likely that a bad homography will be returned.
+{-# NOINLINE homography #-}
 homography
   (Array a)
   (Array b)