From 2fce3612f1959cce63c41ea953d1097a60e3318c Mon Sep 17 00:00:00 2001 From: "bringert@cs.chalmers.se" Date: Mon, 13 Nov 2006 22:42:02 +0000 Subject: [PATCH] Control.Parallel.Strategies clean-up: Added export list to avoid exporting seq, fixed import list strangeness that haddock choked on, and moved the deprecated functions to a separate section. --- Control/Parallel/Strategies.hs | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/Control/Parallel/Strategies.hs b/Control/Parallel/Strategies.hs index d526222..dad5287 100644 --- a/Control/Parallel/Strategies.hs +++ b/Control/Parallel/Strategies.hs @@ -16,7 +16,32 @@ -- Phil Trinder, Hans-Wolfgang Loidl, Kevin Hammond et al. -- ----------------------------------------------------------------------------- -module Control.Parallel.Strategies where +module Control.Parallel.Strategies ( + -- * Strategy Type, Application and Semantics + Done, Strategy, + (>|), (>||), + using, demanding, sparking, + -- * Basic Strategies + r0, rwhnf, NFData(..), + -- * Strategic Function Application + ($|), ($||), + (.|), (.||), + (-|), (-||), + -- * Tuples + seqPair, parPair, + seqTriple, parTriple, + -- * Lists: Parallel Strategies + parList, parListN, parListNth, parListChunk, + parMap, parFlatMap, parZipWith, + -- * Lists: Sequential Strategies + seqList, seqListN, seqListNth, parBuffer, + -- * Arrays + seqArr, parArr, + -- * Deprecated types and functions + sPar, sSeq, + Assoc(..), + fstPairFstList, force, sforce + ) where -- based on hslibs/concurrent/Strategies.lhs; see it for more detailed -- code comments. @@ -25,8 +50,8 @@ import Control.Parallel as Parallel (par, pseq) import Data.Array import Data.Complex import Data.Int -import qualified Data.IntMap (IntMap, IntMap.toList) -import qualified Data.IntSet (IntSet, IntSet.toList) +import qualified Data.IntMap (IntMap, toList) +import qualified Data.IntSet (IntSet, toList) import qualified Data.Map (Map, toList) import qualified Data.Set (Set, toList) import qualified Data.Tree (Tree(..)) @@ -543,7 +568,6 @@ seqArr s arr = seqList s (elems arr) parArr :: (Ix b) => Strategy a -> Strategy (Array b a) parArr s arr = parList s (elems arr) --- | Associations maybe useful even without mentioning Arrays. {-# DEPRECATED Assoc "Does not belong in Control.Parallel.Strategies" #-} data Assoc a b = a := b deriving () -- 1.7.10.4