Changes between Version 24 and Version 25 of DataParallel/Regular

Timestamp:

01/19/10 04:43:47 (3 years ago)

Author:

gckeller

Comment:

--

DataParallel/Regular

@@ -370 +370 @@
 use `forceDArray`, which converts it into an array whose array function is a simple indexing operation (see description of `forceDArray` above). This means that the second version requires more memory, but this is offset by improving the locality for each of the multiplications. 
 
-{{{
--- mmMult:: (Array.RepFun dim, Array.InitShape dim, Array.Shape dim) => 
---   DArray (dim :*: Int :*: Int)  Double -> DArray (dim :*: Int :*: Int)  Double -> DArray (dim :*: Int :*: Int)  Double  
-mmMult::
-   DArray (() :*: Int :*: Int)  Double -> DArray (() :*: Int :*: Int)  Double -> DArray (() :*: Int :*: Int)  Double  
+
+{{{
+mmMult:: (Array.RepFun dim, Array.InitShape dim, Array.Shape dim) => 
+    DArray (dim :*: Int :*: Int)  Double -> DArray (dim :*: Int :*: Int)  Double -> DArray (dim :*: Int :*: Int)  Double  
 mmMult arr1@(DArray (sh :*: m1 :*: n1) fn1) arr2@(DArray (sh' :*: m2 :*: n2) fn2) = 
-  assert ((m1 == n2) && (sh == sh')) $ 
-    mapFold (+) 0 (arr1Ext * arr2Ext)
---  'fold' doesn't fuse at the moment, so mapFold is significantly faster
---  fold (+) 0 $ zipWith (*) arr1Ext arr2Ext
-  where
+   fold (+) 0 (arr1Ext * arr2Ext)
+ where
     arr2T   = forceDArray $ transpose arr2  -- forces evaluation of 'transpose'
     arr1Ext = replicate arr1 (Array.IndexAll (Array.IndexFixed m2 (Array.IndexAll Array.IndexNil)))
@@ -399 +395 @@
 === Wave computations ===
 
-=== Generalised Stencil Operation ===
-
-MapStencil is currently not lifted, and doesn't run in parallel. Need to come up with a generalised version. 
+=