Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics

[ghc-hetmet.git] / compiler / vectorise / Vectorise / Builtins / Modules.hs

diff --git a/compiler/vectorise/Vectorise/Builtins/Modules.hs b/compiler/vectorise/Vectorise/Builtins/Modules.hs
index eafb0ca..6ea3595 100644 (file)
--- a/compiler/vectorise/Vectorise/Builtins/Modules.hs
+++ b/compiler/vectorise/Vectorise/Builtins/Modules.hs
@@ -13,19 +13,18 @@ data Modules
   = Modules 
   { dph_PArray_Base             :: Module
   , dph_PArray_Scalar           :: Module
+  , dph_PArray_ScalarInstances  :: Module
   , dph_PArray_PRepr            :: Module
   , dph_PArray_PReprInstances   :: Module
   , dph_PArray_PData            :: Module
   , dph_PArray_PDataInstances   :: Module
   , dph_PArray_Types            :: Module
        
-  , dph_Repr                   :: Module
   , dph_Closure                        :: Module
   , dph_Unboxed                        :: Module
   , dph_Combinators             :: Module
   , dph_Scalar                 :: Module
 
-  , dph_Prelude_PArr            :: Module
   , dph_Prelude_Int             :: Module
   , dph_Prelude_Word8           :: Module
   , dph_Prelude_Double          :: Module
@@ -40,19 +39,18 @@ dph_Modules pkg
   = Modules 
   { dph_PArray_Base             = mk (fsLit "Data.Array.Parallel.PArray.Base")
   , dph_PArray_Scalar           = mk (fsLit "Data.Array.Parallel.PArray.Scalar")
+  , dph_PArray_ScalarInstances  = mk (fsLit "Data.Array.Parallel.PArray.ScalarInstances")
   , dph_PArray_PRepr            = mk (fsLit "Data.Array.Parallel.PArray.PRepr")
   , dph_PArray_PReprInstances   = mk (fsLit "Data.Array.Parallel.PArray.PReprInstances")
   , dph_PArray_PData            = mk (fsLit "Data.Array.Parallel.PArray.PData")
   , dph_PArray_PDataInstances   = mk (fsLit "Data.Array.Parallel.PArray.PDataInstances")
   , dph_PArray_Types            = mk (fsLit "Data.Array.Parallel.PArray.Types")
        
-  , dph_Repr                    = mk (fsLit "Data.Array.Parallel.Lifted.Repr")
   , dph_Closure                 = mk (fsLit "Data.Array.Parallel.Lifted.Closure")
   , dph_Unboxed                 = mk (fsLit "Data.Array.Parallel.Lifted.Unboxed")
   , dph_Combinators             = mk (fsLit "Data.Array.Parallel.Lifted.Combinators")
   , dph_Scalar                  = mk (fsLit "Data.Array.Parallel.Lifted.Scalar")
 
-  , dph_Prelude_PArr            = mk (fsLit "Data.Array.Parallel.Prelude.Base.PArr")
   , dph_Prelude_Int             = mk (fsLit "Data.Array.Parallel.Prelude.Base.Int")
   , dph_Prelude_Word8           = mk (fsLit "Data.Array.Parallel.Prelude.Base.Word8")
   , dph_Prelude_Double          = mk (fsLit "Data.Array.Parallel.Prelude.Base.Double")
@@ -62,9 +60,11 @@ dph_Modules pkg
   where        mk = mkModule pkg . mkModuleNameFS
 
 
--- | Project out ids of modules that contain orphan instances that we need to load.
 dph_Orphans :: [Modules -> Module]
-dph_Orphans 
- =      [ dph_Repr
-        , dph_PArray_PReprInstances
-        , dph_PArray_PDataInstances ]
+dph_Orphans
+ = [ dph_PArray_Scalar
+   , dph_PArray_ScalarInstances
+   , dph_PArray_PReprInstances
+   , dph_PArray_PDataInstances
+   , dph_Scalar
+   ]