-
Notifications
You must be signed in to change notification settings - Fork 145
Implement Applicative based API #522
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
3ed0df2
Implement functions which use Applicatives
Shimuuar 503f524
First version of benchmarks for applicative functions
Shimuuar 8b1be88
Implement STA optimization trick as an optimization
Shimuuar a08bf3d
Update vector/src/Data/Vector/Generic.hs
Shimuuar 10d112d
We don't need to return vector in STA
Shimuuar 49503fc
Add rewrite rules for IO, ST, and Identity
Shimuuar a6bd2a5
Add function which discard result of applicative action
Shimuuar 9881b63
Put Applicative in first place in context
Shimuuar 37b674c
Add reexports
Shimuuar 701f0a4
Update changelog
Shimuuar 36f86e3
Add tests
Shimuuar 341c230
Fix handling of negative sizes for generateA
Shimuuar cc5725f
Use liftA2
Shimuuar e1d2688
Use new traverse for Traversable instances
Shimuuar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| {-# LANGUAGE RankNTypes #-} | ||
| {-# LANGUAGE ScopedTypeVariables #-} | ||
| -- | | ||
| -- This module provides benchmarks for functions which use API based | ||
| -- on applicative. We use @generateA@ based benchmark for state and IO | ||
| -- and also benchmark folds and mapping using lens since it's one of | ||
| -- important consumers of this API. | ||
| module Bench.Vector.Algo.Applicative | ||
| ( -- * Standard benchmarks | ||
| generateState | ||
| , generateStateUnfold | ||
| , generateIO | ||
| , generateIOPrim | ||
| -- * Lens benchmarks | ||
| , lensSum | ||
| , baselineSum | ||
| , lensMap | ||
| , baselineMap | ||
| ) where | ||
|
|
||
| import Control.Applicative | ||
| import Data.Coerce | ||
| import Data.Functor.Identity | ||
| import Data.Int | ||
| import Data.Monoid | ||
| import Data.Word | ||
| import qualified Data.Vector.Generic as VG | ||
| import qualified Data.Vector.Generic.Mutable as MVG | ||
| import qualified Data.Vector.Unboxed as VU | ||
| import System.Random.Stateful | ||
| import System.Mem (getAllocationCounter) | ||
|
|
||
| -- | Benchmark which is running in state monad. | ||
| generateState :: Int -> VU.Vector Word64 | ||
| generateState n | ||
| = runStateGen_ (mkStdGen 42) | ||
| $ \g -> VG.generateA n (\_ -> uniformM g) | ||
|
|
||
| -- | Benchmark which is running in state monad. | ||
| generateStateUnfold :: Int -> VU.Vector Word64 | ||
| generateStateUnfold n = VU.unfoldrExactN n genWord64 (mkStdGen 42) | ||
|
|
||
| -- | Benchmark for running @generateA@ in IO monad. | ||
| generateIO :: Int -> IO (VU.Vector Int64) | ||
| generateIO n = VG.generateA n (\_ -> getAllocationCounter) | ||
|
|
||
| -- | Baseline for 'generateIO' it uses primitive operations | ||
| generateIOPrim :: Int -> IO (VU.Vector Int64) | ||
| generateIOPrim n = VG.unsafeFreeze =<< MVG.replicateM n getAllocationCounter | ||
|
|
||
| -- | Sum using lens | ||
| lensSum :: VU.Vector Double -> Double | ||
| {-# NOINLINE lensSum #-} | ||
| lensSum = foldlOf' VG.traverse (+) 0 | ||
|
|
||
| -- | Baseline for sum. | ||
| baselineSum :: VU.Vector Double -> Double | ||
| {-# NOINLINE baselineSum #-} | ||
| baselineSum = VU.sum | ||
|
|
||
| -- | Mapping over vector elements using | ||
| lensMap :: VU.Vector Double -> VU.Vector Double | ||
| {-# NOINLINE lensMap #-} | ||
| lensMap = over VG.traverse (*2) | ||
|
|
||
| -- | Baseline for map | ||
| baselineMap :: VU.Vector Double -> VU.Vector Double | ||
| {-# NOINLINE baselineMap #-} | ||
| baselineMap = VU.map (*2) | ||
|
|
||
| ---------------------------------------------------------------- | ||
| -- Bits and pieces of lens | ||
| -- | ||
| -- We don't want to depend on lens so we just copy relevant | ||
| -- parts. After all we don't need much | ||
| ---------------------------------------------------------------- | ||
|
|
||
| type ASetter s t a b = (a -> Identity b) -> s -> Identity t | ||
| type Getting r s a = (a -> Const r a) -> s -> Const r s | ||
|
|
||
| foldlOf' :: Getting (Endo (Endo r)) s a -> (r -> a -> r) -> r -> s -> r | ||
| foldlOf' l f z0 = \xs -> | ||
| let f' x (Endo k) = Endo $ \z -> k $! f z x | ||
| in foldrOf l f' (Endo id) xs `appEndo` z0 | ||
| {-# INLINE foldlOf' #-} | ||
|
|
||
| foldrOf :: Getting (Endo r) s a -> (a -> r -> r) -> r -> s -> r | ||
| foldrOf l f z = flip appEndo z . foldMapOf l (Endo #. f) | ||
| {-# INLINE foldrOf #-} | ||
|
|
||
| foldMapOf :: Getting r s a -> (a -> r) -> s -> r | ||
| foldMapOf = coerce | ||
| {-# INLINE foldMapOf #-} | ||
|
|
||
| ( #. ) :: Coercible c b => (b -> c) -> (a -> b) -> (a -> c) | ||
| ( #. ) _ = coerce (\x -> x :: b) :: forall a b. Coercible b a => a -> b | ||
| {-# INLINE (#.) #-} | ||
|
|
||
| over :: ASetter s t a b -> (a -> b) -> s -> t | ||
| over = coerce | ||
| {-# INLINE over #-} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -156,6 +156,10 @@ module Data.Vector ( | |||||
| scanr, scanr', scanr1, scanr1', | ||||||
| iscanr, iscanr', | ||||||
|
|
||||||
| -- * Applicative API | ||||||
| replicateA, generateA, traverse, itraverse, forA, iforA, | ||||||
| traverse_, itraverse_, forA_, iforA_, | ||||||
|
|
||||||
| -- ** Comparisons | ||||||
| eqBy, cmpBy, | ||||||
|
|
||||||
|
|
@@ -174,6 +178,7 @@ module Data.Vector ( | |||||
| freeze, thaw, copy, unsafeFreeze, unsafeThaw, unsafeCopy | ||||||
| ) where | ||||||
|
|
||||||
| import Control.Applicative (Applicative) | ||||||
| import Data.Vector.Mutable ( MVector(..) ) | ||||||
| import Data.Primitive.Array | ||||||
| import qualified Data.Vector.Fusion.Bundle as Bundle | ||||||
|
|
@@ -453,12 +458,7 @@ instance Foldable.Foldable Vector where | |||||
|
|
||||||
| instance Traversable.Traversable Vector where | ||||||
| {-# INLINE traverse #-} | ||||||
| traverse f xs = | ||||||
| -- Get the length of the vector in /O(1)/ time | ||||||
| let !n = G.length xs | ||||||
| -- Use fromListN to be more efficient in construction of resulting vector | ||||||
| -- Also behaves better with compact regions, preventing runtime exceptions | ||||||
| in Data.Vector.fromListN n Applicative.<$> Traversable.traverse f (toList xs) | ||||||
| traverse = traverse | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would have used the imported generic version instead for clarity. Otherwise at first glance it looks like bottom because of a recursive call. It is only when one looks at a qualified import for
Suggested change
|
||||||
|
|
||||||
| {-# INLINE mapM #-} | ||||||
| mapM = mapM | ||||||
|
|
@@ -2205,6 +2205,97 @@ fromListN :: Int -> [a] -> Vector a | |||||
| {-# INLINE fromListN #-} | ||||||
| fromListN = G.fromListN | ||||||
|
|
||||||
| -- Applicative | ||||||
| -- ----------- | ||||||
|
|
||||||
| -- | Construct a vector of the given length by applying the applicative | ||||||
| -- action to each index. | ||||||
| -- | ||||||
| -- @since NEXT_VERSION | ||||||
| generateA :: (Applicative f) => Int -> (Int -> f a) -> f (Vector a) | ||||||
| generateA = G.generateA | ||||||
|
|
||||||
| -- | Execute the applicative action the given number of times and store the | ||||||
| -- results in a vector. | ||||||
| -- | ||||||
| -- @since NEXT_VERSION | ||||||
| replicateA :: (Applicative f) => Int -> f a -> f (Vector a) | ||||||
| {-# INLINE replicateA #-} | ||||||
| replicateA = G.replicateA | ||||||
|
|
||||||
| -- | Apply the applicative action to all elements of the vector, yielding a | ||||||
| -- vector of results. | ||||||
| -- | ||||||
| -- @since NEXT_VERSION | ||||||
| traverse :: (Applicative f) | ||||||
| => (a -> f b) -> Vector a -> f (Vector b) | ||||||
| {-# INLINE traverse #-} | ||||||
| traverse = G.traverse | ||||||
|
|
||||||
| -- | Apply the applicative action to every element of a vector and its | ||||||
| -- index, yielding a vector of results. | ||||||
| -- | ||||||
| -- @since NEXT_VERSION | ||||||
| itraverse :: (Applicative f) | ||||||
| => (Int -> a -> f b) -> Vector a -> f (Vector b) | ||||||
| {-# INLINE itraverse #-} | ||||||
| itraverse = G.itraverse | ||||||
|
|
||||||
| -- | Apply the applicative action to all elements of the vector, yielding a | ||||||
| -- vector of results. This is flipped version of 'traverse'. | ||||||
| -- | ||||||
| -- @since NEXT_VERSION | ||||||
| forA :: (Applicative f) | ||||||
| => Vector a -> (a -> f b) -> f (Vector b) | ||||||
| {-# INLINE forA #-} | ||||||
| forA = G.forA | ||||||
|
|
||||||
| -- | Apply the applicative action to every element of a vector and its | ||||||
| -- index, yielding a vector of results. This is flipped version of 'itraverse'. | ||||||
| -- | ||||||
| -- @since NEXT_VERSION | ||||||
| iforA :: (Applicative f) | ||||||
| => Vector a -> (Int -> a -> f b) -> f (Vector b) | ||||||
| {-# INLINE iforA #-} | ||||||
| iforA = G.iforA | ||||||
|
|
||||||
| -- | Map each element of a structure to an 'Applicative' action, evaluate these | ||||||
| -- actions from left to right, and ignore the results. | ||||||
| -- | ||||||
| -- @since NEXT_VERSION | ||||||
| traverse_ :: (Applicative f) | ||||||
| => (a -> f b) -> Vector a -> f () | ||||||
| {-# INLINE traverse_ #-} | ||||||
| traverse_ = G.traverse_ | ||||||
|
|
||||||
| -- | Map each element of a structure to an 'Applicative' action, evaluate these | ||||||
| -- actions from left to right, and ignore the results. | ||||||
| -- | ||||||
| -- @since NEXT_VERSION | ||||||
| itraverse_ :: (Applicative f) | ||||||
| => (Int -> a -> f b) -> Vector a -> f () | ||||||
| {-# INLINE itraverse_ #-} | ||||||
| itraverse_ = G.itraverse_ | ||||||
|
|
||||||
| -- | Map each element of a structure to an 'Applicative' action, evaluate these | ||||||
| -- actions from left to right, and ignore the results. | ||||||
| -- | ||||||
| -- @since NEXT_VERSION | ||||||
| forA_ :: (Applicative f) | ||||||
| => Vector a -> (a -> f b) -> f () | ||||||
| {-# INLINE forA_ #-} | ||||||
| forA_ = G.forA_ | ||||||
|
|
||||||
| -- | Map each element of a structure to an 'Applicative' action, evaluate these | ||||||
| -- actions from left to right, and ignore the results. | ||||||
| -- | ||||||
| -- @since NEXT_VERSION | ||||||
| iforA_ :: (Applicative f) | ||||||
| => Vector a -> (Int -> a -> f b) -> f () | ||||||
| {-# INLINE iforA_ #-} | ||||||
| iforA_ = G.iforA_ | ||||||
|
|
||||||
|
|
||||||
| -- Conversions - Arrays | ||||||
| -- ----------------------------- | ||||||
|
|
||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like an accidental indentation