Repository: incubator-systemml Updated Branches: refs/heads/master 4b6d468bb -> 39a37ae40
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/39a37ae4/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java b/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java index 9bf227d..48a5bb2 100644 --- a/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java +++ b/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java @@ -129,7 +129,10 @@ public abstract class AutomatedTestBase } else { System.setProperty("java.library.path", cwd + File.separator - + "\\src\\test\\config\\hadoop_bin_windows\\bin"); + + "\\src\\test\\config\\hadoop_bin_windows\\bin" + // For testing BLAS on Windows + // + File.pathSeparator + "C:\\Program Files (x86)\\IntelSWTools\\compilers_and_libraries_2017.0.109\\windows\\redist\\intel64_win\\mkl" + ); } http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/39a37ae4/src/test/java/org/apache/sysml/test/integration/functions/tensor/Conv2DTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/tensor/Conv2DTest.java b/src/test/java/org/apache/sysml/test/integration/functions/tensor/Conv2DTest.java index e5528d2..0a6bbb1 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/tensor/Conv2DTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/tensor/Conv2DTest.java @@ -96,37 +96,23 @@ public class Conv2DTest extends AutomatedTestBase @Test public void testConv2DSparse1() { - int numImg = 5; int imgSize = 3; int numChannels = 3; int numFilters = 6; int filterSize = 2; int stride = 1; int pad = 0; - runConv2DTest(ExecType.CP, imgSize, numImg, numChannels, numFilters, filterSize, stride, pad, true, false); - } - - @Test - public void testConv2DSparse2() - { int numImg = 1; int imgSize = 10; int numChannels = 4; int numFilters = 3; int filterSize = 4; int stride = 2; int pad = 0; runConv2DTest(ExecType.CP, imgSize, numImg, numChannels, numFilters, filterSize, stride, pad, false, true); } @Test - public void testConv2DSparse3() + public void testConv2DSparse2() { int numImg = 1; int imgSize = 10; int numChannels = 4; int numFilters = 3; int filterSize = 4; int stride = 2; int pad = 1; runConv2DTest(ExecType.CP, imgSize, numImg, numChannels, numFilters, filterSize, stride, pad, true, false); } - public void testConv2DSparse4() + public void testConv2DSparse3() { int numImg = 3; int imgSize = 10; int numChannels = 1; int numFilters = 3; int filterSize = 2; int stride = 2; int pad = 1; runConv2DTest(ExecType.CP, imgSize, numImg, numChannels, numFilters, filterSize, stride, pad, false, true); } - @Test - public void testConv2DSparse5() - { - int numImg = 3; int imgSize = 8; int numChannels = 2; int numFilters = 3; int filterSize = 3; int stride = 1; int pad = 2; - runConv2DTest(ExecType.CP, imgSize, numImg, numChannels, numFilters, filterSize, stride, pad, true, false); - } - // -------------------------------------------- @@ -206,13 +192,6 @@ public class Conv2DTest extends AutomatedTestBase runConv2DTest(ExecType.SPARK, imgSize, numImg, numChannels, numFilters, filterSize, stride, pad, true, true); } - @Test - public void testConv2DSparse5SP() - { - int numImg = 3; int imgSize = 8; int numChannels = 2; int numFilters = 3; int filterSize = 3; int stride = 1; int pad = 2; - runConv2DTest(ExecType.SPARK, imgSize, numImg, numChannels, numFilters, filterSize, stride, pad, true, true); - } - /** * * @param et http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/39a37ae4/src/test/scripts/functions/tensor/Conv2DBackwardDataTest.R ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/tensor/Conv2DBackwardDataTest.R b/src/test/scripts/functions/tensor/Conv2DBackwardDataTest.R index a251f7a..3a75b3f 100644 --- a/src/test/scripts/functions/tensor/Conv2DBackwardDataTest.R +++ b/src/test/scripts/functions/tensor/Conv2DBackwardDataTest.R @@ -37,13 +37,15 @@ dout=matrix(seq(1, numImg*numFilters*P*Q), numImg, numFilters*P*Q, byrow=TRUE) if(as.logical(args[11])) { zero_mask = (w - mean(w)) > 0 w = w * zero_mask +} else { + w = w - mean(w) } if(as.logical(args[12])) { zero_mask = (dout - mean(dout)) > 0 dout = dout * zero_mask +} else { + dout = dout - mean(dout) } -w = w - mean(w) -dout = dout - mean(dout) col2im <- function(img_cols, C, Hin, Win, Hf, Wf, strideh, stridew, reduction) { http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/39a37ae4/src/test/scripts/functions/tensor/Conv2DBackwardDataTest.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/tensor/Conv2DBackwardDataTest.dml b/src/test/scripts/functions/tensor/Conv2DBackwardDataTest.dml index c10ac37..6630ca7 100644 --- a/src/test/scripts/functions/tensor/Conv2DBackwardDataTest.dml +++ b/src/test/scripts/functions/tensor/Conv2DBackwardDataTest.dml @@ -36,11 +36,15 @@ if($11) { zero_mask = (w - mean(w)) > 0 w = w * zero_mask } +else { + w = w - mean(w) +} if($12) { zero_mask = (dout - mean(dout)) > 0 dout = dout * zero_mask } -w = w - mean(w) -dout = dout - mean(dout) +else { + dout = dout - mean(dout) +} dx = conv2d_backward_data(w, dout, stride=[stride, stride], padding=[pad, pad], input_shape=[numImg, numChannels, imgSize, imgSize], filter_shape=[numFilters, numChannels, filterSize, filterSize]) write(dx, $10, format="text") \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/39a37ae4/src/test/scripts/functions/tensor/Conv2DBackwardTest.R ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/tensor/Conv2DBackwardTest.R b/src/test/scripts/functions/tensor/Conv2DBackwardTest.R index a6bbdca..7319da7 100644 --- a/src/test/scripts/functions/tensor/Conv2DBackwardTest.R +++ b/src/test/scripts/functions/tensor/Conv2DBackwardTest.R @@ -37,13 +37,15 @@ dout=matrix(seq(1, numImg*numFilters*P*Q), numImg, numFilters*P*Q, byrow=TRUE) if(as.logical(args[11])) { zero_mask = (x - mean(x)) > 0 x = x * zero_mask +} else { + x = x - mean(x) } if(as.logical(args[12])) { zero_mask = (dout - mean(dout)) > 0 dout = dout * zero_mask +} else { + dout = dout - mean(dout) } -x = x - mean(x) -dout = dout - mean(dout) pad_image <- function(img, Hin, Win, padh, padw){ C = nrow(img) img_padded = matrix(0, C, (Hin+2*padh)*(Win+2*padw)) # zeros http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/39a37ae4/src/test/scripts/functions/tensor/Conv2DBackwardTest.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/tensor/Conv2DBackwardTest.dml b/src/test/scripts/functions/tensor/Conv2DBackwardTest.dml index c98e52b..fb14c1c 100644 --- a/src/test/scripts/functions/tensor/Conv2DBackwardTest.dml +++ b/src/test/scripts/functions/tensor/Conv2DBackwardTest.dml @@ -36,11 +36,15 @@ if($11) { zero_mask = (x - mean(x)) > 0 x = x * zero_mask } +else { + x = x - mean(x) +} if($12) { zero_mask = (dout - mean(dout)) > 0 dout = dout * zero_mask } -x = x - mean(x) -dout = dout - mean(dout) +else { + dout = dout - mean(dout) +} dw = conv2d_backward_filter(x, dout, stride=[stride, stride], padding=[pad, pad], input_shape=[numImg, numChannels, imgSize, imgSize], filter_shape=[numFilters, numChannels, filterSize, filterSize]) write(dw, $10, format="text") \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/39a37ae4/src/test/scripts/functions/tensor/Conv2DTest.R ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/tensor/Conv2DTest.R b/src/test/scripts/functions/tensor/Conv2DTest.R index bec1ed7..6c6641f 100644 --- a/src/test/scripts/functions/tensor/Conv2DTest.R +++ b/src/test/scripts/functions/tensor/Conv2DTest.R @@ -35,13 +35,15 @@ w=matrix(seq(1, numFilters*numChannels*filterSize*filterSize), numFilters, numCh if(as.logical(args[9])) { zero_mask = (x - mean(x)) > 0 x = x * zero_mask +} else { + x = x - mean(x) } if(as.logical(args[10])) { zero_mask = (w - mean(w)) > 0 w = w * zero_mask +} else { + w = w - mean(w) } -x = x - mean(x) -w = w - mean(w) pad_image <- function(img, Hin, Win, padh, padw){ C = nrow(img) img_padded = matrix(0, C, (Hin+2*padh)*(Win+2*padw), byrow=TRUE) # zeros http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/39a37ae4/src/test/scripts/functions/tensor/Conv2DTest.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/tensor/Conv2DTest.dml b/src/test/scripts/functions/tensor/Conv2DTest.dml index 792367f..2eedca8 100644 --- a/src/test/scripts/functions/tensor/Conv2DTest.dml +++ b/src/test/scripts/functions/tensor/Conv2DTest.dml @@ -35,12 +35,16 @@ if($9) { zero_mask = (x - mean(x)) > 0 x = x * zero_mask } +else { + x = x - mean(x) +} if($10) { zero_mask = (w - mean(w)) > 0 w = w * zero_mask } -x = x - mean(x) -w = w - mean(w) +else { + w = w - mean(w) +} output = conv2d(x, w, padding=[pad, pad], stride=[stride, stride], input_shape=[numImg, numChannels, imgSize, imgSize], filter_shape=[numFilters, numChannels, filterSize, filterSize], bias=b) output = bias_add(output, b) write(output, $8, format="text") \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/39a37ae4/src/test/scripts/functions/tensor/PoolTest.R ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/tensor/PoolTest.R b/src/test/scripts/functions/tensor/PoolTest.R index d9c8d0c..a34e0b0 100644 --- a/src/test/scripts/functions/tensor/PoolTest.R +++ b/src/test/scripts/functions/tensor/PoolTest.R @@ -34,8 +34,9 @@ x=matrix(seq(1, numImg*numChannels*imgSize*imgSize), numImg, numChannels*imgSize if(as.logical(args[9])) { zero_mask = (x - mean(x)) > 0 x = x * zero_mask +} else { + x = x - mean(x) } -x = x - mean(x) pad_image <- function(img, Hin, Win, padh, padw){ C = nrow(img) img_padded = matrix(0, C, (Hin+2*padh)*(Win+2*padw)) # zeros http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/39a37ae4/src/test/scripts/functions/tensor/PoolTest.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/functions/tensor/PoolTest.dml b/src/test/scripts/functions/tensor/PoolTest.dml index b701e71..cc8132f 100644 --- a/src/test/scripts/functions/tensor/PoolTest.dml +++ b/src/test/scripts/functions/tensor/PoolTest.dml @@ -33,7 +33,9 @@ if($10) { zero_mask = (x - mean(x)) > 0 x = x * zero_mask } -x = x - mean(x) +else { + x = x - mean(x) +} if(poolMode == "max") { output = max_pool(x, stride=[stride, stride], padding=[pad, pad], input_shape=[numImg, numChannels, imgSize, imgSize], pool_size=[poolSize1, poolSize2]) }
