Changeset 161

Timestamp:

12/14/07 03:25:52 (9 months ago)

Author:

Don Clugston

Message:

The index folding visitor is now part of the main line. A preliminary scalar folding visitor is implemented, not yet in the main line.

Files:

• trunk/blade/BladeDemo.d (modified) (2 diffs)
• trunk/blade/BladeRank.d (modified) (2 diffs)
• trunk/blade/BladeSimplify.d (modified) (17 diffs)
• trunk/blade/BladeVisitor.d (modified) (1 diff)

trunk/blade/BladeDemo.d

@@ -34 +34 @@
-    real k=3.4;
-
-//
-/+
-mixin(vectorize(" a-= 2.01*(        3.04+k)*r"));
+
+    mixin(vectorize(" a-= 2.01*(        3.04+k)*r"));
+
-    mixin(vectorize("q+= q*2.01"));
+   
-    // All of the next four are equivalent
-    mixin(vectorize("a+=6*another[1,0..$]"));
@@ -46 +47 @@
-    mixin(vectorize("another[0..$,1]+=6*a[0..2]"));
-    mixin(vectorize("r-=another[0]"));
-
-Parses OK, but I don't think I'll support this
-//    mixin(vectorize("a+=6*another[1,[1
+
+I don't think I'll support this syntax long-term
+    mixin(vectorize("a+=6*another[1,[0
-
-// Parses, and simplifies to A*A, where A = dot(q,q). No codegen yet.
- 
+
-
-    writefln("a=", a);

trunk/blade/BladeRank.d

@@ -164 +164 @@
-        int rrank = doVisit(this_, right);
-        if (rrank<0) return rrank; // propagate errors
+        if (lrank<0) return lrank; // propagate errors
-        if (op=="+" || op=="-" || op=="=" || op=="+=" || op=="-=") {
-            if (lrank!=rrank) {
@@ -179 +180 @@
-            else return RankError.RankMismatchConcatenation;
-        }
-*, /
+/ and /=
-        if ((op=="*=" || op=="/=") && rrank==0) return lrank;
+        if (op=="*=" && lrank==2 && rrank==2) return lrank; // mat *= mat
+        if (op=="*=" && lrank==1 && rrank==2) return lrank; // vec *= mat
-        if (op=="*" || op=="/") {
-            if (lrank==0) return rrank;
-            if (rrank==0) return lrank;
+            if (lrank==2 && rrank==2) return lrank;
+            if (lrank==2 && rrank==2) return lrank;
+            if (lrank+rrank==3) return 1; // vec*mat or mat*vec
-        }
-        // All other operations are only valid for scalars.
-        if (lrank==0 && rrank==0) return 0;
-        return RankError.UnsupportedOperation;
-
-    }
-}

trunk/blade/BladeSimplify.d

@@ -114 +114 @@
-}
-
+// DEPRECATED
-/// As for exprSimplify, but allows the whole thing to be wrapped in parentheses.
-char [] subexprSimplify(char [] expr, char [] rank, char [] mulexpr, char [] indexexpr)
@@ -135 +136 @@
-}
-
+// DEPRECATED
-// Simplify a scalar*tensor expression.
-char [] simplifyScalarMul(char [] scalar, char [] tensor, char [] mulexpr, char [] rank, char [] indexexpr)
@@ -150 +152 @@
-}
-
+// DEPRECATED
-char [] getCommonMultiplucation(char [] expr, char [] rank)
-{
@@ -187 +190 @@
-}
-
-
+
-// Simplify the expression, assuming global scalar multiply has already been removed.
-char [] simplifyWithoutMul(char [] rawExpr, char [] rank)
@@ -229 +232 @@
-}
-
-
+
-/**
- * Rewrite the expression, taking advantage of distributivity of [] and
@@ -255 +258 @@
-            else if (m.length==1) m= "*" ~ m;
-            assert(indexexpr.length==0, "BLADE ICE: rank mismatch in dot product");
-//           assert(0, expr ~ "#" ~ left ~ "#" ~ right ~"#" ~ leftmul ~ "#"~ rightmul);// ~ subexprSimplify(right, rank, mulexpr,"")~"#");
-            return " {d(" ~ simplifyWithoutMul(left, rank) ~ "," ~
-                          simplifyWithoutMul(right, rank) ~ ")} " ~ m;
@@ -310 +312 @@
-}
-
-Allows [a,[b,c],d..e,f] syntax for indices, where [b,c] is a range.
+Determine rank of a multidimensional index
-int indexRank(char [] s)
-{
@@ -319 +321 @@
-        if (s[i]=='(') ++paren;
-        else if (s[i]==')') --paren;
-if (s[i-1]=='[') --r; 
+
-        if (paren==0 && s[i]=='[') {
-            if (numbrack==0) ++r;
@@ -325 +327 @@
-        }
-        if (paren==0 && numbrack==1 && s[i]==',') ++r; // commas increase the rank
-        if (paren==0 && numbrack==2 && s[i]==',') --r; // slices commas don't increase rank.
-        if (paren==0 && numbrack==1 && s[i]=='.' && s[i-1]=='.') {
-            // if it's a slice, it does not increase the rank
@@ -336 +337 @@
-RevisedExpression simplifyVectorExpression(char [] expr, char [] rank, Symbol[] symTable=[])
-{
-
-
+
+
+
-    if (s.length>1 && s[0]=='(') s = s[1..$-1]; // strip off ()
-    char [][] comp;
@@ -417 +419 @@
-    assert(e.expression == "A+=(B*C)");
-    assert(e.rank=="202");
-][
+,
-    assert(e.mapping=="ACE");
-}
@@ -523 +525 @@
-        int lrank = subexprRank(left, this_.rank);
-        int rrank = subexprRank(right, this_.rank);
-
-
+=""
+=""
-        if ((op=="*" || op=="*=") && this_.slicing.length>0) {
-            // If one of these is a matrix, the slicing gets interesting...
-            // .. extremely so for slicing of matrix chain multiplication.
-            // Given U a row vector, V a column vector; A,B,C matrices; x, y scalars:
-            //  (U*V)[x][y]  = U[x]*V[y]
-            //  (U*V)[x] = 
-            //  (U*A)[x]  = U*A[,x]
-            //  (A*U)[x]  = A[x]*U
-            //  (A*B)[x] = A[x]*B.
-            //  (A*B)[x..y] = A[x..y]*B[,x..y]
-            //  (A*B)[x][y] = A[x]*B[,y]
-            //  (A*B*C)[x][y]
-            if (lrank==0) {
-                // All dimensions apply to right operand
@@ -545 +538 @@
-                first = wrapInParens(doVisit(this_, left));
-                second = wrapInParens(doVisit(IndexFoldingVisitor(this_.rank, this_.dollar,[]), right));
-               
-
+
+>0 && rrank>0 && lrank
-                bool isDotProduct = false; // was it reduced to a dot product?
+                
+                // In the case of chained matrix multiplies, we can end up with an empty slice.
+                if (this_.slicing.length>0 && this_.slicing[$-1][0]=="") {
+                    this_.slicing=this_.slicing[0..$-1];
+                }
-                if (lrank==2) {
-                    // First dimension applies to rows of the left operand
-
+
+
+
-                    char [][2][] newslice=[];
-                    newslice ~= this_.slicing[0];
@@ -579 +579 @@
-                    second = wrapInParens(doVisit(IndexFoldingVisitor(this_.rank, this_.dollar,[]), right));
-                    if (this_.slicing[0][1].length==0)  isDotProduct = true;
-
+ else assert(0, "BLADE ICE");
-                if (isDotProduct) {
-                  return "d(" ~ first ~ "," ~ second ~ ")";
@@ -585 +585 @@
-            }
-        } else {
-first = wrapInParens(doVisit(this_, left));
-second =
-        
+// in DMD1.024, nasty compiler bug if you save the first & second results into a local variable
+return wrapInParens(doVisit(this_, left)) ~ op ~
+
-        return first ~ op ~ second;
-    }
@@ -597 +597 @@
-}
-
-
-
+
-    assert(foldIndices("((A[C..D])+B)[($-E)]", "21000")=="(A[C+((D-C)-E)])+(B[($-E)])");
-    assert(foldIndices("(A[C])[D]", "3100")=="A[C,D]");
@@ -615 +614 @@
-    assert(foldIndices("(A*B)[C..D]", "1200")=="A*(B[C..D])");
-    assert(foldIndices("(A*B)[C]", "120")=="d(A,(B[C]))");
+    
+    assert(foldIndices("((A*B)*C)[D]", "2220")=="((A[D,])*B)*C");
+    assert(foldIndices("((A+B)*C)[D]", "2220")=="((A[D,])+(B[D,]))*C");
-    assert(foldIndices("((D*A)*B)[C]", "2100")=="d((D*(A[C,])),B)");
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/blade/BladeVisitor.d

@@ -71 +71 @@
-                ++z;
-            } else {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-             }
-        }