Support for GHC all the way to 9.10

haskell-repa · Dec 8, 2024 · 496d974 · 496d974
1 parent 9b61e4f
commit 496d974
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 32 deletions.
diff --git a/repa-algorithms/repa-algorithms.cabal b/repa-algorithms/repa-algorithms.cabal
@@ -18,8 +18,8 @@ Synopsis:
 
 Library
   Build-Depends:
-        base                 >= 4.8 && < 5
-      , vector               >= 0.11 && < 0.13
+        base                 >= 4.8 && < 4.21
+      , vector               >= 0.11 && < 0.14
       , repa                 >= 3.4 && <3.5
 
   ghc-options:

diff --git a/repa-examples/repa-examples.cabal b/repa-examples/repa-examples.cabal
@@ -5,7 +5,7 @@ License-file:        LICENSE
 Author:              The DPH Team
 Maintainer:          Ben Lippmeier <[email protected]>
 Build-Type:          Simple
-Cabal-Version:       >=1.6
+Cabal-Version:       >=1.10
 Stability:           experimental
 Category:            Data Structures
 Homepage:            http://repa.ouroborus.net
@@ -25,7 +25,7 @@ Flag llvm
 
 Executable repa-canny
   Build-depends:
-        base                 >= 4.8 && < 4.17
+        base                 >= 4.8 && < 4.21
       , repa                 >= 3.4 && < 3.5
       , repa-algorithms      >= 3.4 && < 3.5
 
@@ -46,7 +46,7 @@ Executable repa-canny
 
 Executable repa-mmult
   Build-depends:
-        base                 >= 4.8 && < 4.17
+        base                 >= 4.8 && < 4.21
       , random               == 1.1.*
       , repa                 >= 3.4 && < 3.5
       , repa-algorithms      >= 3.4 && < 3.5
@@ -72,7 +72,7 @@ Executable repa-mmult
 
 Executable repa-laplace
   Build-depends:
-        base                 >= 4.8 && < 4.17
+        base                 >= 4.8 && < 4.21
       , repa                 >= 3.4 && < 3.5
       , repa-io              >= 3.4 && < 3.5
       , template-haskell
@@ -95,7 +95,7 @@ Executable repa-laplace
 
 Executable repa-fft2d
   Build-depends:
-        base                 >= 4.8 && < 4.17
+        base                 >= 4.8 && < 4.21
       , repa                 >= 3.4 && < 3.5
       , repa-algorithms      >= 3.4 && < 3.5
       , repa-io              >= 3.4 && < 3.5
@@ -119,7 +119,7 @@ Executable repa-fft2d
 
 Executable repa-fft2d-highpass
   Build-depends:
-        base                 >= 4.8 && < 4.17
+        base                 >= 4.8 && < 4.21
       , repa                 >= 3.4 && < 3.5
       , repa-algorithms      >= 3.4 && < 3.5
       , repa-io              >= 3.4 && < 3.5
@@ -143,7 +143,7 @@ Executable repa-fft2d-highpass
 
 Executable repa-fft3d-highpass
   Build-depends:
-        base                 >= 4.8 && < 4.17
+        base                 >= 4.8 && < 4.21
       , repa                 >= 3.4 && < 3.5
       , repa-algorithms      >= 3.4 && < 3.5
 
@@ -166,10 +166,10 @@ Executable repa-fft3d-highpass
 
 Executable repa-blur
   Build-depends:
-        base                 >= 4.8 && < 4.17
+        base                 >= 4.8 && < 4.21
       , repa                 >= 3.4 && < 3.5
       , repa-algorithms      >= 3.4 && < 3.5
-      , vector               >= 0.11 && < 0.13
+      , vector               >= 0.11 && < 0.14
 
   Main-is: examples/Blur/src-repa/Main.hs
   hs-source-dirs: examples/Blur/src-repa .
@@ -190,7 +190,7 @@ Executable repa-blur
 
 Executable repa-sobel
   Build-depends:
-        base                 >= 4.8 && < 4.17
+        base                 >= 4.8 && < 4.21
       , repa                 >= 3.4 && < 3.5
       , repa-algorithms      >= 3.4 && < 3.5
 
@@ -214,7 +214,7 @@ Executable repa-sobel
 
 Executable repa-volume
   Build-depends:
-        base                 >= 4.8 && < 4.17
+        base                 >= 4.8 && < 4.21
       , repa                 >= 3.4 && < 3.5
       , repa-io              >= 3.4 && < 3.5
 
@@ -236,7 +236,7 @@ Executable repa-volume
 
 Executable repa-unit-test
   Build-depends:
-        base                 >= 4.8 && < 4.17
+        base                 >= 4.8 && < 4.21
       , repa                 >= 3.4 && < 3.5
       , QuickCheck           >= 2.8 && < 2.16
 

diff --git a/repa-io/repa-io.cabal b/repa-io/repa-io.cabal
@@ -18,7 +18,7 @@ Synopsis:
 
 Library
   Build-Depends:
-        base                 >= 4.8 && < 5
+        base                 >= 4.8 && < 4.21
       , binary               >= 0.7 && < 0.9
       , bmp                  >= 1.2 && <1.3
       , bytestring           >= 0.10 && < 0.13

diff --git a/repa/Data/Array/Repa/Eval/Elt.hs b/repa/Data/Array/Repa/Eval/Elt.hs
@@ -4,7 +4,6 @@
 module Data.Array.Repa.Eval.Elt
         (Elt (..))
 where
-import GHC.Prim
 import GHC.Exts
 import GHC.Types
 import GHC.Word
@@ -125,7 +124,7 @@ instance Elt Bool where
 -- Floating -------------------------------------------------------------------
 instance Elt Float where
  {-# INLINE touch #-}
- touch (F# f)
+ touch f
   = IO (\state -> case touch# f state of
                         state' -> (# state', () #))
 
@@ -138,7 +137,7 @@ instance Elt Float where
 
 instance Elt Double where
  {-# INLINE touch #-}
- touch (D# d)
+ touch d
   = IO (\state -> case touch# d state of
                         state' -> (# state', () #))
 
@@ -152,7 +151,7 @@ instance Elt Double where
 -- Int ------------------------------------------------------------------------
 instance Elt Int where
  {-# INLINE touch #-}
- touch (I# i)
+ touch i
   = IO (\state -> case touch# i state of
                         state' -> (# state', () #))
 
@@ -164,7 +163,7 @@ instance Elt Int where
 
 instance Elt Int8 where
  {-# INLINE touch #-}
- touch (I8# w)
+ touch w
   = IO (\state -> case touch# w state of
                         state' -> (# state', () #))
 
@@ -177,7 +176,7 @@ instance Elt Int8 where
 
 instance Elt Int16 where
  {-# INLINE touch #-}
- touch (I16# w)
+ touch w
   = IO (\state -> case touch# w state of
                         state' -> (# state', () #))
 
@@ -190,7 +189,7 @@ instance Elt Int16 where
 
 instance Elt Int32 where
  {-# INLINE touch #-}
- touch (I32# w)
+ touch w
   = IO (\state -> case touch# w state of
                         state' -> (# state', () #))
 
@@ -203,7 +202,7 @@ instance Elt Int32 where
 
 instance Elt Int64 where
  {-# INLINE touch #-}
- touch (I64# w)
+ touch w
   = IO (\state -> case touch# w state of
                         state' -> (# state', () #))
 
@@ -217,7 +216,7 @@ instance Elt Int64 where
 -- Word -----------------------------------------------------------------------
 instance Elt Word where
  {-# INLINE touch #-}
- touch (W# i)
+ touch i
   = IO (\state -> case touch# i state of
                         state' -> (# state', () #))
 
@@ -230,7 +229,7 @@ instance Elt Word where
 
 instance Elt Word8 where
  {-# INLINE touch #-}
- touch (W8# w)
+ touch w
   = IO (\state -> case touch# w state of
                         state' -> (# state', () #))
 
@@ -243,7 +242,7 @@ instance Elt Word8 where
 
 instance Elt Word16 where
  {-# INLINE touch #-}
- touch (W16# w)
+ touch w
   = IO (\state -> case touch# w state of
                         state' -> (# state', () #))
 
@@ -256,7 +255,7 @@ instance Elt Word16 where
 
 instance Elt Word32 where
  {-# INLINE touch #-}
- touch (W32# w)
+ touch w
   = IO (\state -> case touch# w state of
                         state' -> (# state', () #))
 
@@ -269,7 +268,7 @@ instance Elt Word32 where
 
 instance Elt Word64 where
  {-# INLINE touch #-}
- touch (W64# w)
+ touch w
   = IO (\state -> case touch# w state of
                         state' -> (# state', () #))
 

diff --git a/repa/repa.cabal b/repa/repa.cabal
@@ -5,7 +5,7 @@ License-file:        LICENSE
 Author:              The DPH Team
 Maintainer:          Ben Lippmeier <[email protected]>
 Build-Type:          Simple
-Cabal-Version:       >=1.6
+Cabal-Version:       >=1.10
 Stability:           experimental
 Category:            Data Structures
 Homepage:            http://repa.ouroborus.net
@@ -25,11 +25,11 @@ Flag no-template-haskell
 
 Library
   Build-Depends:
-        base                 >= 4.8 && < 4.17
+        base                 >= 4.8 && < 4.21
       , template-haskell
       , ghc-prim
-      , vector               >= 0.11 && < 0.13
-      , bytestring           >= 0.10 && < 0.12
+      , vector               >= 0.11 && < 0.14
+      , bytestring           >= 0.10 && < 0.13
       , QuickCheck           >= 2.8  && < 2.16
 
   ghc-options: