diff options
| -rw-r--r-- | src/Data/Array/Nested/Mixed.hs | 5 | ||||
| -rw-r--r-- | src/Data/Array/Nested/Shaped.hs | 2 | ||||
| -rw-r--r-- | test/Tests/C.hs | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/Data/Array/Nested/Mixed.hs b/src/Data/Array/Nested/Mixed.hs index 17f32b8..68d4498 100644 --- a/src/Data/Array/Nested/Mixed.hs +++ b/src/Data/Array/Nested/Mixed.hs @@ -57,7 +57,6 @@ import Data.Bag -- TODO: --- sumAllPrim :: (PrimElt a, NumElt a) => Mixed sh a -> a -- rminIndex1 :: Ranked (n + 1) a -> Ranked n Int -- gather/scatter-like things (most generally, the higher-order variants: accelerate's backpermute/permute) -- After benchmarking: matmul and matvec @@ -349,8 +348,8 @@ class Elt a where mtranspose :: forall is sh. (IsPermutation is, Rank is <= Rank sh) => Perm is -> Mixed sh a -> Mixed (PermutePrefix is sh) a - -- | All arrays in the input must have equal shapes, including subarrays - -- inside their elements. + -- | All arrays in the input must have equal shapes (except possibly + -- for the outermost dimension) including subarrays inside their elements. mconcat :: NonEmpty (Mixed (Nothing : sh) a) -> Mixed (Nothing : sh) a mrnf :: Mixed sh a -> () diff --git a/src/Data/Array/Nested/Shaped.hs b/src/Data/Array/Nested/Shaped.hs index b5937fc..08711b6 100644 --- a/src/Data/Array/Nested/Shaped.hs +++ b/src/Data/Array/Nested/Shaped.hs @@ -14,7 +14,7 @@ module Data.Array.Nested.Shaped ( liftShaped1, liftShaped2, ) where -import Prelude hiding (mappend, mconcat) +import Prelude hiding (mappend) import Data.Array.Internal.RankedG qualified as RG import Data.Array.Internal.RankedS qualified as RS diff --git a/test/Tests/C.hs b/test/Tests/C.hs index 4d372e9..2d35cd9 100644 --- a/test/Tests/C.hs +++ b/test/Tests/C.hs @@ -67,7 +67,7 @@ gen_red_empty f = property $ genRank $ \outrankm1@(SNat @nm1) -> do n <- Gen.int (Range.linear 0 20) return (n :$: sht) -- n + 1 guard (0 `elem` (shrToList $ shrTail sh)) - -- traceM ("sh: " ++ show sh ++ " -> " ++ show (product sh)) + -- traceM ("sh: " ++ show sh ++ " -> " ++ show (shrSize sh)) let arr = OR.fromList @(n + 1) @Double (shrToList sh) [] f inrank arr |