You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by mb...@apache.org on 2018/01/25 03:10:57 UTC

systemml git commit: [SYSTEMML-1931] New tests for matrix-scalar logical operations

Repository: systemml
Updated Branches:
  refs/heads/master 52aae222c -> 240297bd5


[SYSTEMML-1931] New tests for matrix-scalar logical operations

Closes #715.


Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/240297bd
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/240297bd
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/240297bd

Branch: refs/heads/master
Commit: 240297bd5776458f5580d89e9df31c4d4f670803
Parents: 52aae22
Author: Janardhan Pulivarthi <j1...@protonmail.com>
Authored: Wed Jan 24 19:08:48 2018 -0800
Committer: Matthias Boehm <mb...@gmail.com>
Committed: Wed Jan 24 19:08:48 2018 -0800

----------------------------------------------------------------------
 .../FullLogicalMatrixTest.java                  |   2 +-
 .../functions/binary/scalar/LogicalTest.java    | 193 +++++++++++++++++++
 .../functions/binary/scalar/LogicalAndTest.R    |  35 ++++
 .../functions/binary/scalar/LogicalAndTest.dml  |  28 +++
 .../functions/binary/scalar/LogicalOrTest.R     |  32 +++
 .../functions/binary/scalar/LogicalOrTest.dml   |  27 +++
 .../functions/binary/scalar/LogicalXorTest.R    |  34 ++++
 .../functions/binary/scalar/LogicalXorTest.dml  |  27 +++
 8 files changed, 377 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/systemml/blob/240297bd/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalMatrixTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalMatrixTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalMatrixTest.java
index cb7ec9d..baed332 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalMatrixTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullLogicalMatrixTest.java
@@ -35,7 +35,7 @@ import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * The main purpose of this test is to verify various input combinations for
- * matrix-matrix logical operations that internally translate to binary operations.
+ * matrix-scalar logical operations that internally translate to binary operations.
  *
  */
 public class FullLogicalMatrixTest extends AutomatedTestBase

http://git-wip-us.apache.org/repos/asf/systemml/blob/240297bd/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LogicalTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LogicalTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LogicalTest.java
new file mode 100644
index 0000000..20ccbf4
--- /dev/null
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LogicalTest.java
@@ -0,0 +1,193 @@
+/*
+ * 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.
+ */
+
+package org.apache.sysml.test.integration.functions.binary.scalar;
+
+
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.junit.Test;
+
+import java.util.HashMap;
+
+
+public class LogicalTest extends AutomatedTestBase {
+
+	private final static String TEST_NAME1 = "LogicalAndTest";
+	private final static String TEST_NAME2 = "LogicalOrTest";
+	private final static String TEST_NAME3 = "LogicalXorTest";
+
+	private final static String TEST_DIR   = "functions/binary/scalar/";
+	private static final String TEST_CLASS_DIR = TEST_DIR + LogicalTest.class.getSimpleName() + "/";
+
+	private final static int rows = 2100;
+	private final static int cols = 70;
+	private final static double sparsity1 = 0.1; //sparse
+	private final static double sparsity2 = 0.9; //dense
+	private final static double eps = 1e-10;
+
+	@Override
+	public void setUp() {
+		addTestConfiguration(TEST_NAME1, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] { "C" }));
+		addTestConfiguration(TEST_NAME2, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[] { "C" }));
+		addTestConfiguration(TEST_NAME3, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME3, new String[] { "C" }));
+	}
+
+	// And Tests
+	@Test
+	public void testAndDenseCP() {
+		runLogical(TEST_NAME1, false, ExecType.CP);
+	}
+
+	@Test
+	public void testAndSparseCP() {
+		runLogical(TEST_NAME1, true, ExecType.CP);
+	}
+
+	@Test
+	public void testAndDenseSP() {
+		runLogical(TEST_NAME1, false, ExecType.SPARK);
+	}
+
+	@Test
+	public void testAndSparseSP() {
+		runLogical(TEST_NAME1, true, ExecType.SPARK);
+	}
+
+	@Test
+	public void testAndDenseMR() {
+		runLogical(TEST_NAME1, false, ExecType.MR);
+	}
+
+	@Test
+	public void testAndSparseMR() {
+		runLogical(TEST_NAME1, true, ExecType.MR);
+	}
+
+	//Or Tests
+	@Test
+	public void testOrDenseCP() {
+		runLogical(TEST_NAME2, false, ExecType.CP);
+	}
+
+	@Test
+	public void testOrSparseCP() {
+		runLogical(TEST_NAME2, true, ExecType.CP);
+	}
+
+	@Test
+	public void testOrDenseSP() {
+		runLogical(TEST_NAME2, false, ExecType.SPARK);
+	}
+
+	@Test
+	public void testOrSparseSP() {
+		runLogical(TEST_NAME2, true, ExecType.SPARK);
+	}
+
+	@Test
+	public void testOrDenseMR() {
+		runLogical(TEST_NAME2, false, ExecType.MR);
+	}
+
+	@Test
+	public void testOrSparseMR() {
+		runLogical(TEST_NAME2, true, ExecType.MR);
+	}
+
+	//XOR Tests
+	@Test
+	public void testXorDenseCP() {
+		runLogical(TEST_NAME3, false, ExecType.CP);
+	}
+
+	@Test
+	public void testXorSparseCP() {
+		runLogical(TEST_NAME3, true, ExecType.CP);
+	}
+
+	@Test
+	public void testXorDenseSP() {
+		runLogical(TEST_NAME3, false, ExecType.SPARK);
+	}
+
+	@Test
+	public void testXorSparseSP() {
+		runLogical(TEST_NAME3, true, ExecType.SPARK);
+	}
+
+	@Test
+	public void testXorDenseMR() {
+		runLogical(TEST_NAME3, false, ExecType.MR);
+	}
+
+	@Test
+	public void testXorSparseMR() {
+		runLogical(TEST_NAME3, true, ExecType.MR);
+	}
+
+
+	public  void runLogical(String testname, boolean sparse, ExecType et) {
+		//rtplatform for MR
+		RUNTIME_PLATFORM platformOld = rtplatform;
+		switch( et ){
+			case MR: rtplatform = RUNTIME_PLATFORM.HADOOP; break;
+			case SPARK: rtplatform = RUNTIME_PLATFORM.SPARK; break;
+			default: rtplatform = RUNTIME_PLATFORM.HYBRID_SPARK; break;
+		}
+
+		boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
+		if( rtplatform == RUNTIME_PLATFORM.SPARK || rtplatform == RUNTIME_PLATFORM.HYBRID_SPARK )
+			DMLScript.USE_LOCAL_SPARK_CONFIG = true;
+
+		try {
+			String TEST_NAME = testname;
+			getAndLoadTestConfiguration(TEST_NAME);
+
+			String HOME = SCRIPT_DIR + TEST_DIR;
+			fullDMLScriptName = HOME + TEST_NAME + ".dml";
+			programArgs = new String[]{"-explain", "-args", input("A"), output("C")};
+
+			fullRScriptName = HOME + TEST_NAME + ".R";
+			rCmd = "Rscript" + " " + fullRScriptName + " " + inputDir() + " " + expectedDir();
+
+			//get a random matrix of values with (-0.5, 0, 1)
+			double[][] A = getRandomMatrix(rows, cols, -0.5, 1, sparse ? sparsity1:sparsity2, 1234);
+			writeInputMatrixWithMTD("A", A, true);
+
+			//run tests
+			runTest(true, false, null, -1);
+			runRScript(true);
+
+			//compare matrices
+			HashMap<CellIndex, Double> dmlfile = readDMLMatrixFromHDFS("C");
+			HashMap<CellIndex, Double> rfile   = readRMatrixFromFS("C");
+			TestUtils.compareMatrices(dmlfile, rfile, eps, "Stat-DML", "Stat-R");
+		}
+		finally {
+			DMLScript.USE_LOCAL_SPARK_CONFIG = sparkConfigOld;
+			rtplatform = platformOld;
+		}
+	}
+}

http://git-wip-us.apache.org/repos/asf/systemml/blob/240297bd/src/test/scripts/functions/binary/scalar/LogicalAndTest.R
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/binary/scalar/LogicalAndTest.R b/src/test/scripts/functions/binary/scalar/LogicalAndTest.R
new file mode 100644
index 0000000..45e97d4
--- /dev/null
+++ b/src/test/scripts/functions/binary/scalar/LogicalAndTest.R
@@ -0,0 +1,35 @@
+#-------------------------------------------------------------
+#
+# 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.
+#
+#-------------------------------------------------------------
+
+# for matrix-scalar
+
+args <- commandArgs(TRUE)
+options(digits=22)
+
+library("Matrix")
+
+A <- readMM(paste(args[1], "A.mtx", sep=""))
+
+n = 0;
+C = A & n;
+
+writeMM(as(C, "CsparseMatrix"), paste(args[2], "C", sep=""));
+

http://git-wip-us.apache.org/repos/asf/systemml/blob/240297bd/src/test/scripts/functions/binary/scalar/LogicalAndTest.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/binary/scalar/LogicalAndTest.dml b/src/test/scripts/functions/binary/scalar/LogicalAndTest.dml
new file mode 100644
index 0000000..c99bbe5
--- /dev/null
+++ b/src/test/scripts/functions/binary/scalar/LogicalAndTest.dml
@@ -0,0 +1,28 @@
+#-------------------------------------------------------------
+#
+# 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 = read($1);
+n = 0;
+
+C = (A & n);
+
+write(C, $2);
+

http://git-wip-us.apache.org/repos/asf/systemml/blob/240297bd/src/test/scripts/functions/binary/scalar/LogicalOrTest.R
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/binary/scalar/LogicalOrTest.R b/src/test/scripts/functions/binary/scalar/LogicalOrTest.R
new file mode 100644
index 0000000..8738671
--- /dev/null
+++ b/src/test/scripts/functions/binary/scalar/LogicalOrTest.R
@@ -0,0 +1,32 @@
+#-------------------------------------------------------------
+#
+# 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.
+#
+#-------------------------------------------------------------
+
+args <- commandArgs(TRUE)
+options(digits=22)
+
+library("Matrix")
+
+A <- readMM(paste(args[1], "A.mtx", sep=""))
+n = 0;
+
+C = A | n;
+
+writeMM(as(C, "CsparseMatrix"), paste(args[2], "C", sep=""));
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/systemml/blob/240297bd/src/test/scripts/functions/binary/scalar/LogicalOrTest.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/binary/scalar/LogicalOrTest.dml b/src/test/scripts/functions/binary/scalar/LogicalOrTest.dml
new file mode 100644
index 0000000..ec13d82
--- /dev/null
+++ b/src/test/scripts/functions/binary/scalar/LogicalOrTest.dml
@@ -0,0 +1,27 @@
+#-------------------------------------------------------------
+#
+# 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 = read($1);
+n = 0;
+
+C = (A | n);
+
+write(C, $2);
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/systemml/blob/240297bd/src/test/scripts/functions/binary/scalar/LogicalXorTest.R
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/binary/scalar/LogicalXorTest.R b/src/test/scripts/functions/binary/scalar/LogicalXorTest.R
new file mode 100644
index 0000000..a477cce
--- /dev/null
+++ b/src/test/scripts/functions/binary/scalar/LogicalXorTest.R
@@ -0,0 +1,34 @@
+#-------------------------------------------------------------
+#
+# 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.
+#
+#-------------------------------------------------------------
+
+args <- commandArgs(TRUE)
+options(digits=22)
+
+library("Matrix")
+
+A <- readMM(paste(args[1], "A.mtx", sep=""))
+
+n = 0;
+
+C = xor(A, n);
+
+writeMM(as(C, "CsparseMatrix"), paste(args[2], "C", sep=""));
+

http://git-wip-us.apache.org/repos/asf/systemml/blob/240297bd/src/test/scripts/functions/binary/scalar/LogicalXorTest.dml
----------------------------------------------------------------------
diff --git a/src/test/scripts/functions/binary/scalar/LogicalXorTest.dml b/src/test/scripts/functions/binary/scalar/LogicalXorTest.dml
new file mode 100644
index 0000000..b5e7ade
--- /dev/null
+++ b/src/test/scripts/functions/binary/scalar/LogicalXorTest.dml
@@ -0,0 +1,27 @@
+#-------------------------------------------------------------
+#
+# 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 = read($1);
+n = 0;
+
+C = xor(A, n);
+
+write(C, $2);