diff options
| -rw-r--r-- | src/Data/Array/Mixed/Internal/Arith.hs | 2 | ||||
| -rw-r--r-- | src/Data/Array/Nested/Internal/Mixed.hs | 6 | ||||
| -rw-r--r-- | src/Data/Array/Nested/Internal/Ranked.hs | 14 | ||||
| -rw-r--r-- | src/Data/Array/Nested/Internal/Shaped.hs | 8 |
4 files changed, 15 insertions, 15 deletions
diff --git a/src/Data/Array/Mixed/Internal/Arith.hs b/src/Data/Array/Mixed/Internal/Arith.hs index fede541..313c885 100644 --- a/src/Data/Array/Mixed/Internal/Arith.hs +++ b/src/Data/Array/Mixed/Internal/Arith.hs @@ -794,7 +794,7 @@ instance NumElt CInt where numEltDotprodInner = intWidBranchDotprod @CInt (scaleFromSVStrided (c_binary_i32_sv_strided (aboEnum BO_MUL))) (c_reduce1_i32 (aroEnum RO_SUM)) c_dotprodinner_i32 (scaleFromSVStrided (c_binary_i64_sv_strided (aboEnum BO_MUL))) (c_reduce1_i64 (aroEnum RO_SUM)) c_dotprodinner_i64 -class FloatElt a where +class NumElt a => FloatElt a where floatEltDiv :: SNat n -> RS.Array n a -> RS.Array n a -> RS.Array n a floatEltPow :: SNat n -> RS.Array n a -> RS.Array n a -> RS.Array n a floatEltLogbase :: SNat n -> RS.Array n a -> RS.Array n a -> RS.Array n a diff --git a/src/Data/Array/Nested/Internal/Mixed.hs b/src/Data/Array/Nested/Internal/Mixed.hs index d8b7912..b72581e 100644 --- a/src/Data/Array/Nested/Internal/Mixed.hs +++ b/src/Data/Array/Nested/Internal/Mixed.hs @@ -232,14 +232,14 @@ instance (NumElt a, PrimElt a, Num a) => Num (Mixed sh a) where abs = mliftNumElt1 numEltAbs signum = mliftNumElt1 numEltSignum -- TODO: THIS IS BAD, WE NEED TO REMOVE THIS - fromInteger = error "Mixed(fromInteger): Cannot implement fromInteger, use mreplicateScal" + fromInteger = error "Data.Array.Nested.fromInteger: Cannot implement fromInteger, use mreplicateScal" -instance (FloatElt a, NumElt a, PrimElt a, Num a) => Fractional (Mixed sh a) where +instance (FloatElt a, PrimElt a, Num a) => Fractional (Mixed sh a) where fromRational _ = error "Data.Array.Nested.fromRational: No singletons available, use explicit mreplicate" recip = mliftNumElt1 floatEltRecip (/) = mliftNumElt2 floatEltDiv -instance (FloatElt a, NumElt a, PrimElt a, Num a) => Floating (Mixed sh a) where +instance (FloatElt a, PrimElt a, Num a) => Floating (Mixed sh a) where pi = error "Data.Array.Nested.pi: No singletons available, use explicit mreplicate" exp = mliftNumElt1 floatEltExp log = mliftNumElt1 floatEltLog diff --git a/src/Data/Array/Nested/Internal/Ranked.hs b/src/Data/Array/Nested/Internal/Ranked.hs index 5f453a5..bc47579 100644 --- a/src/Data/Array/Nested/Internal/Ranked.hs +++ b/src/Data/Array/Nested/Internal/Ranked.hs @@ -189,12 +189,12 @@ instance (KnownNat n, KnownElt a) => KnownElt (Ranked n a) where arithPromoteRanked :: forall n a b. - (forall sh. Mixed sh a -> Mixed sh b) + (Mixed (Replicate n Nothing) a -> Mixed (Replicate n Nothing) b) -> Ranked n a -> Ranked n b arithPromoteRanked = coerce arithPromoteRanked2 :: forall n a b c. - (forall sh. Mixed sh a -> Mixed sh b -> Mixed sh c) + (Mixed (Replicate n Nothing) a -> Mixed (Replicate n Nothing) b -> Mixed (Replicate n Nothing) c) -> Ranked n a -> Ranked n b -> Ranked n c arithPromoteRanked2 = coerce @@ -205,15 +205,15 @@ instance (NumElt a, PrimElt a, Num a) => Num (Ranked n a) where negate = arithPromoteRanked negate abs = arithPromoteRanked abs signum = arithPromoteRanked signum - fromInteger = error "Data.Array.Nested.fromInteger: No singletons available, use explicit rreplicateScal" + fromInteger = error "Data.Array.Nested(Ranked).fromInteger: No singletons available, use explicit rreplicateScal" -instance (FloatElt a, NumElt a, PrimElt a, Num a) => Fractional (Ranked n a) where - fromRational _ = error "Data.Array.Nested.fromRational: No singletons available, use explicit rreplicateScal" +instance (FloatElt a, PrimElt a, Num a) => Fractional (Ranked n a) where + fromRational _ = error "Data.Array.Nested(Ranked).fromRational: No singletons available, use explicit rreplicateScal" recip = arithPromoteRanked recip (/) = arithPromoteRanked2 (/) -instance (FloatElt a, NumElt a, PrimElt a, Num a) => Floating (Ranked n a) where - pi = error "Data.Array.Nested.pi: No singletons available, use explicit rreplicateScal" +instance (FloatElt a, PrimElt a, Num a) => Floating (Ranked n a) where + pi = error "Data.Array.Nested(Ranked).pi: No singletons available, use explicit rreplicateScal" exp = arithPromoteRanked exp log = arithPromoteRanked log sqrt = arithPromoteRanked sqrt diff --git a/src/Data/Array/Nested/Internal/Shaped.hs b/src/Data/Array/Nested/Internal/Shaped.hs index 5d1b3b2..fe36ffe 100644 --- a/src/Data/Array/Nested/Internal/Shaped.hs +++ b/src/Data/Array/Nested/Internal/Shaped.hs @@ -187,12 +187,12 @@ instance (KnownShS sh, KnownElt a) => KnownElt (Shaped sh a) where arithPromoteShaped :: forall sh a b. - (forall shx. Mixed shx a -> Mixed shx b) + (Mixed (MapJust sh) a -> Mixed (MapJust sh) b) -> Shaped sh a -> Shaped sh b arithPromoteShaped = coerce arithPromoteShaped2 :: forall sh a b c. - (forall shx. Mixed shx a -> Mixed shx b -> Mixed shx c) + (Mixed (MapJust sh) a -> Mixed (MapJust sh) b -> Mixed (MapJust sh) c) -> Shaped sh a -> Shaped sh b -> Shaped sh c arithPromoteShaped2 = coerce @@ -205,12 +205,12 @@ instance (NumElt a, PrimElt a, Num a) => Num (Shaped sh a) where signum = arithPromoteShaped signum fromInteger = error "Data.Array.Nested.fromInteger: No singletons available, use explicit sreplicateScal" -instance (FloatElt a, NumElt a, PrimElt a, Fractional a) => Fractional (Shaped sh a) where +instance (FloatElt a, PrimElt a, Fractional a) => Fractional (Shaped sh a) where fromRational = error "Data.Array.Nested.fromRational: No singletons available, use explicit sreplicateScal" recip = arithPromoteShaped recip (/) = arithPromoteShaped2 (/) -instance (FloatElt a, NumElt a, PrimElt a, Floating a) => Floating (Shaped sh a) where +instance (FloatElt a, PrimElt a, Floating a) => Floating (Shaped sh a) where pi = error "Data.Array.Nested.pi: No singletons available, use explicit sreplicateScal" exp = arithPromoteShaped exp log = arithPromoteShaped log |