summaryrefslogtreecommitdiff
path: root/packages/base/src/Numeric/LinearAlgebra
diff options
context:
space:
mode:
authorHiromi ISHII <konn.jinro@gmail.com>2017-12-25 20:23:13 +0900
committerHiromi ISHII <konn.jinro@gmail.com>2017-12-25 20:23:13 +0900
commite83e2023da77ecaa9aaba15bc9bd48757f73b3a9 (patch)
treef7aae740fa7129c4641cf05a9e00260e48cd92bb /packages/base/src/Numeric/LinearAlgebra
parent87c7682bbfd17308749d5e9568f1ffa25390ce79 (diff)
Workaround for GHC-8.4.x
* Adds missing Semigroup instances * Adds `semigroups` to the deps of `hmatrix` * Hides conflicting names from import list with base >= 4.11 * `(Prelude.<>)` and `GHC.TypeNats.Mod`
Diffstat (limited to 'packages/base/src/Numeric/LinearAlgebra')
-rw-r--r--packages/base/src/Numeric/LinearAlgebra/HMatrix.hs4
-rw-r--r--packages/base/src/Numeric/LinearAlgebra/Static.hs4
2 files changed, 8 insertions, 0 deletions
diff --git a/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs b/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs
index 5ce529c..3a84645 100644
--- a/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/HMatrix.hs
@@ -1,3 +1,4 @@
1{-# LANGUAGE CPP #-}
1-------------------------------------------------------------------------------- 2--------------------------------------------------------------------------------
2{- | 3{- |
3Module : Numeric.LinearAlgebra.HMatrix 4Module : Numeric.LinearAlgebra.HMatrix
@@ -19,6 +20,9 @@ module Numeric.LinearAlgebra.HMatrix (
19import Numeric.LinearAlgebra 20import Numeric.LinearAlgebra
20import Internal.Util 21import Internal.Util
21import Internal.Algorithms(cholSH, mbCholSH, eigSH', eigenvaluesSH', geigSH') 22import Internal.Algorithms(cholSH, mbCholSH, eigSH', eigenvaluesSH', geigSH')
23#if MIN_VERSION_base(4,11,0)
24import Prelude hiding ((<>))
25#endif
22 26
23infixr 8 <·> 27infixr 8 <·>
24(<·>) :: Numeric t => Vector t -> Vector t -> t 28(<·>) :: Numeric t => Vector t -> Vector t -> t
diff --git a/packages/base/src/Numeric/LinearAlgebra/Static.hs b/packages/base/src/Numeric/LinearAlgebra/Static.hs
index 3000dcb..e328904 100644
--- a/packages/base/src/Numeric/LinearAlgebra/Static.hs
+++ b/packages/base/src/Numeric/LinearAlgebra/Static.hs
@@ -1,3 +1,4 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE DataKinds #-} 2{-# LANGUAGE DataKinds #-}
2{-# LANGUAGE KindSignatures #-} 3{-# LANGUAGE KindSignatures #-}
3{-# LANGUAGE GeneralizedNewtypeDeriving #-} 4{-# LANGUAGE GeneralizedNewtypeDeriving #-}
@@ -80,6 +81,9 @@ import Control.Arrow((***))
80import Text.Printf 81import Text.Printf
81import Data.Type.Equality ((:~:)(Refl)) 82import Data.Type.Equality ((:~:)(Refl))
82import qualified Data.Bifunctor as BF (first) 83import qualified Data.Bifunctor as BF (first)
84#if MIN_VERSION_base(4,11,0)
85import Prelude hiding ((<>))
86#endif
83 87
84ud1 :: R n -> Vector ℝ 88ud1 :: R n -> Vector ℝ
85ud1 (R (Dim v)) = v 89ud1 (R (Dim v)) = v