Ensure compatibility with random-1.3.0

lehins · Oct 28, 2023 · 93f60dd · 93f60dd
1 parent ef637b5
commit 93f60dd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/massiv/src/Data/Massiv/Array/Ops/Sort.hs b/massiv/src/Data/Massiv/Array/Ops/Sort.hs
@@ -199,7 +199,7 @@ quicksortInternalM_ fLT fEQ scheduler marr
   | otherwise = qsortPar depthPar 0 (k - 1)
   where
     -- How deep into the search tree should we continue scheduling jobs. Constants below
-    -- were discovered imperically:
+    -- were discovered empirically:
     depthPar = min (logNumWorkers + 4) (logSize - 10)
     k = unSz (sizeOfMArray marr)
     -- We must use log becuase decinding into a tree creates an exponential number of jobs

diff --git a/massiv/src/Data/Massiv/Core/Index/Internal.hs b/massiv/src/Data/Massiv/Core/Index/Internal.hs
@@ -143,6 +143,9 @@ instance (UniformRange ix, Index ix) => Uniform (Sz ix) where
 instance UniformRange ix => UniformRange (Sz ix) where
   uniformRM (SafeSz l, SafeSz u) g = SafeSz <$> uniformRM (l, u) g
   {-# INLINE uniformRM #-}
+#if MIN_VERSION_random(1,3,0)
+  isInRange = isInRangeOrd
+#endif
 
 instance (UniformRange ix, Index ix) => Random (Sz ix)
 

diff --git a/massiv/src/Data/Massiv/Core/Index/Ix.hs b/massiv/src/Data/Massiv/Core/Index/Ix.hs
@@ -172,6 +172,9 @@ instance Uniform Ix2 where
 instance UniformRange Ix2 where
   uniformRM (l1 :. l2, u1 :. u2) g = (:.) <$> uniformRM (l1, u1) g <*> uniformRM (l2, u2) g
   {-# INLINE uniformRM #-}
+#if MIN_VERSION_random(1,3,0)
+  isInRange = isInRangeOrd
+#endif
 
 instance Random Ix2
 
@@ -182,6 +185,9 @@ instance Uniform (Ix (n - 1)) => Uniform (IxN n) where
 instance UniformRange (Ix (n - 1)) => UniformRange (IxN n) where
   uniformRM (l1 :> l2, u1 :> u2) g = (:>) <$> uniformRM (l1, u1) g <*> uniformRM (l2, u2) g
   {-# INLINE uniformRM #-}
+#if MIN_VERSION_random(1,3,0)
+  isInRange = isInRangeOrd
+#endif
 
 instance Random (Ix (n - 1)) => Random (IxN n) where
   random g =