dph-lifted-vseg: formatting and makefile wibbles
authorBen Lippmeier <benl@ouroborus.net>
Tue, 6 Dec 2011 06:26:40 +0000 (17:26 +1100)
committerBen Lippmeier <benl@ouroborus.net>
Tue, 6 Dec 2011 06:26:40 +0000 (17:26 +1100)
dph-examples/dph-examples.cabal
dph-examples/dph-examples.template
dph-lifted-vseg/Data/Array/Parallel/PArray/PData/Nested.hs

index c206e99..7bad628 100644 (file)
@@ -88,12 +88,12 @@ Executable dph-smoke-reverse
 
 
 -- Imaginary ------------------------------------------------------------------
-Executable dph-imaginary-primes
-  Build-depends:  base == 4.4.*, vector == 0.9.*, random == 1.0.*, old-time == 1.0.*, containers == 0.4.*, dph-base == 0.5.*, dph-prim-par == 0.5.*, dph-lifted-vseg == 0.5.*, HUnit == 1.2.*
-  Main-is:        Main.hs
-  other-modules:  Vectorised
-  hs-source-dirs: examples/imaginary/Primes lib
-  ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
+-- Executable dph-imaginary-primes
+--   Build-depends:  base == 4.4.*, vector == 0.9.*, random == 1.0.*, old-time == 1.0.*, containers == 0.4.*, dph-base == 0.5.*, dph-prim-par == 0.5.*, dph-lifted-vseg == 0.5.*, HUnit == 1.2.*
+--   Main-is:        Main.hs
+--   other-modules:  Vectorised
+--   hs-source-dirs: examples/imaginary/Primes lib
+--   ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
 
 Executable dph-imaginary-words
   Build-depends:  base == 4.4.*, vector == 0.9.*, random == 1.0.*, old-time == 1.0.*, containers == 0.4.*, dph-base == 0.5.*, dph-prim-par == 0.5.*, dph-lifted-vseg == 0.5.*, HUnit == 1.2.*
@@ -166,20 +166,18 @@ Executable dph-spectral-quicksort
 --     hs-source-dirs: lib real/NBody real/NBody/Gloss
 --     ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000 -fno-liberate-case
 
-
-
--- Executable dph-real-nbody
---     Main-is:        MainBatch.hs
---     other-modules:  Common.Dump Common.World Common.Body Common.Util 
---                     Solver Solver.ListBH.Solver
---                            Solver.NestedBH.Solver
---                            Solver.VectorBH.Solver
---                            Solver.VectorNaive.Solver
---                     Timing Points2D.Types Points2D.Generate
---                     Batch.MainArgs Batch.Config
---     Build-depends:  base == 4.4.*, vector == 0.9.*, random == 1.0.*, old-time == 1.0.*, containers == 0.4.*, dph-base == 0.5.*, dph-prim-par == 0.5.*, dph-lifted-vseg == 0.5.*, HUnit == 1.2.*
---     hs-source-dirs: examples/real/NBody examples/real/NBody/Batch lib
---     ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
+Executable dph-real-nbody
+    Main-is:        MainBatch.hs
+    other-modules:  Common.Dump Common.World Common.Body Common.Util 
+                    Solver Solver.ListBH.Solver
+                           Solver.NestedBH.Solver
+                           Solver.VectorBH.Solver
+                           Solver.VectorNaive.Solver
+                    Timing Points2D.Types Points2D.Generate
+                    Batch.MainArgs Batch.Config
+    Build-depends:  base == 4.4.*, vector == 0.9.*, random == 1.0.*, old-time == 1.0.*, containers == 0.4.*, dph-base == 0.5.*, dph-prim-par == 0.5.*, dph-lifted-vseg == 0.5.*, HUnit == 1.2.*
+    hs-source-dirs: examples/real/NBody examples/real/NBody/Batch lib
+    ghc-options:    -rtsopts -threaded -fllvm -Odph -package dph-lifted-vseg -fcpr-off -fno-liberate-case -fno-spec-constr -fsimpl-tick-factor=1000
 
 -- dph-real-nbody is broken due to vectorisation error
 -- *** Vectorisation error ***
index 8c47737..8dbb6b1 100644 (file)
@@ -86,12 +86,12 @@ Executable dph-smoke-reverse
 
 
 -- Imaginary ------------------------------------------------------------------
-Executable dph-imaginary-primes
-  Build-depends:  DPH_DEPENDS
-  Main-is:        Main.hs
-  other-modules:  Vectorised
-  hs-source-dirs: examples/imaginary/Primes lib
-  ghc-options:    DPH_OPTIONS
+-- Executable dph-imaginary-primes
+--   Build-depends:  DPH_DEPENDS
+--   Main-is:        Main.hs
+--   other-modules:  Vectorised
+--   hs-source-dirs: examples/imaginary/Primes lib
+--   ghc-options:    DPH_OPTIONS
 
 Executable dph-imaginary-words
   Build-depends:  DPH_DEPENDS
@@ -164,20 +164,18 @@ Executable dph-spectral-quicksort
 --     hs-source-dirs: lib real/NBody real/NBody/Gloss
 --     ghc-options:    DPH_OPTIONS -fno-liberate-case
 
-
-
--- Executable dph-real-nbody
---     Main-is:        MainBatch.hs
---     other-modules:  Common.Dump Common.World Common.Body Common.Util 
---                     Solver Solver.ListBH.Solver
---                            Solver.NestedBH.Solver
---                            Solver.VectorBH.Solver
---                            Solver.VectorNaive.Solver
---                     Timing Points2D.Types Points2D.Generate
---                     Batch.MainArgs Batch.Config
---     Build-depends:  DPH_DEPENDS
---     hs-source-dirs: examples/real/NBody examples/real/NBody/Batch lib
---     ghc-options:    DPH_OPTIONS
+Executable dph-real-nbody
+    Main-is:        MainBatch.hs
+    other-modules:  Common.Dump Common.World Common.Body Common.Util 
+                    Solver Solver.ListBH.Solver
+                           Solver.NestedBH.Solver
+                           Solver.VectorBH.Solver
+                           Solver.VectorNaive.Solver
+                    Timing Points2D.Types Points2D.Generate
+                    Batch.MainArgs Batch.Config
+    Build-depends:  DPH_DEPENDS
+    hs-source-dirs: examples/real/NBody examples/real/NBody/Batch lib
+    ghc-options:    DPH_OPTIONS
 
 -- dph-real-nbody is broken due to vectorisation error
 -- *** Vectorisation error ***
index 0332746..b830c86 100644 (file)
@@ -509,13 +509,13 @@ indexlPR (PNested vsegd pdatas) (PInt ixs)
 concatPR :: PR a => PData (PArray a) -> PData a
 concatPR (PNested vsegd pdatas)
 
-{-      TODO: we want to implement this as rewwrite rules instead of 
-              a branch, so we don't get the branch in the core code.
+--       TODO: we want to implement this as rewwrite rules instead of 
+--              a branch, so we don't get the branch in the core code.
         
         -- If we know that the segments are in a single contiguous array, 
         -- and there is no sharing between them, then we can just return
         -- that array directly.
-        | U.isManifestVSegd   vsegd
+{-        | U.isManifestVSegd   vsegd
         , U.isContiguousVSegd vsegd
         , lengthdPR pdatas == 1
         = pdatas `indexdPR` 0
@@ -525,7 +525,7 @@ concatPR (PNested vsegd pdatas)
         -- into a single contiguous array.
         | otherwise
         = extractvsPR pdatas vsegd
-{-# INLINE_PDATA concatPR  #-}
+{-# NOINLINE concatPR #-}
 
 
 -- | Lifted concatenation.