aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bench/Main.hs6
-rw-r--r--ops/Data/Array/Strided.hs2
-rw-r--r--ops/Data/Array/Strided/Arith/Internal.hs12
-rw-r--r--ops/Data/Array/Strided/Array.hs5
-rw-r--r--src/Data/Array/Mixed/Internal/Arith.hs4
-rw-r--r--src/Data/Array/Mixed/Shape.hs6
-rw-r--r--src/Data/Array/Mixed/Types.hs2
-rw-r--r--src/Data/Array/Mixed/XArray.hs2
-rw-r--r--src/Data/Array/Nested/Internal/Convert.hs2
-rw-r--r--src/Data/Array/Nested/Internal/Mixed.hs16
-rw-r--r--src/Data/Array/Nested/Internal/Ranked.hs8
-rw-r--r--src/Data/Array/Nested/Internal/Shape.hs6
-rw-r--r--src/Data/Array/Nested/Internal/Shaped.hs14
-rw-r--r--test/Tests/C.hs2
-rw-r--r--test/Util.hs2
15 files changed, 45 insertions, 44 deletions
diff --git a/bench/Main.hs b/bench/Main.hs
index 17a93e0..7f4b4e3 100644
--- a/bench/Main.hs
+++ b/bench/Main.hs
@@ -15,11 +15,11 @@ import Numeric.LinearAlgebra qualified as LA
import Test.Tasty.Bench
import Text.Show (showListWith)
-import Data.Array.Mixed.XArray (XArray(..))
+import Data.Array.Mixed.XArray (XArray (..))
import Data.Array.Nested
-import Data.Array.Nested.Internal.Mixed (mliftPrim, mliftPrim2, Mixed(M_Primitive), toPrimitive)
+import Data.Array.Nested.Internal.Mixed (Mixed (M_Primitive), mliftPrim, mliftPrim2, toPrimitive)
import Data.Array.Nested.Internal.Ranked (liftRanked1, liftRanked2)
-import qualified Data.Array.Strided.Arith.Internal as Arith
+import Data.Array.Strided.Arith.Internal qualified as Arith
enableMisc :: Bool
diff --git a/ops/Data/Array/Strided.hs b/ops/Data/Array/Strided.hs
index a0506a9..7d8c2d0 100644
--- a/ops/Data/Array/Strided.hs
+++ b/ops/Data/Array/Strided.hs
@@ -3,5 +3,5 @@ module Data.Array.Strided (
module Data.Array.Strided.Arith,
) where
-import Data.Array.Strided.Array
import Data.Array.Strided.Arith
+import Data.Array.Strided.Array
diff --git a/ops/Data/Array/Strided/Arith/Internal.hs b/ops/Data/Array/Strided/Arith/Internal.hs
index 313d72f..4d7e1da 100644
--- a/ops/Data/Array/Strided/Arith/Internal.hs
+++ b/ops/Data/Array/Strided/Arith/Internal.hs
@@ -1,6 +1,7 @@
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE ExistentialQuantification #-}
{-# LANGUAGE GADTs #-}
+{-# LANGUAGE ImportQualifiedPost #-}
{-# LANGUAGE KindSignatures #-}
{-# LANGUAGE MultiWayIf #-}
{-# LANGUAGE RankNTypes #-}
@@ -9,7 +10,6 @@
{-# LANGUAGE TupleSections #-}
{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE TypeOperators #-}
-{-# LANGUAGE ViewPatterns #-}
{-# OPTIONS_GHC -fplugin GHC.TypeLits.Normalise #-}
{-# OPTIONS_GHC -fplugin GHC.TypeLits.KnownNat.Solver #-}
module Data.Array.Strided.Arith.Internal where
@@ -21,20 +21,20 @@ import Data.Int
import Data.List (sort, zip4)
import Data.Proxy
import Data.Type.Equality
-import qualified Data.Vector.Storable as VS
-import qualified Data.Vector.Storable.Mutable as VSM
+import Data.Vector.Storable qualified as VS
+import Data.Vector.Storable.Mutable qualified as VSM
import Foreign.C.Types
import Foreign.Ptr
import Foreign.Storable
-import qualified GHC.TypeNats as TypeNats
import GHC.TypeLits
+import GHC.TypeNats qualified as TypeNats
import Language.Haskell.TH
import System.IO (hFlush, stdout)
import System.IO.Unsafe
-import Data.Array.Strided.Array
-import Data.Array.Strided.Arith.Internal.Lists
import Data.Array.Strided.Arith.Internal.Foreign
+import Data.Array.Strided.Arith.Internal.Lists
+import Data.Array.Strided.Array
-- TODO: need to sort strides for reduction-like functions so that the C inner-loop specialisation has some chance of working even after transposition
diff --git a/ops/Data/Array/Strided/Array.hs b/ops/Data/Array/Strided/Array.hs
index df455c7..f757cd5 100644
--- a/ops/Data/Array/Strided/Array.hs
+++ b/ops/Data/Array/Strided/Array.hs
@@ -1,12 +1,13 @@
{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE ImportQualifiedPost #-}
{-# LANGUAGE KindSignatures #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeApplications #-}
module Data.Array.Strided.Array where
-import qualified Data.List.NonEmpty as NE
+import Data.List.NonEmpty qualified as NE
import Data.Proxy
-import qualified Data.Vector.Storable as VS
+import Data.Vector.Storable qualified as VS
import Foreign.Storable
import GHC.TypeLits
diff --git a/src/Data/Array/Mixed/Internal/Arith.hs b/src/Data/Array/Mixed/Internal/Arith.hs
index b1c7031..ebda388 100644
--- a/src/Data/Array/Mixed/Internal/Arith.hs
+++ b/src/Data/Array/Mixed/Internal/Arith.hs
@@ -12,10 +12,10 @@ import Data.Array.Strided qualified as AS
import Data.Array.Strided.Arith
-- for liftVEltwise1
+import Data.Array.Strided.Arith.Internal (stridesDense)
+import Data.Vector.Storable qualified as VS
import Foreign.Storable
import GHC.TypeLits
-import Data.Vector.Storable qualified as VS
-import Data.Array.Strided.Arith.Internal (stridesDense)
fromO :: RS.Array n a -> AS.Array n a
diff --git a/src/Data/Array/Mixed/Shape.hs b/src/Data/Array/Mixed/Shape.hs
index 26f938d..0b6d390 100644
--- a/src/Data/Array/Mixed/Shape.hs
+++ b/src/Data/Array/Mixed/Shape.hs
@@ -22,14 +22,14 @@
{-# OPTIONS_GHC -fplugin GHC.TypeLits.KnownNat.Solver #-}
module Data.Array.Mixed.Shape where
-import Control.DeepSeq (NFData(..))
+import Control.DeepSeq (NFData (..))
import Data.Bifunctor (first)
import Data.Coerce
import Data.Foldable qualified as Foldable
import Data.Functor.Const
import Data.Functor.Product
-import Data.Kind (Type, Constraint)
-import Data.Monoid (Sum(..))
+import Data.Kind (Constraint, Type)
+import Data.Monoid (Sum (..))
import Data.Proxy
import Data.Type.Equality
import GHC.Exts (withDict)
diff --git a/src/Data/Array/Mixed/Types.hs b/src/Data/Array/Mixed/Types.hs
index 736ced6..3f5b1e7 100644
--- a/src/Data/Array/Mixed/Types.hs
+++ b/src/Data/Array/Mixed/Types.hs
@@ -36,8 +36,8 @@ module Data.Array.Mixed.Types (
unsafeCoerceRefl,
) where
-import Data.Type.Equality
import Data.Proxy
+import Data.Type.Equality
import GHC.TypeLits
import GHC.TypeNats qualified as TN
import Unsafe.Coerce qualified
diff --git a/src/Data/Array/Mixed/XArray.hs b/src/Data/Array/Mixed/XArray.hs
index 93484dc..3680930 100644
--- a/src/Data/Array/Mixed/XArray.hs
+++ b/src/Data/Array/Mixed/XArray.hs
@@ -15,9 +15,9 @@
module Data.Array.Mixed.XArray where
import Control.DeepSeq (NFData)
+import Data.Array.Internal qualified as OI
import Data.Array.Internal.RankedG qualified as ORG
import Data.Array.Internal.RankedS qualified as ORS
-import Data.Array.Internal qualified as OI
import Data.Array.Ranked qualified as ORB
import Data.Array.RankedS qualified as S
import Data.Coerce
diff --git a/src/Data/Array/Nested/Internal/Convert.hs b/src/Data/Array/Nested/Internal/Convert.hs
index 183d62c..c316161 100644
--- a/src/Data/Array/Nested/Internal/Convert.hs
+++ b/src/Data/Array/Nested/Internal/Convert.hs
@@ -2,8 +2,8 @@
{-# LANGUAGE GADTs #-}
{-# LANGUAGE PolyKinds #-}
{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE TypeAbstractions #-}
+{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE TypeOperators #-}
module Data.Array.Nested.Internal.Convert where
diff --git a/src/Data/Array/Nested/Internal/Mixed.hs b/src/Data/Array/Nested/Internal/Mixed.hs
index ca90889..1d4181e 100644
--- a/src/Data/Array/Nested/Internal/Mixed.hs
+++ b/src/Data/Array/Nested/Internal/Mixed.hs
@@ -20,7 +20,7 @@ module Data.Array.Nested.Internal.Mixed where
import Prelude hiding (mconcat)
-import Control.DeepSeq (NFData(..))
+import Control.DeepSeq (NFData (..))
import Control.Monad (forM_, when)
import Control.Monad.ST
import Data.Array.RankedS qualified as S
@@ -28,8 +28,8 @@ import Data.Bifunctor (bimap)
import Data.Coerce
import Data.Foldable (toList)
import Data.Int
-import Data.Kind (Type, Constraint)
-import Data.List.NonEmpty (NonEmpty(..))
+import Data.Kind (Constraint, Type)
+import Data.List.NonEmpty (NonEmpty (..))
import Data.List.NonEmpty qualified as NE
import Data.Proxy
import Data.Type.Equality
@@ -37,18 +37,18 @@ import Data.Vector.Storable qualified as VS
import Data.Vector.Storable.Mutable qualified as VSM
import Foreign.C.Types (CInt)
import Foreign.Storable (Storable)
-import GHC.Float qualified (log1p, expm1, log1pexp, log1mexp)
+import GHC.Float qualified (expm1, log1mexp, log1p, log1pexp)
import GHC.Generics (Generic)
import GHC.TypeLits
import Unsafe.Coerce (unsafeCoerce)
-import Data.Array.Mixed.XArray (XArray(..))
-import Data.Array.Mixed.XArray qualified as X
import Data.Array.Mixed.Internal.Arith
+import Data.Array.Mixed.Lemmas
+import Data.Array.Mixed.Permutation
import Data.Array.Mixed.Shape
import Data.Array.Mixed.Types
-import Data.Array.Mixed.Permutation
-import Data.Array.Mixed.Lemmas
+import Data.Array.Mixed.XArray (XArray (..))
+import Data.Array.Mixed.XArray qualified as X
import Data.Bag
diff --git a/src/Data/Array/Nested/Internal/Ranked.hs b/src/Data/Array/Nested/Internal/Ranked.hs
index 2aba1bc..045b2ef 100644
--- a/src/Data/Array/Nested/Internal/Ranked.hs
+++ b/src/Data/Array/Nested/Internal/Ranked.hs
@@ -22,7 +22,7 @@ module Data.Array.Nested.Internal.Ranked where
import Prelude hiding (mappend, mconcat)
-import Control.DeepSeq (NFData(..))
+import Control.DeepSeq (NFData (..))
import Control.Monad.ST
import Data.Array.RankedS qualified as S
import Data.Bifunctor (first)
@@ -34,17 +34,17 @@ import Data.Proxy
import Data.Type.Equality
import Data.Vector.Storable qualified as VS
import Foreign.Storable (Storable)
-import GHC.Float qualified (log1p, expm1, log1pexp, log1mexp)
+import GHC.Float qualified (expm1, log1mexp, log1p, log1pexp)
import GHC.Generics (Generic)
import GHC.TypeLits
import GHC.TypeNats qualified as TN
-import Data.Array.Mixed.XArray (XArray(..))
-import Data.Array.Mixed.XArray qualified as X
import Data.Array.Mixed.Lemmas
import Data.Array.Mixed.Permutation
import Data.Array.Mixed.Shape
import Data.Array.Mixed.Types
+import Data.Array.Mixed.XArray (XArray (..))
+import Data.Array.Mixed.XArray qualified as X
import Data.Array.Nested.Internal.Mixed
import Data.Array.Nested.Internal.Shape
import Data.Array.Strided.Arith
diff --git a/src/Data/Array/Nested/Internal/Shape.hs b/src/Data/Array/Nested/Internal/Shape.hs
index 490c9a8..e65164b 100644
--- a/src/Data/Array/Nested/Internal/Shape.hs
+++ b/src/Data/Array/Nested/Internal/Shape.hs
@@ -27,14 +27,14 @@
module Data.Array.Nested.Internal.Shape where
import Control.DeepSeq (NFData (..))
-import Data.Array.Shape qualified as O
import Data.Array.Mixed.Types
+import Data.Array.Shape qualified as O
import Data.Coerce (coerce)
import Data.Foldable qualified as Foldable
import Data.Functor.Const
import Data.Functor.Product qualified as Fun
-import Data.Kind (Type, Constraint)
-import Data.Monoid (Sum(..))
+import Data.Kind (Constraint, Type)
+import Data.Monoid (Sum (..))
import Data.Proxy
import Data.Type.Equality
import GHC.Exts (withDict)
diff --git a/src/Data/Array/Nested/Internal/Shaped.hs b/src/Data/Array/Nested/Internal/Shaped.hs
index a8f330f..cd69daa 100644
--- a/src/Data/Array/Nested/Internal/Shaped.hs
+++ b/src/Data/Array/Nested/Internal/Shaped.hs
@@ -21,12 +21,12 @@ module Data.Array.Nested.Internal.Shaped where
import Prelude hiding (mappend, mconcat)
-import Control.DeepSeq (NFData(..))
+import Control.DeepSeq (NFData (..))
import Control.Monad.ST
-import Data.Array.Internal.ShapedS qualified as SS
-import Data.Array.Internal.ShapedG qualified as SG
-import Data.Array.Internal.RankedS qualified as RS
import Data.Array.Internal.RankedG qualified as RG
+import Data.Array.Internal.RankedS qualified as RS
+import Data.Array.Internal.ShapedG qualified as SG
+import Data.Array.Internal.ShapedS qualified as SS
import Data.Bifunctor (first)
import Data.Coerce (coerce)
import Data.Kind (Type)
@@ -35,16 +35,16 @@ import Data.Proxy
import Data.Type.Equality
import Data.Vector.Storable qualified as VS
import Foreign.Storable (Storable)
-import GHC.Float qualified (log1p, expm1, log1pexp, log1mexp)
+import GHC.Float qualified (expm1, log1mexp, log1p, log1pexp)
import GHC.Generics (Generic)
import GHC.TypeLits
-import Data.Array.Mixed.XArray (XArray)
-import Data.Array.Mixed.XArray qualified as X
import Data.Array.Mixed.Lemmas
import Data.Array.Mixed.Permutation
import Data.Array.Mixed.Shape
import Data.Array.Mixed.Types
+import Data.Array.Mixed.XArray (XArray)
+import Data.Array.Mixed.XArray qualified as X
import Data.Array.Nested.Internal.Lemmas
import Data.Array.Nested.Internal.Mixed
import Data.Array.Nested.Internal.Shape
diff --git a/test/Tests/C.hs b/test/Tests/C.hs
index a0f103d..b10e66a 100644
--- a/test/Tests/C.hs
+++ b/test/Tests/C.hs
@@ -23,8 +23,8 @@ import Data.Array.Nested
import Data.Array.Nested.Internal.Shape
import Hedgehog
-import Hedgehog.Internal.Property (forAllT)
import Hedgehog.Gen qualified as Gen
+import Hedgehog.Internal.Property (forAllT)
import Hedgehog.Range qualified as Range
import Test.Tasty
import Test.Tasty.Hedgehog
diff --git a/test/Util.hs b/test/Util.hs
index ce6ec23..0273423 100644
--- a/test/Util.hs
+++ b/test/Util.hs
@@ -12,9 +12,9 @@ module Util where
import Data.Array.RankedS qualified as OR
import Data.Kind
+import GHC.TypeLits
import Hedgehog
import Hedgehog.Internal.Property (failDiff)
-import GHC.TypeLits
import Data.Array.Mixed.Types (fromSNat')
generated by cgit v1.2.3-70-g09d2 (git 2.48.1) at 2025-05-13 23:28:16 +0200