http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor26d.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor26d.dml b/src/test/scripts/functions/parfor/parfor26d.dml index 3450e3f..0dc5a6d 100644 --- a/src/test/scripts/functions/parfor/parfor26d.dml +++ b/src/test/scripts/functions/parfor/parfor26d.dml @@ -19,14 +19,14 @@ # #------------------------------------------------------------- - -A = matrix(0, rows=10,cols=10); -dummy = matrix(1, rows=1,cols=1); - -parfor( i in 2:10 ) -{ - A[i,1] = dummy*i; - A[i-1,1] = dummy*i; -} - + +A = matrix(0, rows=10,cols=10); +dummy = matrix(1, rows=1,cols=1); + +parfor( i in 2:10 ) +{ + A[i,1] = dummy*i; + A[i-1,1] = dummy*i; +} + #print(A); \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor27.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor27.dml b/src/test/scripts/functions/parfor/parfor27.dml index a315eac..ae578be 100644 --- a/src/test/scripts/functions/parfor/parfor27.dml +++ b/src/test/scripts/functions/parfor/parfor27.dml @@ -19,16 +19,16 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); -B = Rand(rows=20,cols=20); - -parfor( i in 1:20 ) -{ - for( j in 1:20 ) - { - A[1,j] = B[i,j]+(i+j); - } -} - + +A = matrix(0,rows=20,cols=20); +B = Rand(rows=20,cols=20); + +parfor( i in 1:20 ) +{ + for( j in 1:20 ) + { + A[1,j] = B[i,j]+(i+j); + } +} + #print(A); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor28.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor28.dml b/src/test/scripts/functions/parfor/parfor28.dml index 3cd1a00..81fca1f 100644 --- a/src/test/scripts/functions/parfor/parfor28.dml +++ b/src/test/scripts/functions/parfor/parfor28.dml @@ -19,16 +19,16 @@ # #------------------------------------------------------------- - -A = matrix(0, rows=20,cols=20); -B = Rand(rows=20,cols=20); - -parfor( i in 1:20 ) -{ - parfor( j in 1:20 ) - { - A[i,j] = B[i,j]+(i+j); - } -} - + +A = matrix(0, rows=20,cols=20); +B = Rand(rows=20,cols=20); + +parfor( i in 1:20 ) +{ + parfor( j in 1:20 ) + { + A[i,j] = B[i,j]+(i+j); + } +} + #print(A); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor28b.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor28b.dml b/src/test/scripts/functions/parfor/parfor28b.dml index 2ee3451..b4d214b 100644 --- a/src/test/scripts/functions/parfor/parfor28b.dml +++ b/src/test/scripts/functions/parfor/parfor28b.dml @@ -19,22 +19,22 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); -B = Rand(rows=20,cols=20); - -parfor( i in 1:20 ) -{ - k = 0; - while( k < 10 ) - { - parfor( j in 1:20 ) - { - A[i,j] = B[i,j]+(i+j); - } - - k = k + 1; - } -} - + +A = matrix(0,rows=20,cols=20); +B = Rand(rows=20,cols=20); + +parfor( i in 1:20 ) +{ + k = 0; + while( k < 10 ) + { + parfor( j in 1:20 ) + { + A[i,j] = B[i,j]+(i+j); + } + + k = k + 1; + } +} + #print(A); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor28c.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor28c.dml b/src/test/scripts/functions/parfor/parfor28c.dml index f16a979..b7053e8 100644 --- a/src/test/scripts/functions/parfor/parfor28c.dml +++ b/src/test/scripts/functions/parfor/parfor28c.dml @@ -19,16 +19,16 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); -B = Rand(rows=20,cols=20); - -for( i in 1:20 ) -{ - parfor( j in 1:20 ) - { - A[i,j] = A[i-1,j]+B[i,j]+(i+j); - } -} - + +A = matrix(0,rows=20,cols=20); +B = Rand(rows=20,cols=20); + +for( i in 1:20 ) +{ + parfor( j in 1:20 ) + { + A[i,j] = A[i-1,j]+B[i,j]+(i+j); + } +} + #print(A); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor28d.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor28d.dml b/src/test/scripts/functions/parfor/parfor28d.dml index 7d1201c..1da9244 100644 --- a/src/test/scripts/functions/parfor/parfor28d.dml +++ b/src/test/scripts/functions/parfor/parfor28d.dml @@ -19,16 +19,16 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); -B = Rand(rows=20,cols=20); - -parfor( i in 1:20 ) -{ - parfor( j in 1:20 ) - { - A[i,j] = A[i-1,j]+B[i,j]+(i+j); - } -} - + +A = matrix(0,rows=20,cols=20); +B = Rand(rows=20,cols=20); + +parfor( i in 1:20 ) +{ + parfor( j in 1:20 ) + { + A[i,j] = A[i-1,j]+B[i,j]+(i+j); + } +} + #print(A); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor28e.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor28e.dml b/src/test/scripts/functions/parfor/parfor28e.dml index 730ec53..654c276 100644 --- a/src/test/scripts/functions/parfor/parfor28e.dml +++ b/src/test/scripts/functions/parfor/parfor28e.dml @@ -19,18 +19,18 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); -B = Rand(rows=20,cols=20); - -parfor( i in 1:20 ) -{ - A[i,] = A[i,]+2; - - parfor( j in 1:20 ) - { - print(j); - } -} - + +A = matrix(0,rows=20,cols=20); +B = Rand(rows=20,cols=20); + +parfor( i in 1:20 ) +{ + A[i,] = A[i,]+2; + + parfor( j in 1:20 ) + { + print(j); + } +} + #print(A); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor28f.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor28f.dml b/src/test/scripts/functions/parfor/parfor28f.dml index 06d147e..8aba85a 100644 --- a/src/test/scripts/functions/parfor/parfor28f.dml +++ b/src/test/scripts/functions/parfor/parfor28f.dml @@ -19,21 +19,21 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); -B = Rand(rows=20,cols=20); - -parfor( i in 1:20 ) -{ - A[i,] = A[i,]+2; - - if( 1>1 ) - { - parfor( j in 1:20 ) - { - print(j); - } - } -} - + +A = matrix(0,rows=20,cols=20); +B = Rand(rows=20,cols=20); + +parfor( i in 1:20 ) +{ + A[i,] = A[i,]+2; + + if( 1>1 ) + { + parfor( j in 1:20 ) + { + print(j); + } + } +} + #print(A); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor28g.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor28g.dml b/src/test/scripts/functions/parfor/parfor28g.dml index a7d7e60..1e1b4c0 100644 --- a/src/test/scripts/functions/parfor/parfor28g.dml +++ b/src/test/scripts/functions/parfor/parfor28g.dml @@ -19,24 +19,24 @@ # #------------------------------------------------------------- - -A = Rand(rows=3,cols=1); - -p = 2; -P = 0; -s = 0; -n = nrow(A); - -tr = n-(s*P+p) -tc = 1+P*p+P+p - -B = matrix(1,rows=tr,cols=tc); - -parfor(i in 1:p){ - B[,1+i] = A[s*P+p-i+1:n-i,] -} -parfor(j in 1:P){ - parfor(k in 0:p){ - B[,j*(p+1)+k+1] = A[s*P+p-s*j-k+1:n-s*j-k,] - } -} + +A = Rand(rows=3,cols=1); + +p = 2; +P = 0; +s = 0; +n = nrow(A); + +tr = n-(s*P+p) +tc = 1+P*p+P+p + +B = matrix(1,rows=tr,cols=tc); + +parfor(i in 1:p){ + B[,1+i] = A[s*P+p-i+1:n-i,] +} +parfor(j in 1:P){ + parfor(k in 0:p){ + B[,j*(p+1)+k+1] = A[s*P+p-s*j-k+1:n-s*j-k,] + } +} http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor28h.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor28h.dml b/src/test/scripts/functions/parfor/parfor28h.dml index 03cdd6c..97c3530 100644 --- a/src/test/scripts/functions/parfor/parfor28h.dml +++ b/src/test/scripts/functions/parfor/parfor28h.dml @@ -19,23 +19,23 @@ # #------------------------------------------------------------- - -#example usecase from LSML, orderedDistances.dml - -n_t = 1000; -n_f = 77; -X_train = matrix(1, rows=n_t,cols=n_f); -alldist = matrix(0, rows=n_t, cols=n_t); -parfor(r in 1:(n_t-1)) -{ - Xr = X_train[r,]; - myd = matrix (0, rows = 1, cols = n_t) - parfor(c in (r+1):n_t) { - tmp = rowSums((Xr - X_train[c,])^2); - myd[1,c] = tmp; - } - alldist[r,] = myd; -} -alldist = alldist + t(alldist); -print(sum(alldist)); - + +#example usecase from LSML, orderedDistances.dml + +n_t = 1000; +n_f = 77; +X_train = matrix(1, rows=n_t,cols=n_f); +alldist = matrix(0, rows=n_t, cols=n_t); +parfor(r in 1:(n_t-1)) +{ + Xr = X_train[r,]; + myd = matrix (0, rows = 1, cols = n_t) + parfor(c in (r+1):n_t) { + tmp = rowSums((Xr - X_train[c,])^2); + myd[1,c] = tmp; + } + alldist[r,] = myd; +} +alldist = alldist + t(alldist); +print(sum(alldist)); + http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor29.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor29.dml b/src/test/scripts/functions/parfor/parfor29.dml index 21fa299..e08fdcf 100644 --- a/src/test/scripts/functions/parfor/parfor29.dml +++ b/src/test/scripts/functions/parfor/parfor29.dml @@ -19,14 +19,14 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); -dummy = matrix(1, rows=1,cols=1); - -parfor( i in 1:20 ) -{ - k = i; - A[i,k] = dummy*i; -} - + +A = matrix(0,rows=20,cols=20); +dummy = matrix(1, rows=1,cols=1); + +parfor( i in 1:20 ) +{ + k = i; + A[i,k] = dummy*i; +} + #print(A); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor3.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor3.dml b/src/test/scripts/functions/parfor/parfor3.dml index 0226555..33d40de 100644 --- a/src/test/scripts/functions/parfor/parfor3.dml +++ b/src/test/scripts/functions/parfor/parfor3.dml @@ -19,13 +19,13 @@ # #------------------------------------------------------------- - -a = 1; - -parfor( i in 1:(a+10) ) -{ - b = i + a; - #print(b); -} - + +a = 1; + +parfor( i in 1:(a+10) ) +{ + b = i + a; + #print(b); +} + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor30.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor30.dml b/src/test/scripts/functions/parfor/parfor30.dml index 6cf512c..a69dc46 100644 --- a/src/test/scripts/functions/parfor/parfor30.dml +++ b/src/test/scripts/functions/parfor/parfor30.dml @@ -19,13 +19,13 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); -dummy = matrix(1, rows=1,cols=20); - -parfor( i in 1:20 ) -{ - A[i,]=dummy*i; -} - + +A = matrix(0,rows=20,cols=20); +dummy = matrix(1, rows=1,cols=20); + +parfor( i in 1:20 ) +{ + A[i,]=dummy*i; +} + #print(A); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor31.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor31.dml b/src/test/scripts/functions/parfor/parfor31.dml index 510de9a..a6c220e 100644 --- a/src/test/scripts/functions/parfor/parfor31.dml +++ b/src/test/scripts/functions/parfor/parfor31.dml @@ -19,20 +19,20 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); -B = matrix(0,rows=20,cols=20); -C = matrix(0,rows=20,cols=20); -dummy1 = matrix(1,rows=10,cols=1); -dummy2 = matrix(1,rows=1,cols=10); - -parfor( i in 1:20 ) -{ - A[1:10,i]=dummy1*i; - A[11:20,i]=dummy1*i; - - B[i,1:10]=dummy2*i; - B[i,11:20]=dummy2*i; -} - + +A = matrix(0,rows=20,cols=20); +B = matrix(0,rows=20,cols=20); +C = matrix(0,rows=20,cols=20); +dummy1 = matrix(1,rows=10,cols=1); +dummy2 = matrix(1,rows=1,cols=10); + +parfor( i in 1:20 ) +{ + A[1:10,i]=dummy1*i; + A[11:20,i]=dummy1*i; + + B[i,1:10]=dummy2*i; + B[i,11:20]=dummy2*i; +} + #print(C); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor31b.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor31b.dml b/src/test/scripts/functions/parfor/parfor31b.dml index 28cd9ee..e472c82 100644 --- a/src/test/scripts/functions/parfor/parfor31b.dml +++ b/src/test/scripts/functions/parfor/parfor31b.dml @@ -19,20 +19,20 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); -B = matrix(0,rows=20,cols=20); -C = matrix(0,rows=20,cols=20); -dummy1 = matrix(1,rows=10,cols=1); -dummy2 = matrix(1,rows=1,cols=10); - -parfor( i in 1:20 ) -{ - A[1:10,i]=dummy1*i; - A[11:nrow(A),i]=dummy1*i; - - B[i,1:10]=dummy2*i; - B[i,11:ncol(B)]=dummy2*i; -} - + +A = matrix(0,rows=20,cols=20); +B = matrix(0,rows=20,cols=20); +C = matrix(0,rows=20,cols=20); +dummy1 = matrix(1,rows=10,cols=1); +dummy2 = matrix(1,rows=1,cols=10); + +parfor( i in 1:20 ) +{ + A[1:10,i]=dummy1*i; + A[11:nrow(A),i]=dummy1*i; + + B[i,1:10]=dummy2*i; + B[i,11:ncol(B)]=dummy2*i; +} + #print(C); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor32.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor32.dml b/src/test/scripts/functions/parfor/parfor32.dml index 812a87b..ac0875a 100644 --- a/src/test/scripts/functions/parfor/parfor32.dml +++ b/src/test/scripts/functions/parfor/parfor32.dml @@ -19,17 +19,17 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); -B = matrix(0,rows=20,cols=20); -C = matrix(0,rows=20,cols=20); -dummy = matrix(1, rows=1,cols=1); - -parfor( i in 1:20 ) -{ - A[1:10,i]=dummy*i; - A[i,5]=dummy*i; - -} - + +A = matrix(0,rows=20,cols=20); +B = matrix(0,rows=20,cols=20); +C = matrix(0,rows=20,cols=20); +dummy = matrix(1, rows=1,cols=1); + +parfor( i in 1:20 ) +{ + A[1:10,i]=dummy*i; + A[i,5]=dummy*i; + +} + #print(C); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor32b.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor32b.dml b/src/test/scripts/functions/parfor/parfor32b.dml index c2d938d..42fcf34 100644 --- a/src/test/scripts/functions/parfor/parfor32b.dml +++ b/src/test/scripts/functions/parfor/parfor32b.dml @@ -19,16 +19,16 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); -B = matrix(0,rows=20,cols=20); -C = matrix(0,rows=20,cols=20); -dummy = matrix(1,rows=1,cols=1); - -parfor( i in 1:20 ) -{ - A[i:i,1]=dummy*i; - A[i:(i+1),1]=dummy*i; -} - + +A = matrix(0,rows=20,cols=20); +B = matrix(0,rows=20,cols=20); +C = matrix(0,rows=20,cols=20); +dummy = matrix(1,rows=1,cols=1); + +parfor( i in 1:20 ) +{ + A[i:i,1]=dummy*i; + A[i:(i+1),1]=dummy*i; +} + #print(C); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor32c.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor32c.dml b/src/test/scripts/functions/parfor/parfor32c.dml index 9e80544..6cf0bb4 100644 --- a/src/test/scripts/functions/parfor/parfor32c.dml +++ b/src/test/scripts/functions/parfor/parfor32c.dml @@ -19,17 +19,17 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); -B = matrix(0,rows=20,cols=20); -C = matrix(0,rows=20,cols=20); -dummy = matrix(1,rows=1,cols=1); - -parfor( i in 1:20 ) -{ - A[i:i,1]=dummy*i; - A[i:i,2]=dummy*i; - A[i,1]=dummy*i; -} - + +A = matrix(0,rows=20,cols=20); +B = matrix(0,rows=20,cols=20); +C = matrix(0,rows=20,cols=20); +dummy = matrix(1,rows=1,cols=1); + +parfor( i in 1:20 ) +{ + A[i:i,1]=dummy*i; + A[i:i,2]=dummy*i; + A[i,1]=dummy*i; +} + #print(C); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor32d.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor32d.dml b/src/test/scripts/functions/parfor/parfor32d.dml index ea719e2..4c348a3 100644 --- a/src/test/scripts/functions/parfor/parfor32d.dml +++ b/src/test/scripts/functions/parfor/parfor32d.dml @@ -19,13 +19,13 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); -dummy = matrix(1,rows=1,cols=1); - -parfor( i in 1:20 ) -{ - A[,]=dummy*i; -} - + +A = matrix(0,rows=20,cols=20); +dummy = matrix(1,rows=1,cols=1); + +parfor( i in 1:20 ) +{ + A[,]=dummy*i; +} + #print(C); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor32e.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor32e.dml b/src/test/scripts/functions/parfor/parfor32e.dml index 7636818..552132f 100644 --- a/src/test/scripts/functions/parfor/parfor32e.dml +++ b/src/test/scripts/functions/parfor/parfor32e.dml @@ -19,14 +19,14 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); -dummy = matrix(1,rows=1,cols=1); - -parfor( i in 1:20 ) -{ - k=dummy*(i-1); - A[k,]=dummy*i; -} - + +A = matrix(0,rows=20,cols=20); +dummy = matrix(1,rows=1,cols=1); + +parfor( i in 1:20 ) +{ + k=dummy*(i-1); + A[k,]=dummy*i; +} + #print(C); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor33.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor33.dml b/src/test/scripts/functions/parfor/parfor33.dml index 06cd2ad..cf25f5b 100644 --- a/src/test/scripts/functions/parfor/parfor33.dml +++ b/src/test/scripts/functions/parfor/parfor33.dml @@ -19,15 +19,15 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); -B = Rand(rows=20,cols=3,min=1,max=20); -dummy = matrix(1,rows=1,cols=1); - -parfor( i in 1:20 ) -{ - A[1,i]=dummy*i; - A[2,B[i,]]=dummy*i; -} - + +A = matrix(0,rows=20,cols=20); +B = Rand(rows=20,cols=3,min=1,max=20); +dummy = matrix(1,rows=1,cols=1); + +parfor( i in 1:20 ) +{ + A[1,i]=dummy*i; + A[2,B[i,]]=dummy*i; +} + #print(C); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor34.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor34.dml b/src/test/scripts/functions/parfor/parfor34.dml index 075518c..3ae4e6a 100644 --- a/src/test/scripts/functions/parfor/parfor34.dml +++ b/src/test/scripts/functions/parfor/parfor34.dml @@ -19,15 +19,15 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); -B = Rand(rows=20,cols=3,min=1,max=20); -dummy = matrix(1,rows=1,cols=1); - -parfor( i in 1:20 ) -{ - A[1,i]=dummy*i; - A[B[,1],2]=dummy*i; -} - + +A = matrix(0,rows=20,cols=20); +B = Rand(rows=20,cols=3,min=1,max=20); +dummy = matrix(1,rows=1,cols=1); + +parfor( i in 1:20 ) +{ + A[1,i]=dummy*i; + A[B[,1],2]=dummy*i; +} + #print(C); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor35.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor35.dml b/src/test/scripts/functions/parfor/parfor35.dml index 32f0735..81f7564 100644 --- a/src/test/scripts/functions/parfor/parfor35.dml +++ b/src/test/scripts/functions/parfor/parfor35.dml @@ -19,16 +19,16 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); -B = Rand(rows=20,cols=3,min=1,max=20); -dummy = matrix(1, rows=1,cols=1); - -parfor( i in 1:20 ) -{ - val = castAsScalar(B[i,i]); - b = A[i,val]; #due to parser change A[i,B[i,]]; - c = dummy*(b+i); -} - + +A = matrix(0,rows=20,cols=20); +B = Rand(rows=20,cols=3,min=1,max=20); +dummy = matrix(1, rows=1,cols=1); + +parfor( i in 1:20 ) +{ + val = castAsScalar(B[i,i]); + b = A[i,val]; #due to parser change A[i,B[i,]]; + c = dummy*(b+i); +} + #print(C); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor35b.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor35b.dml b/src/test/scripts/functions/parfor/parfor35b.dml index 10affce..4a69d10 100644 --- a/src/test/scripts/functions/parfor/parfor35b.dml +++ b/src/test/scripts/functions/parfor/parfor35b.dml @@ -1,31 +1,31 @@ -#------------------------------------------------------------- -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#------------------------------------------------------------- - - -A = Rand(rows=20,cols=20,min=1,max=20); - -parfor( i in 1:19 ) -{ - A[i+1.0, 1] = i; - A[1, i+1.0] = i^2; -} - +#------------------------------------------------------------- +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#------------------------------------------------------------- + + +A = Rand(rows=20,cols=20,min=1,max=20); + +parfor( i in 1:19 ) +{ + A[i+1.0, 1] = i; + A[1, i+1.0] = i^2; +} + print(sum(A)); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor35c.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor35c.dml b/src/test/scripts/functions/parfor/parfor35c.dml index 6aae1b9..b47c205 100644 --- a/src/test/scripts/functions/parfor/parfor35c.dml +++ b/src/test/scripts/functions/parfor/parfor35c.dml @@ -1,31 +1,31 @@ -#------------------------------------------------------------- -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#------------------------------------------------------------- - - -A = Rand(rows=20,cols=20,min=1,max=20); - -parfor( i in 1:9 ) -{ - A[i*2.0, 1] = i; - A[1, i*2.0] = i^2; -} - +#------------------------------------------------------------- +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#------------------------------------------------------------- + + +A = Rand(rows=20,cols=20,min=1,max=20); + +parfor( i in 1:9 ) +{ + A[i*2.0, 1] = i; + A[1, i*2.0] = i^2; +} + print(sum(A)); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor35d.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor35d.dml b/src/test/scripts/functions/parfor/parfor35d.dml index ff3db83..d22b840 100644 --- a/src/test/scripts/functions/parfor/parfor35d.dml +++ b/src/test/scripts/functions/parfor/parfor35d.dml @@ -1,31 +1,31 @@ -#------------------------------------------------------------- -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#------------------------------------------------------------- - - -A = Rand(rows=20,cols=20,min=1,max=20); - -parfor( i in 1:2 ) -{ - A[i+7.3, 1] = i; - A[1, i+7.3] = i^2; -} - +#------------------------------------------------------------- +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#------------------------------------------------------------- + + +A = Rand(rows=20,cols=20,min=1,max=20); + +parfor( i in 1:2 ) +{ + A[i+7.3, 1] = i; + A[1, i+7.3] = i^2; +} + print(sum(A)); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor36.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor36.dml b/src/test/scripts/functions/parfor/parfor36.dml index 30d9de4..f47365b 100644 --- a/src/test/scripts/functions/parfor/parfor36.dml +++ b/src/test/scripts/functions/parfor/parfor36.dml @@ -19,12 +19,12 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); - -parfor( i in 1:10 ) -{ - A[1,i+3] = A[1,i]; -} - + +A = matrix(0,rows=20,cols=20); + +parfor( i in 1:10 ) +{ + A[1,i+3] = A[1,i]; +} + #print(C); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor37.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor37.dml b/src/test/scripts/functions/parfor/parfor37.dml index f5c0267..0f84b8e 100644 --- a/src/test/scripts/functions/parfor/parfor37.dml +++ b/src/test/scripts/functions/parfor/parfor37.dml @@ -19,12 +19,12 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=20,cols=20); - -parfor( i in 1:10 ) -{ - A[1,i+10] = A[1,i]; -} - + +A = matrix(0,rows=20,cols=20); + +parfor( i in 1:10 ) +{ + A[1,i+10] = A[1,i]; +} + #print(C); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor38.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor38.dml b/src/test/scripts/functions/parfor/parfor38.dml index 972f117..f3749c0 100644 --- a/src/test/scripts/functions/parfor/parfor38.dml +++ b/src/test/scripts/functions/parfor/parfor38.dml @@ -19,13 +19,13 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=10,cols=1); -B = Rand(rows=10,cols=1); - -parfor( i in 2:10 ) -{ - A[i,1] = B[i,1] + A[i-1,1] + A[i,1]; -} - + +A = matrix(0,rows=10,cols=1); +B = Rand(rows=10,cols=1); + +parfor( i in 2:10 ) +{ + A[i,1] = B[i,1] + A[i-1,1] + A[i,1]; +} + #print(A); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor39.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor39.dml b/src/test/scripts/functions/parfor/parfor39.dml index b466312..3a55d8d 100644 --- a/src/test/scripts/functions/parfor/parfor39.dml +++ b/src/test/scripts/functions/parfor/parfor39.dml @@ -19,13 +19,13 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=10,cols=1); -B = Rand(rows=10,cols=1); - -parfor( i in 2:10 ) -{ - A[i,1] = B[i,1] + A[i,1] + A[i-1,1]; -} - + +A = matrix(0,rows=10,cols=1); +B = Rand(rows=10,cols=1); + +parfor( i in 2:10 ) +{ + A[i,1] = B[i,1] + A[i,1] + A[i-1,1]; +} + #print(A); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor4.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor4.dml b/src/test/scripts/functions/parfor/parfor4.dml index f68879c..57c78f0 100644 --- a/src/test/scripts/functions/parfor/parfor4.dml +++ b/src/test/scripts/functions/parfor/parfor4.dml @@ -19,13 +19,13 @@ # #------------------------------------------------------------- - -a = 1; - -parfor( i in 1:(10+a) ) -{ - b = i + a; - #print(b); -} - + +a = 1; + +parfor( i in 1:(10+a) ) +{ + b = i + a; + #print(b); +} + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor40.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor40.dml b/src/test/scripts/functions/parfor/parfor40.dml index 53a46a8..57335b7 100644 --- a/src/test/scripts/functions/parfor/parfor40.dml +++ b/src/test/scripts/functions/parfor/parfor40.dml @@ -19,20 +19,20 @@ # #------------------------------------------------------------- - -execSum = function(Matrix[Double] X, Matrix[Double] Y) return (Matrix[Double] Z, Matrix[Double] V) -{ - Z = X + Y; - V = X + Y; -} - - -A = matrix(0,rows=10,cols=1); -B = Rand(rows=10,cols=1); - -parfor( i in 2:10 ) -{ - [A[i-1,1],A[i,1]] = execSum( B[i,1], A[i,1] ); -} - + +execSum = function(Matrix[Double] X, Matrix[Double] Y) return (Matrix[Double] Z, Matrix[Double] V) +{ + Z = X + Y; + V = X + Y; +} + + +A = matrix(0,rows=10,cols=1); +B = Rand(rows=10,cols=1); + +parfor( i in 2:10 ) +{ + [A[i-1,1],A[i,1]] = execSum( B[i,1], A[i,1] ); +} + #print(A); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor41.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor41.dml b/src/test/scripts/functions/parfor/parfor41.dml index ab77a0e..3780873 100644 --- a/src/test/scripts/functions/parfor/parfor41.dml +++ b/src/test/scripts/functions/parfor/parfor41.dml @@ -19,20 +19,20 @@ # #------------------------------------------------------------- - -execSum = function(Matrix[Double] X, Matrix[Double] Y) return (Matrix[Double] Z, Matrix[Double] V) -{ - Z = X + Y; - V = X + Y; -} - - -A = matrix(0,rows=10,cols=1); -B = Rand(rows=10,cols=1); - -parfor( i in 2:10 ) -{ - [A[i,1],A[i-1,1]] = execSum( B[i,1], A[i,1] ); -} - + +execSum = function(Matrix[Double] X, Matrix[Double] Y) return (Matrix[Double] Z, Matrix[Double] V) +{ + Z = X + Y; + V = X + Y; +} + + +A = matrix(0,rows=10,cols=1); +B = Rand(rows=10,cols=1); + +parfor( i in 2:10 ) +{ + [A[i,1],A[i-1,1]] = execSum( B[i,1], A[i,1] ); +} + #print(A); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor42.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor42.dml b/src/test/scripts/functions/parfor/parfor42.dml index 50a4580..5f5b833 100644 --- a/src/test/scripts/functions/parfor/parfor42.dml +++ b/src/test/scripts/functions/parfor/parfor42.dml @@ -19,13 +19,13 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=10,cols=1); -B = Rand(rows=10,cols=1); - -parfor( i in 2:10 ) -{ - A[i,1] = B[i,1] + sum(A[i-1,1]) + A[i,1]; -} - + +A = matrix(0,rows=10,cols=1); +B = Rand(rows=10,cols=1); + +parfor( i in 2:10 ) +{ + A[i,1] = B[i,1] + sum(A[i-1,1]) + A[i,1]; +} + #print(A); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor43.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor43.dml b/src/test/scripts/functions/parfor/parfor43.dml index c43d4bd..b1988a2 100644 --- a/src/test/scripts/functions/parfor/parfor43.dml +++ b/src/test/scripts/functions/parfor/parfor43.dml @@ -19,13 +19,13 @@ # #------------------------------------------------------------- - -A = matrix(0,rows=10,cols=1); -B = Rand(rows=10,cols=1); - -parfor( i in 2:10 ) -{ - A[i,1] = B[i,1] + sum(A[i,1]) + A[i,1]; -} - + +A = matrix(0,rows=10,cols=1); +B = Rand(rows=10,cols=1); + +parfor( i in 2:10 ) +{ + A[i,1] = B[i,1] + sum(A[i,1]) + A[i,1]; +} + #print(A); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor44.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor44.dml b/src/test/scripts/functions/parfor/parfor44.dml index 7b26740..daaa732 100644 --- a/src/test/scripts/functions/parfor/parfor44.dml +++ b/src/test/scripts/functions/parfor/parfor44.dml @@ -19,12 +19,12 @@ # #------------------------------------------------------------- - -B = Rand(rows=10,cols=1); - -parfor( i in 1:10 ) -{ - A = Rand(rows=10,cols=1); -} - + +B = Rand(rows=10,cols=1); + +parfor( i in 1:10 ) +{ + A = Rand(rows=10,cols=1); +} + B = B * A \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor45.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor45.dml b/src/test/scripts/functions/parfor/parfor45.dml index a9b334d..747d9b3 100644 --- a/src/test/scripts/functions/parfor/parfor45.dml +++ b/src/test/scripts/functions/parfor/parfor45.dml @@ -19,20 +19,20 @@ # #------------------------------------------------------------- - -numC = 5; -numF = 10; - -A = Rand(rows=numC, cols=numF, min=0.0, max=1.0, sparsity=1.0) - -parfor(i in 1:numC ) { - A[i,] = A[i,]/sum(A[i,]); -} - -B = matrix(0, rows=numC, cols=numF) - -parfor(i in 1:numC) { - for (j in 2:numF) { - B[i,j] = B[i,j-1] + A[i,j]; - } + +numC = 5; +numF = 10; + +A = Rand(rows=numC, cols=numF, min=0.0, max=1.0, sparsity=1.0) + +parfor(i in 1:numC ) { + A[i,] = A[i,]/sum(A[i,]); +} + +B = matrix(0, rows=numC, cols=numF) + +parfor(i in 1:numC) { + for (j in 2:numF) { + B[i,j] = B[i,j-1] + A[i,j]; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor46.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor46.dml b/src/test/scripts/functions/parfor/parfor46.dml index 2b5691b..95f799f 100644 --- a/src/test/scripts/functions/parfor/parfor46.dml +++ b/src/test/scripts/functions/parfor/parfor46.dml @@ -19,28 +19,28 @@ # #------------------------------------------------------------- - -numC = 5; -numF = 10; - -A = Rand(rows=numC, cols=numF, min=0.0, max=1.0, sparsity=1.0) -B = matrix(0, rows=numC, cols=numF) #classFeatureCumulativeDensityFunction -C = matrix(0, rows=numC, cols=numF) #tempCumulative - -parfor(i in 1:numC ) -{ - A[i,] = A[i,]/sum(A[i,]); - C[i,1] = A[i,1]; - - for (j in 2:numF) - { - C[i,j] = C[i,j-1] + A[i,j]; - } - - B[i,] = C[i,]; -} - - - - - + +numC = 5; +numF = 10; + +A = Rand(rows=numC, cols=numF, min=0.0, max=1.0, sparsity=1.0) +B = matrix(0, rows=numC, cols=numF) #classFeatureCumulativeDensityFunction +C = matrix(0, rows=numC, cols=numF) #tempCumulative + +parfor(i in 1:numC ) +{ + A[i,] = A[i,]/sum(A[i,]); + C[i,1] = A[i,1]; + + for (j in 2:numF) + { + C[i,j] = C[i,j-1] + A[i,j]; + } + + B[i,] = C[i,]; +} + + + + + http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor47.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor47.dml b/src/test/scripts/functions/parfor/parfor47.dml index 2ed8710..9fe2023 100644 --- a/src/test/scripts/functions/parfor/parfor47.dml +++ b/src/test/scripts/functions/parfor/parfor47.dml @@ -19,28 +19,28 @@ # #------------------------------------------------------------- - -a = 5 -b = 10 -c = 20 -d = 5 - -A = Rand(rows=a, cols=b, min=0.0, max=1.0, sparsity=1.0) -B = matrix(0,rows=c, cols=d) -dummy = matrix(1, rows=1,cols=1); - -parfor(i in 1:a){ - for(j in 2:b){ - A[i,j] = A[i,j-1] + A[i,j] - } -} - -parfor(i in 1:c){ - parfor(j in 1:d){ - for(k in 1:b){ - B[i,j] = dummy*(i*j); - } - } -} - - + +a = 5 +b = 10 +c = 20 +d = 5 + +A = Rand(rows=a, cols=b, min=0.0, max=1.0, sparsity=1.0) +B = matrix(0,rows=c, cols=d) +dummy = matrix(1, rows=1,cols=1); + +parfor(i in 1:a){ + for(j in 2:b){ + A[i,j] = A[i,j-1] + A[i,j] + } +} + +parfor(i in 1:c){ + parfor(j in 1:d){ + for(k in 1:b){ + B[i,j] = dummy*(i*j); + } + } +} + + http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor48.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor48.dml b/src/test/scripts/functions/parfor/parfor48.dml index 3e01135..bc4b2db 100644 --- a/src/test/scripts/functions/parfor/parfor48.dml +++ b/src/test/scripts/functions/parfor/parfor48.dml @@ -19,14 +19,14 @@ # #------------------------------------------------------------- - -A = Rand(rows=10, cols=10, min=0.0, max=1.0, sparsity=1.0) - -parfor(i in 1:nrow(A)){ - parfor(j in 1:ncol(A)){ - print("i="+i+", j="+j); - } -} - - - + +A = Rand(rows=10, cols=10, min=0.0, max=1.0, sparsity=1.0) + +parfor(i in 1:nrow(A)){ + parfor(j in 1:ncol(A)){ + print("i="+i+", j="+j); + } +} + + + http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor48b.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor48b.dml b/src/test/scripts/functions/parfor/parfor48b.dml index d35da2a..c87f920 100644 --- a/src/test/scripts/functions/parfor/parfor48b.dml +++ b/src/test/scripts/functions/parfor/parfor48b.dml @@ -19,14 +19,14 @@ # #------------------------------------------------------------- - -A = Rand(rows=10, cols=10, min=0.0, max=1.0, sparsity=1.0) - -parfor(i in 1:castAsScalar(A[1,1])){ - parfor(j in 1:A+ncol(A)){ - print("i="+i+", j="+j); - } -} - - - + +A = Rand(rows=10, cols=10, min=0.0, max=1.0, sparsity=1.0) + +parfor(i in 1:castAsScalar(A[1,1])){ + parfor(j in 1:A+ncol(A)){ + print("i="+i+", j="+j); + } +} + + + http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor48c.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor48c.dml b/src/test/scripts/functions/parfor/parfor48c.dml index 74c8a5e..cbeae42 100644 --- a/src/test/scripts/functions/parfor/parfor48c.dml +++ b/src/test/scripts/functions/parfor/parfor48c.dml @@ -19,13 +19,13 @@ # #------------------------------------------------------------- - -A = Rand(rows=10, cols=10, min=0.0, max=1.0, sparsity=1.0) - -a = 1; -parfor(i in (2-a):(10-1+1)){ - print("i="+i); -} - - - + +A = Rand(rows=10, cols=10, min=0.0, max=1.0, sparsity=1.0) + +a = 1; +parfor(i in (2-a):(10-1+1)){ + print("i="+i); +} + + + http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor49a.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor49a.dml b/src/test/scripts/functions/parfor/parfor49a.dml index 7cfc7b6..fa91050 100644 --- a/src/test/scripts/functions/parfor/parfor49a.dml +++ b/src/test/scripts/functions/parfor/parfor49a.dml @@ -19,15 +19,15 @@ # #------------------------------------------------------------- - -foo = function (Integer inval) return (Integer out) -{ - A = matrix( 1, rows=10, cols=10 ); - parfor (f in 1:inval) { - A = A + f; - } - out = round(sum(A)); -} - -x = foo( 10 ); -print( x ); + +foo = function (Integer inval) return (Integer out) +{ + A = matrix( 1, rows=10, cols=10 ); + parfor (f in 1:inval) { + A = A + f; + } + out = round(sum(A)); +} + +x = foo( 10 ); +print( x ); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor49b.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor49b.dml b/src/test/scripts/functions/parfor/parfor49b.dml index 7542f03..4035d9a 100644 --- a/src/test/scripts/functions/parfor/parfor49b.dml +++ b/src/test/scripts/functions/parfor/parfor49b.dml @@ -19,26 +19,26 @@ # #------------------------------------------------------------- - -foo = function (Integer inval) return (Matrix[Double] out) -{ - if( 1==1 ) {} #prevent inlining - - A = matrix( 1, rows=10, cols=10 ); - out = A -} - -X = foo(7); -parfor( i in 1:10 ) -{ - if( i==1 ) - { - X = foo(i); - } - else - { - Y = foo(i); - } -} - -print(sum(X)); + +foo = function (Integer inval) return (Matrix[Double] out) +{ + if( 1==1 ) {} #prevent inlining + + A = matrix( 1, rows=10, cols=10 ); + out = A +} + +X = foo(7); +parfor( i in 1:10 ) +{ + if( i==1 ) + { + X = foo(i); + } + else + { + Y = foo(i); + } +} + +print(sum(X)); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor5.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor5.dml b/src/test/scripts/functions/parfor/parfor5.dml index dfbfaa9..d5c2455 100644 --- a/src/test/scripts/functions/parfor/parfor5.dml +++ b/src/test/scripts/functions/parfor/parfor5.dml @@ -19,15 +19,15 @@ # #------------------------------------------------------------- - -a = 1; - -parfor( i in 1:(a+10) ) -{ - b = i + a; - a = b; - #print(a); - #print(b); -} - + +a = 1; + +parfor( i in 1:(a+10) ) +{ + b = i + a; + a = b; + #print(a); + #print(b); +} + #print(a); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor50.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor50.dml b/src/test/scripts/functions/parfor/parfor50.dml index 2ab7c7b..2d86be8 100644 --- a/src/test/scripts/functions/parfor/parfor50.dml +++ b/src/test/scripts/functions/parfor/parfor50.dml @@ -19,52 +19,52 @@ # #------------------------------------------------------------- - -binning = externalFunction(Matrix[Double] A, Integer binsize, Integer numbins) return (Matrix[Double] B, Integer numbinsdef) - implemented in (classname="org.apache.sysml.udf.lib.BinningWrapper",exectype="mem") - -fmt = ifdef($fmt, "text"); -num_bins = ifdef($bins, 3); # 50 -depth = ifdef($depth, 10); -num_trees = ifdef($trees, 2); # 10 -num_feature_samples = ifdef($feature_samples, 3); # 100 -num_samples = ifdef($samples, 10); - -num_classes = 7; -bin_size = 7; - -X = rand (rows = 10, cols = 5, min = 0, max = 10); -Y = floor (rand (rows = 10, cols = 1, min = 1, max = 3.999999999999)); - -num_rows = nrow (X); -num_features = ncol (X); - -count_thresholds = matrix (0, rows = 1, cols = num_features) -thresholds = matrix (0, rows = num_bins + 1, cols = num_features) -parfor(i1 in 1:num_features) { # this parfor works fine! - col = order (target = X[,i1], by = 1, decreasing = FALSE); - [col_bins, num_bins_defined] = binning (col, bin_size, num_bins); - count_thresholds[,i1] = num_bins_defined; - thresholds[,i1] = col_bins; -} - - -max_num_bins = max (count_thresholds); -X_ext_left = matrix (0, rows = num_rows, cols = num_features * num_classes * max_num_bins); -X_ext_right = matrix (0, rows = num_rows, cols = num_features * num_classes * max_num_bins); -parfor (i2 in 1:num_features, check=0) { # The following parfors need check=0! - parfor (i3 in 1:num_rows) { - count_threshold = count_thresholds[,i2]; - for (i4 in 0:(as.scalar(count_threshold) - 1)) { - cur_threshold = as.scalar(count_threshold) - i4; - offset_feature = (i2 - 1) * max_num_bins * num_classes; - offset_bin = (cur_threshold - 1) * num_classes; - if (as.scalar(X[i3,i2]) < as.scalar(thresholds[cur_threshold, i2])) { - X_ext_left[i3, (offset_feature + offset_bin + as.scalar(Y[i3,1]))] = 1; - } else { - X_ext_right[i3, (offset_feature + offset_bin + as.scalar(Y[i3,1]))] = 1; - } - } - } -} - + +binning = externalFunction(Matrix[Double] A, Integer binsize, Integer numbins) return (Matrix[Double] B, Integer numbinsdef) + implemented in (classname="org.apache.sysml.udf.lib.BinningWrapper",exectype="mem") + +fmt = ifdef($fmt, "text"); +num_bins = ifdef($bins, 3); # 50 +depth = ifdef($depth, 10); +num_trees = ifdef($trees, 2); # 10 +num_feature_samples = ifdef($feature_samples, 3); # 100 +num_samples = ifdef($samples, 10); + +num_classes = 7; +bin_size = 7; + +X = rand (rows = 10, cols = 5, min = 0, max = 10); +Y = floor (rand (rows = 10, cols = 1, min = 1, max = 3.999999999999)); + +num_rows = nrow (X); +num_features = ncol (X); + +count_thresholds = matrix (0, rows = 1, cols = num_features) +thresholds = matrix (0, rows = num_bins + 1, cols = num_features) +parfor(i1 in 1:num_features) { # this parfor works fine! + col = order (target = X[,i1], by = 1, decreasing = FALSE); + [col_bins, num_bins_defined] = binning (col, bin_size, num_bins); + count_thresholds[,i1] = num_bins_defined; + thresholds[,i1] = col_bins; +} + + +max_num_bins = max (count_thresholds); +X_ext_left = matrix (0, rows = num_rows, cols = num_features * num_classes * max_num_bins); +X_ext_right = matrix (0, rows = num_rows, cols = num_features * num_classes * max_num_bins); +parfor (i2 in 1:num_features, check=0) { # The following parfors need check=0! + parfor (i3 in 1:num_rows) { + count_threshold = count_thresholds[,i2]; + for (i4 in 0:(as.scalar(count_threshold) - 1)) { + cur_threshold = as.scalar(count_threshold) - i4; + offset_feature = (i2 - 1) * max_num_bins * num_classes; + offset_bin = (cur_threshold - 1) * num_classes; + if (as.scalar(X[i3,i2]) < as.scalar(thresholds[cur_threshold, i2])) { + X_ext_left[i3, (offset_feature + offset_bin + as.scalar(Y[i3,1]))] = 1; + } else { + X_ext_right[i3, (offset_feature + offset_bin + as.scalar(Y[i3,1]))] = 1; + } + } + } +} + http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor51.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor51.dml b/src/test/scripts/functions/parfor/parfor51.dml index 644007e..c6b6439 100644 --- a/src/test/scripts/functions/parfor/parfor51.dml +++ b/src/test/scripts/functions/parfor/parfor51.dml @@ -19,15 +19,15 @@ # #------------------------------------------------------------- - -n = 2; -m = 2; -A = matrix(7, rows=n, cols=1); - -parfor (j in 1:m){ - parfor (i in 1:n){ - A[i,1] = j*7+i; - } -} - + +n = 2; +m = 2; +A = matrix(7, rows=n, cols=1); + +parfor (j in 1:m){ + parfor (i in 1:n){ + A[i,1] = j*7+i; + } +} + print(sum(A)); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor52.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor52.dml b/src/test/scripts/functions/parfor/parfor52.dml index 5a1d5e2..cfc7a23 100644 --- a/src/test/scripts/functions/parfor/parfor52.dml +++ b/src/test/scripts/functions/parfor/parfor52.dml @@ -19,16 +19,16 @@ # #------------------------------------------------------------- - -V = matrix(0, rows=2, cols=2); -print(sum(V)); -parfor( i in 1:2 ) -{ - print(sum(V)); - - parfor( j in 1:2 ) - { - V[i,j] = 7; - } -} + +V = matrix(0, rows=2, cols=2); +print(sum(V)); +parfor( i in 1:2 ) +{ + print(sum(V)); + + parfor( j in 1:2 ) + { + V[i,j] = 7; + } +} print(sum(V)); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor6.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor6.dml b/src/test/scripts/functions/parfor/parfor6.dml index f9f40eb..aae1370 100644 --- a/src/test/scripts/functions/parfor/parfor6.dml +++ b/src/test/scripts/functions/parfor/parfor6.dml @@ -19,11 +19,11 @@ # #------------------------------------------------------------- - -A = Rand(rows=10,cols=1); - -parfor( i in 1:10 ) -{ - b = i + castAsScalar(A[i,1]); - #print(b); -} + +A = Rand(rows=10,cols=1); + +parfor( i in 1:10 ) +{ + b = i + castAsScalar(A[i,1]); + #print(b); +} http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor7.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor7.dml b/src/test/scripts/functions/parfor/parfor7.dml index f1e6b72..39c14ad 100644 --- a/src/test/scripts/functions/parfor/parfor7.dml +++ b/src/test/scripts/functions/parfor/parfor7.dml @@ -19,12 +19,12 @@ # #------------------------------------------------------------- - -A = Rand(rows=10,cols=1); - -parfor( i in 2:10 ) -{ - b = i + castAsScalar(A[i,1]) + castAsScalar(A[i+1,1]); - - #print(b); -} + +A = Rand(rows=10,cols=1); + +parfor( i in 2:10 ) +{ + b = i + castAsScalar(A[i,1]) + castAsScalar(A[i+1,1]); + + #print(b); +} http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor8.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor8.dml b/src/test/scripts/functions/parfor/parfor8.dml index c5cdc5d..21d96ee 100644 --- a/src/test/scripts/functions/parfor/parfor8.dml +++ b/src/test/scripts/functions/parfor/parfor8.dml @@ -19,13 +19,13 @@ # #------------------------------------------------------------- - -A = Rand(rows=10,cols=1); -a = 1 - -parfor( i in 2:10 ) -{ - b = a + castAsScalar(A[i,1]) + castAsScalar(A[i+1,1]); - a = i; - # print(b); -} + +A = Rand(rows=10,cols=1); +a = 1 + +parfor( i in 2:10 ) +{ + b = a + castAsScalar(A[i,1]) + castAsScalar(A[i+1,1]); + a = i; + # print(b); +} http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor9.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor9.dml b/src/test/scripts/functions/parfor/parfor9.dml index ebaef43..fb50cb7 100644 --- a/src/test/scripts/functions/parfor/parfor9.dml +++ b/src/test/scripts/functions/parfor/parfor9.dml @@ -19,13 +19,13 @@ # #------------------------------------------------------------- - -A = Rand(rows=10,cols=1); -a = 1 - -parfor( i in 2:10 ) -{ - b = a + castAsScalar(A[i,1]) + castAsScalar(A[i-1,1]); - a = i; - #print(b); -} + +A = Rand(rows=10,cols=1); +a = 1 + +parfor( i in 2:10 ) +{ + b = a + castAsScalar(A[i,1]) + castAsScalar(A[i-1,1]); + a = i; + #print(b); +} http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_NaN1.R ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_NaN1.R b/src/test/scripts/functions/parfor/parfor_NaN1.R index 8d83979..fe686e1 100644 --- a/src/test/scripts/functions/parfor/parfor_NaN1.R +++ b/src/test/scripts/functions/parfor/parfor_NaN1.R @@ -19,22 +19,22 @@ # #------------------------------------------------------------- - -args <- commandArgs(TRUE) -options(digits=22) -library("Matrix") - - -nr = as.integer(args[1]); -xr = as.integer(args[2]); -NaNval = 0/0; - -R = matrix(0, nr, nr); -R[1:xr,] = matrix(NaNval, xr, nr); - -for( i in 1:nr ) -{ - R[i,i] = i^2 + 7; -} - -writeMM(as(R, "CsparseMatrix"), paste(args[3], "R", sep="")); + +args <- commandArgs(TRUE) +options(digits=22) +library("Matrix") + + +nr = as.integer(args[1]); +xr = as.integer(args[2]); +NaNval = 0/0; + +R = matrix(0, nr, nr); +R[1:xr,] = matrix(NaNval, xr, nr); + +for( i in 1:nr ) +{ + R[i,i] = i^2 + 7; +} + +writeMM(as(R, "CsparseMatrix"), paste(args[3], "R", sep="")); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_NaN1.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_NaN1.dml b/src/test/scripts/functions/parfor/parfor_NaN1.dml index 151579b..2f9eaad 100644 --- a/src/test/scripts/functions/parfor/parfor_NaN1.dml +++ b/src/test/scripts/functions/parfor/parfor_NaN1.dml @@ -19,18 +19,18 @@ # #------------------------------------------------------------- - - -nr = $1; -xr = $2; -NaNval = 0/0; - -R = matrix(0, rows=nr, cols=nr); -R[1:xr,] = matrix(NaNval, rows=xr, cols=nr); - -parfor( i in 1:nr ) -{ - R[i,i] = i^2 + 7; -} - + + +nr = $1; +xr = $2; +NaNval = 0/0; + +R = matrix(0, rows=nr, cols=nr); +R[1:xr,] = matrix(NaNval, rows=xr, cols=nr); + +parfor( i in 1:nr ) +{ + R[i,i] = i^2 + 7; +} + write(R, $3); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_NaN2.R ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_NaN2.R b/src/test/scripts/functions/parfor/parfor_NaN2.R index 0326db4..43c50af 100644 --- a/src/test/scripts/functions/parfor/parfor_NaN2.R +++ b/src/test/scripts/functions/parfor/parfor_NaN2.R @@ -19,22 +19,22 @@ # #------------------------------------------------------------- - -args <- commandArgs(TRUE) -options(digits=22) -library("Matrix") - - -nr = as.integer(args[1]); -xr = as.integer(args[2]); -NaNval = 0/0; - -R = matrix(0, nr, nr); -R[1:xr,] = matrix(1, xr, nr); - -for( i in 1:nr ) -{ - R[i,i] = NaNval; -} - -writeMM(as(R, "CsparseMatrix"), paste(args[3], "R", sep="")); + +args <- commandArgs(TRUE) +options(digits=22) +library("Matrix") + + +nr = as.integer(args[1]); +xr = as.integer(args[2]); +NaNval = 0/0; + +R = matrix(0, nr, nr); +R[1:xr,] = matrix(1, xr, nr); + +for( i in 1:nr ) +{ + R[i,i] = NaNval; +} + +writeMM(as(R, "CsparseMatrix"), paste(args[3], "R", sep="")); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_NaN2.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_NaN2.dml b/src/test/scripts/functions/parfor/parfor_NaN2.dml index ba7aec4..f5733b4 100644 --- a/src/test/scripts/functions/parfor/parfor_NaN2.dml +++ b/src/test/scripts/functions/parfor/parfor_NaN2.dml @@ -19,18 +19,18 @@ # #------------------------------------------------------------- - - -nr = $1; -xr = $2; -NaNval = 0/0; - -R = matrix(0, rows=nr, cols=nr); -R[1:xr,] = matrix(1, rows=xr, cols=nr); - -parfor( i in 1:nr ) -{ - R[i,i] = NaNval; -} - + + +nr = $1; +xr = $2; +NaNval = 0/0; + +R = matrix(0, rows=nr, cols=nr); +R[1:xr,] = matrix(1, rows=xr, cols=nr); + +parfor( i in 1:nr ) +{ + R[i,i] = NaNval; +} + write(R, $3); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_cdatapartition_leftindexing.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_cdatapartition_leftindexing.dml b/src/test/scripts/functions/parfor/parfor_cdatapartition_leftindexing.dml index 4acbb93..2c6e1c9 100644 --- a/src/test/scripts/functions/parfor/parfor_cdatapartition_leftindexing.dml +++ b/src/test/scripts/functions/parfor/parfor_cdatapartition_leftindexing.dml @@ -19,18 +19,18 @@ # #------------------------------------------------------------- - -V = read($1); -m = nrow(V); -n = ncol(V); - -R = matrix(0,rows=m,cols=n); - -parfor( i in 1:n, par=4, mode=LOCAL, datapartitioner=REMOTE_MR, opt=NONE ) -{ - col = V[,i]; - if(1==1){} - R[,i] = col; -} - + +V = read($1); +m = nrow(V); +n = ncol(V); + +R = matrix(0,rows=m,cols=n); + +parfor( i in 1:n, par=4, mode=LOCAL, datapartitioner=REMOTE_MR, opt=NONE ) +{ + col = V[,i]; + if(1==1){} + R[,i] = col; +} + write(R, $2); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_cdatapartitioning.R ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_cdatapartitioning.R b/src/test/scripts/functions/parfor/parfor_cdatapartitioning.R index 3b4011e..28fc6bf 100644 --- a/src/test/scripts/functions/parfor/parfor_cdatapartitioning.R +++ b/src/test/scripts/functions/parfor/parfor_cdatapartitioning.R @@ -19,22 +19,22 @@ # #------------------------------------------------------------- - -args <- commandArgs(TRUE) -options(digits=22) - -library("Matrix") - -V1 <- readMM(paste(args[1], "V.mtx", sep="")) -V <- as.matrix(V1); -n <- ncol(V); - -R <- array(0,dim=c(1,n)) - -for( i in 1:n ) -{ - X <- V[ ,i]; - R[1,i] <- sum(X); -} - -writeMM(as(R, "CsparseMatrix"), paste(args[2], "Rout", sep="")); + +args <- commandArgs(TRUE) +options(digits=22) + +library("Matrix") + +V1 <- readMM(paste(args[1], "V.mtx", sep="")) +V <- as.matrix(V1); +n <- ncol(V); + +R <- array(0,dim=c(1,n)) + +for( i in 1:n ) +{ + X <- V[ ,i]; + R[1,i] <- sum(X); +} + +writeMM(as(R, "CsparseMatrix"), paste(args[2], "Rout", sep="")); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_cdatapartitioning1.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_cdatapartitioning1.dml b/src/test/scripts/functions/parfor/parfor_cdatapartitioning1.dml index 84b6cdf..4a056ea 100644 --- a/src/test/scripts/functions/parfor/parfor_cdatapartitioning1.dml +++ b/src/test/scripts/functions/parfor/parfor_cdatapartitioning1.dml @@ -19,18 +19,18 @@ # #------------------------------------------------------------- - -V = read($1,rows=$2,cols=$3); -n = $3; - -R = matrix(0, rows=1,cols=n); -dummy = matrix(1, rows=1, cols=1); - -parfor( i in 1:n, par=4, mode=LOCAL, datapartitioner=NONE, taskpartitioner=FACTORING, opt=NONE ) -{ - X = V[,i]; - sX = sum(X); - R[1,i] = dummy * sX; -} - + +V = read($1,rows=$2,cols=$3); +n = $3; + +R = matrix(0, rows=1,cols=n); +dummy = matrix(1, rows=1, cols=1); + +parfor( i in 1:n, par=4, mode=LOCAL, datapartitioner=NONE, taskpartitioner=FACTORING, opt=NONE ) +{ + X = V[,i]; + sX = sum(X); + R[1,i] = dummy * sX; +} + write(R, $4); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_cdatapartitioning2.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_cdatapartitioning2.dml b/src/test/scripts/functions/parfor/parfor_cdatapartitioning2.dml index 318df7a..2296bae 100644 --- a/src/test/scripts/functions/parfor/parfor_cdatapartitioning2.dml +++ b/src/test/scripts/functions/parfor/parfor_cdatapartitioning2.dml @@ -19,18 +19,18 @@ # #------------------------------------------------------------- - -V = read($1,rows=$2,cols=$3); -n = $3; - -R = matrix(0, rows=1,cols=n); -dummy = matrix(1, rows=1, cols=1); - -parfor( i in 1:n, par=4, mode=LOCAL, datapartitioner=LOCAL, taskpartitioner=FACTORING, opt=NONE ) -{ - X = V[,i]; - sX = sum(X); - R[1,i] = dummy * sX; -} - + +V = read($1,rows=$2,cols=$3); +n = $3; + +R = matrix(0, rows=1,cols=n); +dummy = matrix(1, rows=1, cols=1); + +parfor( i in 1:n, par=4, mode=LOCAL, datapartitioner=LOCAL, taskpartitioner=FACTORING, opt=NONE ) +{ + X = V[,i]; + sX = sum(X); + R[1,i] = dummy * sX; +} + write(R, $4); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_cdatapartitioning3.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_cdatapartitioning3.dml b/src/test/scripts/functions/parfor/parfor_cdatapartitioning3.dml index 74be31b..6429a22 100644 --- a/src/test/scripts/functions/parfor/parfor_cdatapartitioning3.dml +++ b/src/test/scripts/functions/parfor/parfor_cdatapartitioning3.dml @@ -19,18 +19,18 @@ # #------------------------------------------------------------- - -V = read($1,rows=$2,cols=$3); -n = $3; - -R = matrix(0, rows=1,cols=n); -dummy = matrix(1, rows=1, cols=1); - -parfor( i in 1:n, par=4, mode=REMOTE_MR,datapartitioner=LOCAL, taskpartitioner=FACTORING, opt=NONE ) -{ - X = V[,i]; - sX = sum(X); - R[1,i] = dummy * sX; -} - + +V = read($1,rows=$2,cols=$3); +n = $3; + +R = matrix(0, rows=1,cols=n); +dummy = matrix(1, rows=1, cols=1); + +parfor( i in 1:n, par=4, mode=REMOTE_MR,datapartitioner=LOCAL, taskpartitioner=FACTORING, opt=NONE ) +{ + X = V[,i]; + sX = sum(X); + R[1,i] = dummy * sX; +} + write(R, $4); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_cdatapartitioning4.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_cdatapartitioning4.dml b/src/test/scripts/functions/parfor/parfor_cdatapartitioning4.dml index f94693e..a236920 100644 --- a/src/test/scripts/functions/parfor/parfor_cdatapartitioning4.dml +++ b/src/test/scripts/functions/parfor/parfor_cdatapartitioning4.dml @@ -19,18 +19,18 @@ # #------------------------------------------------------------- - -V = read($1,rows=$2,cols=$3); -n = $3; - -R = matrix(0, rows=1,cols=n); -dummy = matrix(1, rows=1, cols=1); - -parfor( i in 1:n, par=4, mode=LOCAL, datapartitioner=REMOTE_MR, taskpartitioner=FACTORING, opt=NONE ) -{ - X = V[,i]; - sX = sum(X); - R[1,i] = dummy * sX; -} - + +V = read($1,rows=$2,cols=$3); +n = $3; + +R = matrix(0, rows=1,cols=n); +dummy = matrix(1, rows=1, cols=1); + +parfor( i in 1:n, par=4, mode=LOCAL, datapartitioner=REMOTE_MR, taskpartitioner=FACTORING, opt=NONE ) +{ + X = V[,i]; + sX = sum(X); + R[1,i] = dummy * sX; +} + write(R, $4); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_cdatapartitioning5.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_cdatapartitioning5.dml b/src/test/scripts/functions/parfor/parfor_cdatapartitioning5.dml index 8e81e73..7af8684 100644 --- a/src/test/scripts/functions/parfor/parfor_cdatapartitioning5.dml +++ b/src/test/scripts/functions/parfor/parfor_cdatapartitioning5.dml @@ -19,18 +19,18 @@ # #------------------------------------------------------------- - -V = read($1,rows=$2,cols=$3); -n = $3; - -R = matrix(0, rows=1,cols=n); -dummy = matrix(1, rows=1, cols=1); - -parfor( i in 1:n, par=4, mode=REMOTE_MR,datapartitioner=REMOTE_MR, taskpartitioner=FACTORING, opt=NONE ) -{ - X = V[,i]; - sX = sum(X); - R[1,i] = dummy * sX; -} - + +V = read($1,rows=$2,cols=$3); +n = $3; + +R = matrix(0, rows=1,cols=n); +dummy = matrix(1, rows=1, cols=1); + +parfor( i in 1:n, par=4, mode=REMOTE_MR,datapartitioner=REMOTE_MR, taskpartitioner=FACTORING, opt=NONE ) +{ + X = V[,i]; + sX = sum(X); + R[1,i] = dummy * sX; +} + write(R, $4); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_cdatapartitioning6.R ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_cdatapartitioning6.R b/src/test/scripts/functions/parfor/parfor_cdatapartitioning6.R index 0adb517..52493fc 100644 --- a/src/test/scripts/functions/parfor/parfor_cdatapartitioning6.R +++ b/src/test/scripts/functions/parfor/parfor_cdatapartitioning6.R @@ -19,22 +19,22 @@ # #------------------------------------------------------------- - -args <- commandArgs(TRUE) -options(digits=22) - -library("Matrix") - -V1 <- readMM(paste(args[1], "V.mtx", sep="")) -V <- as.matrix(V1); -n <- ncol(V); - -R <- array(0,dim=c(1,n)) - -for( i in 1:n-1 ) -{ - X <- V[ ,i:(i+1)]; - R[1,i] <- sum(X); -} - -writeMM(as(R, "CsparseMatrix"), paste(args[2], "Rout", sep="")); + +args <- commandArgs(TRUE) +options(digits=22) + +library("Matrix") + +V1 <- readMM(paste(args[1], "V.mtx", sep="")) +V <- as.matrix(V1); +n <- ncol(V); + +R <- array(0,dim=c(1,n)) + +for( i in 1:n-1 ) +{ + X <- V[ ,i:(i+1)]; + R[1,i] <- sum(X); +} + +writeMM(as(R, "CsparseMatrix"), paste(args[2], "Rout", sep="")); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_cdatapartitioning6.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_cdatapartitioning6.dml b/src/test/scripts/functions/parfor/parfor_cdatapartitioning6.dml index fa9fe9f..2d011c0 100644 --- a/src/test/scripts/functions/parfor/parfor_cdatapartitioning6.dml +++ b/src/test/scripts/functions/parfor/parfor_cdatapartitioning6.dml @@ -19,18 +19,18 @@ # #------------------------------------------------------------- - -V = read($1,rows=$2,cols=$3); -n = $3; - -R = matrix(0, rows=1,cols=n); -dummy = matrix(1, rows=1, cols=1); - -parfor( i in 1:n-1, par=4, mode=LOCAL, datapartitioner=REMOTE_MR, taskpartitioner=FACTORING, opt=NONE ) -{ - X = V[,i:(i+1)]; - sX = sum(X); - R[1,i] = dummy * sX; -} - + +V = read($1,rows=$2,cols=$3); +n = $3; + +R = matrix(0, rows=1,cols=n); +dummy = matrix(1, rows=1, cols=1); + +parfor( i in 1:n-1, par=4, mode=LOCAL, datapartitioner=REMOTE_MR, taskpartitioner=FACTORING, opt=NONE ) +{ + X = V[,i:(i+1)]; + sX = sum(X); + R[1,i] = dummy * sX; +} + write(R, $4); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_cdatapartitioning7.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_cdatapartitioning7.dml b/src/test/scripts/functions/parfor/parfor_cdatapartitioning7.dml index 948745c..316bd1a 100644 --- a/src/test/scripts/functions/parfor/parfor_cdatapartitioning7.dml +++ b/src/test/scripts/functions/parfor/parfor_cdatapartitioning7.dml @@ -19,18 +19,18 @@ # #------------------------------------------------------------- - -V = read($1,rows=$2,cols=$3); -n = $3; - -R = matrix(0, rows=1,cols=n); -dummy = matrix(1, rows=1, cols=1); - -parfor( i in 1:n, par=4, mode=LOCAL, datapartitioner=REMOTE_SPARK, taskpartitioner=FACTORING, opt=NONE ) -{ - X = V[,i]; - sX = sum(X); - R[1,i] = dummy * sX; -} - + +V = read($1,rows=$2,cols=$3); +n = $3; + +R = matrix(0, rows=1,cols=n); +dummy = matrix(1, rows=1, cols=1); + +parfor( i in 1:n, par=4, mode=LOCAL, datapartitioner=REMOTE_SPARK, taskpartitioner=FACTORING, opt=NONE ) +{ + X = V[,i]; + sX = sum(X); + R[1,i] = dummy * sX; +} + write(R, $4); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_cdatapartitioning8.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_cdatapartitioning8.dml b/src/test/scripts/functions/parfor/parfor_cdatapartitioning8.dml index 2d2e871..9ae62de 100644 --- a/src/test/scripts/functions/parfor/parfor_cdatapartitioning8.dml +++ b/src/test/scripts/functions/parfor/parfor_cdatapartitioning8.dml @@ -19,18 +19,18 @@ # #------------------------------------------------------------- - -V = read($1,rows=$2,cols=$3); -n = $3; - -R = matrix(0, rows=1,cols=n); -dummy = matrix(1, rows=1, cols=1); - -parfor( i in 1:n, par=4, mode=REMOTE_SPARK,datapartitioner=REMOTE_SPARK, taskpartitioner=FACTORING, opt=NONE ) -{ - X = V[,i]; - sX = sum(X); - R[1,i] = dummy * sX; -} - + +V = read($1,rows=$2,cols=$3); +n = $3; + +R = matrix(0, rows=1,cols=n); +dummy = matrix(1, rows=1, cols=1); + +parfor( i in 1:n, par=4, mode=REMOTE_SPARK,datapartitioner=REMOTE_SPARK, taskpartitioner=FACTORING, opt=NONE ) +{ + X = V[,i]; + sX = sum(X); + R[1,i] = dummy * sX; +} + write(R, $4); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_cdatapartitioning9.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_cdatapartitioning9.dml b/src/test/scripts/functions/parfor/parfor_cdatapartitioning9.dml index a77bcf1..eeca0dd 100644 --- a/src/test/scripts/functions/parfor/parfor_cdatapartitioning9.dml +++ b/src/test/scripts/functions/parfor/parfor_cdatapartitioning9.dml @@ -19,18 +19,18 @@ # #------------------------------------------------------------- - -V = read($1,rows=$2,cols=$3); -n = $3; - -R = matrix(0, rows=1,cols=n); -dummy = matrix(1, rows=1, cols=1); - -parfor( i in 1:n-1, par=4, mode=LOCAL, datapartitioner=REMOTE_SPARK, taskpartitioner=FACTORING, opt=NONE ) -{ - X = V[,i:(i+1)]; - sX = sum(X); - R[1,i] = dummy * sX; -} - + +V = read($1,rows=$2,cols=$3); +n = $3; + +R = matrix(0, rows=1,cols=n); +dummy = matrix(1, rows=1, cols=1); + +parfor( i in 1:n-1, par=4, mode=LOCAL, datapartitioner=REMOTE_SPARK, taskpartitioner=FACTORING, opt=NONE ) +{ + X = V[,i:(i+1)]; + sX = sum(X); + R[1,i] = dummy * sX; +} + write(R, $4); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_extfunct.R ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_extfunct.R b/src/test/scripts/functions/parfor/parfor_extfunct.R index 6fb0af6..88bbf05 100644 --- a/src/test/scripts/functions/parfor/parfor_extfunct.R +++ b/src/test/scripts/functions/parfor/parfor_extfunct.R @@ -19,22 +19,22 @@ # #------------------------------------------------------------- - -args <- commandArgs(TRUE) -options(digits=22) - -library("Matrix") - -V1 <- readMM(paste(args[1], "V.mtx", sep="")) -V <- as.matrix(V1); -n <- ncol(V); - -R <- array(0,dim=c(n,1)) - -for( i in 1:n ) -{ - X <- V[ ,i]; - R[i,1] <- sum(X); -} - + +args <- commandArgs(TRUE) +options(digits=22) + +library("Matrix") + +V1 <- readMM(paste(args[1], "V.mtx", sep="")) +V <- as.matrix(V1); +n <- ncol(V); + +R <- array(0,dim=c(n,1)) + +for( i in 1:n ) +{ + X <- V[ ,i]; + R[i,1] <- sum(X); +} + writeMM(as(R, "CsparseMatrix"), paste(args[2], "Rout", sep="")); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_extfunct.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_extfunct.dml b/src/test/scripts/functions/parfor/parfor_extfunct.dml index e5222f2..94b998c 100644 --- a/src/test/scripts/functions/parfor/parfor_extfunct.dml +++ b/src/test/scripts/functions/parfor/parfor_extfunct.dml @@ -19,28 +19,28 @@ # #------------------------------------------------------------- - -dynRead = externalFunction(String fname, Integer rows, Integer cols, String format) -return (Matrix[Double] M) -implemented in (classname="org.apache.sysml.udf.lib.DynamicReadMatrixCP",exectype="mem") - -execCondense = externalFunction(Matrix[Double] input) -return(Matrix[Double] out) -implemented in (classname="org.apache.sysml.udf.lib.RemoveEmptyRows",exectype="file", execlocation="master") - - -V = read($1, rows=$2, cols=$3, format="text"); -R = matrix(0, rows=$3,cols=1); -dummy = matrix(1, rows=1, cols=1); - -parfor( i in 1:$3, mode=REMOTE_MR, opt=NONE ) -{ - W = dynRead($1, $2, $3, "textcell"); - X = V[,i]; - sumx = sum(X); - R[i,1] = dummy * sumx; -} - -R = execCondense( R ); - + +dynRead = externalFunction(String fname, Integer rows, Integer cols, String format) +return (Matrix[Double] M) +implemented in (classname="org.apache.sysml.udf.lib.DynamicReadMatrixCP",exectype="mem") + +execCondense = externalFunction(Matrix[Double] input) +return(Matrix[Double] out) +implemented in (classname="org.apache.sysml.udf.lib.RemoveEmptyRows",exectype="file", execlocation="master") + + +V = read($1, rows=$2, cols=$3, format="text"); +R = matrix(0, rows=$3,cols=1); +dummy = matrix(1, rows=1, cols=1); + +parfor( i in 1:$3, mode=REMOTE_MR, opt=NONE ) +{ + W = dynRead($1, $2, $3, "textcell"); + X = V[,i]; + sumx = sum(X); + R[i,1] = dummy * sumx; +} + +R = execCondense( R ); + write(R, $4); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_funct.R ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_funct.R b/src/test/scripts/functions/parfor/parfor_funct.R index 6fb0af6..88bbf05 100644 --- a/src/test/scripts/functions/parfor/parfor_funct.R +++ b/src/test/scripts/functions/parfor/parfor_funct.R @@ -19,22 +19,22 @@ # #------------------------------------------------------------- - -args <- commandArgs(TRUE) -options(digits=22) - -library("Matrix") - -V1 <- readMM(paste(args[1], "V.mtx", sep="")) -V <- as.matrix(V1); -n <- ncol(V); - -R <- array(0,dim=c(n,1)) - -for( i in 1:n ) -{ - X <- V[ ,i]; - R[i,1] <- sum(X); -} - + +args <- commandArgs(TRUE) +options(digits=22) + +library("Matrix") + +V1 <- readMM(paste(args[1], "V.mtx", sep="")) +V <- as.matrix(V1); +n <- ncol(V); + +R <- array(0,dim=c(n,1)) + +for( i in 1:n ) +{ + X <- V[ ,i]; + R[i,1] <- sum(X); +} + writeMM(as(R, "CsparseMatrix"), paste(args[2], "Rout", sep="")); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_funct.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_funct.dml b/src/test/scripts/functions/parfor/parfor_funct.dml index 4e35f58..fad5cb0 100644 --- a/src/test/scripts/functions/parfor/parfor_funct.dml +++ b/src/test/scripts/functions/parfor/parfor_funct.dml @@ -19,22 +19,22 @@ # #------------------------------------------------------------- - -execSum = function(Matrix[Double] X) return (Double sx) -{ - sx = sum(X); -} - -V = read($1, rows=$2, cols=$3); - -R = matrix(0, rows=$3,cols=1); -dummy = matrix(1, rows=1, cols=1); - -parfor( i in 1:$3, mode=REMOTE_MR, opt=NONE ) -{ - X = V[,i]; - sumx = execSum(X); - R[i,1] = dummy * sumx; -} - + +execSum = function(Matrix[Double] X) return (Double sx) +{ + sx = sum(X); +} + +V = read($1, rows=$2, cols=$3); + +R = matrix(0, rows=$3,cols=1); +dummy = matrix(1, rows=1, cols=1); + +parfor( i in 1:$3, mode=REMOTE_MR, opt=NONE ) +{ + X = V[,i]; + sumx = execSum(X); + R[i,1] = dummy * sumx; +} + write(R, $4); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_literals1a.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_literals1a.dml b/src/test/scripts/functions/parfor/parfor_literals1a.dml index 8bbb344..fd75d23 100644 --- a/src/test/scripts/functions/parfor/parfor_literals1a.dml +++ b/src/test/scripts/functions/parfor/parfor_literals1a.dml @@ -19,17 +19,17 @@ # #------------------------------------------------------------- - -dynWrite = externalFunction(Matrix[Double] input, String fname, String format) - return(Boolean success) - implemented in (classname="org.apache.sysml.udf.lib.DynamicWriteMatrixCP",exectype="mem") - -A = read($1, rows=$2, cols=$3, format="text"); - -parfor( i in 1:1, mode=LOCAL, opt=NONE ) -{ - B = A + 0; - # param should include internal 'thread root prefix' _t0 - x = dynWrite(B, $4, "textcell"); -} + +dynWrite = externalFunction(Matrix[Double] input, String fname, String format) + return(Boolean success) + implemented in (classname="org.apache.sysml.udf.lib.DynamicWriteMatrixCP",exectype="mem") + +A = read($1, rows=$2, cols=$3, format="text"); + +parfor( i in 1:1, mode=LOCAL, opt=NONE ) +{ + B = A + 0; + # param should include internal 'thread root prefix' _t0 + x = dynWrite(B, $4, "textcell"); +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_literals1b.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_literals1b.dml b/src/test/scripts/functions/parfor/parfor_literals1b.dml index 2b89cc7..93c6536 100644 --- a/src/test/scripts/functions/parfor/parfor_literals1b.dml +++ b/src/test/scripts/functions/parfor/parfor_literals1b.dml @@ -19,17 +19,17 @@ # #------------------------------------------------------------- - -dynWrite = externalFunction(Matrix[Double] input, String fname, String format) - return(Boolean success) - implemented in (classname="org.apache.sysml.udf.lib.DynamicWriteMatrixCP",exectype="mem") - -A = read($1, rows=$2, cols=$3, format="text"); - -parfor( i in 1:1, mode=REMOTE_MR, opt=NONE ) -{ - B = A + 0; - # param should include internal 'thread root prefix' _t0 - x = dynWrite(B, $4, "textcell"); -} + +dynWrite = externalFunction(Matrix[Double] input, String fname, String format) + return(Boolean success) + implemented in (classname="org.apache.sysml.udf.lib.DynamicWriteMatrixCP",exectype="mem") + +A = read($1, rows=$2, cols=$3, format="text"); + +parfor( i in 1:1, mode=REMOTE_MR, opt=NONE ) +{ + B = A + 0; + # param should include internal 'thread root prefix' _t0 + x = dynWrite(B, $4, "textcell"); +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_literals1c.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_literals1c.dml b/src/test/scripts/functions/parfor/parfor_literals1c.dml index eedd0a9..fdf6aad 100644 --- a/src/test/scripts/functions/parfor/parfor_literals1c.dml +++ b/src/test/scripts/functions/parfor/parfor_literals1c.dml @@ -19,20 +19,20 @@ # #------------------------------------------------------------- - -dynWrite = externalFunction(Matrix[Double] input, String fname, String format) - return(Boolean success) - implemented in (classname="org.apache.sysml.udf.lib.DynamicWriteMatrixCP",exectype="mem") - -A = read($1, rows=$2, cols=$3, format="text"); - -parfor( i in 1:1, mode=LOCAL, opt=NONE ) -{ - parfor( j in 1:1, mode=LOCAL, opt=NONE ) - { - B = A + 0; - # param should include internal 'thread root prefix' _t0 - x = dynWrite(B, $4, "textcell"); - } -} + +dynWrite = externalFunction(Matrix[Double] input, String fname, String format) + return(Boolean success) + implemented in (classname="org.apache.sysml.udf.lib.DynamicWriteMatrixCP",exectype="mem") + +A = read($1, rows=$2, cols=$3, format="text"); + +parfor( i in 1:1, mode=LOCAL, opt=NONE ) +{ + parfor( j in 1:1, mode=LOCAL, opt=NONE ) + { + B = A + 0; + # param should include internal 'thread root prefix' _t0 + x = dynWrite(B, $4, "textcell"); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/05d2c0a8/src/test/scripts/functions/parfor/parfor_literals2.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/parfor/parfor_literals2.dml b/src/test/scripts/functions/parfor/parfor_literals2.dml index 0b1bc1d..855e08d 100644 --- a/src/test/scripts/functions/parfor/parfor_literals2.dml +++ b/src/test/scripts/functions/parfor/parfor_literals2.dml @@ -19,17 +19,17 @@ # #------------------------------------------------------------- - -dynWrite_t0 = externalFunction(Matrix[Double] input, String fname, String format) - return(Boolean success) - implemented in (classname="org.apache.sysml.udf.lib.DynamicWriteMatrixCP",exectype="mem") - -A = read($1, rows=$2, cols=$3, format="text"); - -parfor( i in 1:1, mode=REMOTE_MR, opt=NONE ) -{ - B = A + 0; - # param should include internal 'thread root prefix' - x = dynWrite_t0(B, $4, "textcell"); -} + +dynWrite_t0 = externalFunction(Matrix[Double] input, String fname, String format) + return(Boolean success) + implemented in (classname="org.apache.sysml.udf.lib.DynamicWriteMatrixCP",exectype="mem") + +A = read($1, rows=$2, cols=$3, format="text"); + +parfor( i in 1:1, mode=REMOTE_MR, opt=NONE ) +{ + B = A + 0; + # param should include internal 'thread root prefix' + x = dynWrite_t0(B, $4, "textcell"); +} \ No newline at end of file
