phaniarnab commented on a change in pull request #923:
URL: https://github.com/apache/systemml/pull/923#discussion_r431202547
##########
File path: src/main/java/org/apache/sysds/runtime/matrix/data/FrameBlock.java
##########
@@ -1865,6 +1865,39 @@ else if
(!dataType.toString().equals(schemaString[i].trim()))
return this;
}
+ /*
+ This method validate the frame data against a column length
constrain
+ if data value in any column is greater than specific threshold
+ output vector will store a 1 for that column position.
+ @param input MatrixBlock of valid lengths
+ @param output 0/1 MatrixBlock for valid/invalid features
+ */
+ public FrameBlock invalidByLength(MatrixBlock feaLen) {
Review comment:
Typo in the comment: output 0/1 FrameBlock
##########
File path:
src/test/java/org/apache/sysds/test/functions/frame/FrameDropInvalidLengthTest.java
##########
@@ -0,0 +1,220 @@
+/*
+ * 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.sysds.test.functions.frame;
+
+import org.apache.sysds.api.DMLScript;
+import org.apache.sysds.common.Types;
+import org.apache.sysds.hops.OptimizerUtils;
+import org.apache.sysds.lops.LopProperties;
+import org.apache.sysds.runtime.io.FrameWriter;
+import org.apache.sysds.runtime.io.FrameWriterFactory;
+import org.apache.sysds.runtime.matrix.data.FrameBlock;
+import org.apache.sysds.runtime.matrix.data.MatrixValue;
+import org.apache.sysds.runtime.util.UtilFunctions;
+import org.apache.sysds.test.AutomatedTestBase;
+import org.apache.sysds.test.TestConfiguration;
+import org.apache.sysds.test.TestUtils;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.stream.Collectors;
+
+public class FrameDropInvalidLengthTest extends AutomatedTestBase {
+ private final static String TEST_NAME = "DropInvalidLength";
+ private final static String TEST_DIR = "functions/frame/";
+ private static final String TEST_CLASS_DIR = TEST_DIR +
FrameDropInvalidLengthTest.class.getSimpleName() + "/";
+
+ private final static int rows = 800;
+ private final static int cols = 4;
+ private final static Types.ValueType[] schemaStrings =
{Types.ValueType.FP64, Types.ValueType.STRING, Types.ValueType.STRING,
Types.ValueType.INT64};
+
+ public static void init() {
+ TestUtils.clearDirectory(TEST_DATA_DIR + TEST_CLASS_DIR);
+ }
+
+ public static void cleanUp() {
+ if (TEST_CACHE_ENABLED) {
+ TestUtils.clearDirectory(TEST_DATA_DIR +
TEST_CLASS_DIR);
+ }
+ }
+
+ @Override
+ public void setUp() {
+ TestUtils.clearAssertionInformation();
+ addTestConfiguration(TEST_NAME, new
TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[] {"B"}));
+ if (TEST_CACHE_ENABLED) {
+ setOutAndExpectedDeletionDisabled(true);
+ }
+ }
+
+ @Test
+ public void testTwoBadColCP() {
+ double[][] invalidLength = {{-1,30,20,-1}};
+ runDropInvalidLenTest( invalidLength,1,
LopProperties.ExecType.CP);
+ }
+
+// @Test
+// public void testTwoBadColSP() {
+// double[][] invalidLength = {{-1,30,20,-1}};
+// runDropInvalidLenTest( invalidLength,1,
LopProperties.ExecType.SPARK);
+// }
+
+ @Test
+ public void testOneBadColCP() {
+ double[][] invalidLength = {{-1,-1,20,-1}};
+ runDropInvalidLenTest( invalidLength,2,
LopProperties.ExecType.CP);
+ }
+
+// @Test
+// public void testOneBadColSP() {
+// double[][] invalidLength = {{-1,-1,20,-1}};
+// runDropInvalidLenTest( invalidLength,2,
LopProperties.ExecType.SPARK);
+// }
+
+ @Test
+ public void testAllBadColCP() {
+ double[][] invalidLength = {{2,2,2,1}};
+ runDropInvalidLenTest( invalidLength,3,
LopProperties.ExecType.CP);
+ }
+
+// @Test
+// public void testAllBadColSP() {
+// double[][] invalidLength = {{2,2,2,1}};
+// runDropInvalidLenTest( invalidLength,3,
LopProperties.ExecType.SPARK);
+// }
+
+ @Test
+ public void testNoneBadColCP() {
+ double[][] invalidLength = {{-1,20,20,-1}};
+ runDropInvalidLenTest( invalidLength,4,
LopProperties.ExecType.CP);
+ }
+
+// @Test
+// public void testNoneBadColSP() {
+// double[][] invalidLength = {{-1,20,20,-1}};
+// runDropInvalidLenTest( invalidLength,4,
LopProperties.ExecType.SPARK);
+// }
+
+ private void runDropInvalidLenTest(double[][] colInvalidLength, int
test, LopProperties.ExecType et)
+ {
+ Types.ExecMode platformOld = setExecMode(et);
+ boolean oldFlag = OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION;
+ boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
+ try {
+ getAndLoadTestConfiguration(TEST_NAME);
+ String HOME = SCRIPT_DIR + TEST_DIR;
+ fullDMLScriptName = HOME + TEST_NAME + ".dml";
+ programArgs = new String[] {"-args", input("A"),
input("M"),
+ String.valueOf(rows),
Integer.toString(cols), output("B")};
+ FrameBlock frame1 = new FrameBlock(schemaStrings);
+ double[][] A = getRandomMatrix(rows, cols, 10, 100, 1,
2373);
+ initFrameDataString(frame1,A, schemaStrings); //
initialize a frame with one column
+ FrameWriter writer =
FrameWriterFactory.createFrameWriter(Types.FileFormat.CSV);
+
+ ArrayList<Integer> badIndex = getBadIndexes(rows/4);
+ int expected = 0;
+
+ switch (test) { //Double in String
+ case 1:
+ for (int i = 0; i < badIndex.size();
i++) {
+
frame1.set(badIndex.get(i),1,"This is a very long sentence that could" +
+ " count up to
multiple characters");
+ }
+ expected += badIndex.size();
+ case 2:
+ for (int i = 0; i < badIndex.size();
i++) {
+ frame1.set(badIndex.get(i), 2,
"This is out of length");
+ }
+ expected += badIndex.size();
+ break;
+ case 3:
+ expected += rows*cols;
+ break;
+ case 4:
+ expected += 0;
+ break;
+ }
+ // write data frame
+ writer.writeFrameToHDFS(
+ frame1.slice(0, rows - 1, 0, cols-1,
new FrameBlock()),
+ input("A"), rows, schemaStrings.length);
+ // write expected feature length matrix
+ writeInputMatrixWithMTD("M", colInvalidLength, true);
+
+ runTest(true, false, null, -1);
+ // compare output
+ HashMap<MatrixValue.CellIndex, Double> dmlOut =
readDMLMatrixFromHDFS("B");
+ MatrixValue.CellIndex index =
dmlOut.keySet().iterator().next(); double d = dmlOut.get(index);
+ Assert.assertEquals(expected,
d, 1e-5);
+ }
+ catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
+ finally {
+ rtplatform = platformOld;
+ DMLScript.USE_LOCAL_SPARK_CONFIG = sparkConfigOld;
+ OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION = oldFlag;
+ OptimizerUtils.ALLOW_AUTO_VECTORIZATION = true;
+ OptimizerUtils.ALLOW_OPERATOR_FUSION = true;
+ }
+ }
+
+ private ArrayList getBadIndexes(int length) {
+ ArrayList list = new ArrayList();
+ for(int i =0; i<length; i++)
+ {
+ int r = ThreadLocalRandom.current().nextInt(0, rows);
+ list.add(r);
+ }
+ return (ArrayList)
list.stream().distinct().collect(Collectors.toList());
+ }
Review comment:
Please take care of the compiler warnings (parameterize ArrayList
instead of using raw).
##########
File path:
src/main/java/org/apache/sysds/runtime/instructions/cp/BinaryFrameMatrixCPInstruction.java
##########
@@ -0,0 +1,48 @@
+/*
+ * 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.sysds.runtime.instructions.cp;
+
+import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysds.runtime.matrix.data.FrameBlock;
+import org.apache.sysds.runtime.matrix.data.MatrixBlock;
+import org.apache.sysds.runtime.matrix.operators.Operator;
+
+public class BinaryFrameMatrixCPInstruction extends BinaryCPInstruction {
+ protected BinaryFrameMatrixCPInstruction(Operator op, CPOperand in1,
+ CPOperand in2, CPOperand out, String opcode, String
istr) {
+ super(CPInstruction.CPType.Binary, op, in1, in2, out, opcode,
istr);
+ }
+
+ @Override
+ public void processInstruction(ExecutionContext ec) {
+ // Read input frame
+ FrameBlock inBlock1 = ec.getFrameInput(input1.getName());
+ // the vector with valid column lengths
+ MatrixBlock featurelength = ec.getMatrixInput(input2.getName());
+ // identify columns with invalid lengths
+ FrameBlock out = inBlock1.invalidByLength(featurelength);
+ // Release the memory occupied by inputs
+ ec.releaseFrameInput(input1.getName());
+ ec.releaseMatrixInput(input2.getName());
+ // Attach result frame with output
+ ec.setFrameOutput(output.getName(),out);
Review comment:
Does the result have to be a frame? Can that not be a vector?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
