From 6dddb99f31483f347dbec50d70f2f096e11f135f Mon Sep 17 00:00:00 2001 From: Roman Leshchinskiy Date: Tue, 20 Nov 2007 02:45:45 +0000 Subject: [PATCH] Temporary hack for passing PArrays from unvectorised to vectorised code --- compiler/vectorise/VectBuiltIn.hs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/compiler/vectorise/VectBuiltIn.hs b/compiler/vectorise/VectBuiltIn.hs index f5c27ef..ffb0490 100644 --- a/compiler/vectorise/VectBuiltIn.hs +++ b/compiler/vectorise/VectBuiltIn.hs @@ -67,6 +67,7 @@ nDP_COMBINATORS = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Combinators") nDP_PRELUDE_PARR = gHC_PARR -- mkNDPModule FSLIT("Data.Array.Parallel.Prelude.PArr") nDP_PRELUDE_INT = mkNDPModule FSLIT("Data.Array.Parallel.Prelude.Int") +nDP_PRELUDE = mkNDPModule FSLIT("Data.Array.Parallel.Prelude") data Builtins = Builtins { parrayTyCon :: TyCon @@ -214,6 +215,9 @@ preludeVars , mk nDP_PRELUDE_INT FSLIT("minus") nDP_PRELUDE_INT FSLIT("minusV") , mk nDP_PRELUDE_INT FSLIT("sumP") nDP_PRELUDE_INT FSLIT("sumPA") , mk nDP_PRELUDE_INT FSLIT("upToP") nDP_PRELUDE_INT FSLIT("upToPA") + + -- FIXME: temporary + , mk nDP_PRELUDE FSLIT("fromPArrayP") nDP_PRELUDE FSLIT("fromPArrayPA") ] where mk = (,,,) @@ -224,6 +228,10 @@ initBuiltinTyCons bi -- parr <- externalTyCon nDP_PRELUDE_PARR FSLIT("PArr") return $ (tyConName funTyCon, closureTyCon bi) : (parrTyConName, parrayTyCon bi) + + -- FIXME: temporary + : (tyConName $ parrayTyCon bi, parrayTyCon bi) + : [(tyConName tc, tc) | tc <- defaultTyCons] defaultTyCons :: [TyCon] -- 1.7.10.4