This is an automated email from the ASF dual-hosted git repository.
mboehm7 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/systemds.git
The following commit(s) were added to refs/heads/main by this push:
new fe081da [SYSTEMDS-3296] Fix variable seed handling in CP and Spark
sample ops
fe081da is described below
commit fe081dac756a2e0ade442d62ed6d5d0b8c8ad61a
Author: Matthias Boehm <[email protected]>
AuthorDate: Sun Feb 27 14:38:14 2022 +0100
[SYSTEMDS-3296] Fix variable seed handling in CP and Spark sample ops
This patch fixes the seed parsing of CP and Spark sample operations. So
far it always assumed constants (e.g., after constant propagation) but
in general it needs to support instruction patching like rand.
Furthermore, this patch also fixes the java doc inconsistency that
currently leads to distribution build failures.
---
.../instructions/cp/DataGenCPInstruction.java | 8 +--
.../instructions/spark/RandSPInstruction.java | 9 +--
.../sysds/runtime/matrix/data/MatrixBlock.java | 4 +-
.../test/functions/data/rand/SampleSeedTest.java | 82 ++++++++++++++++++++++
src/test/scripts/functions/data/SampleSeed.dml | 29 ++++++++
5 files changed, 120 insertions(+), 12 deletions(-)
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/cp/DataGenCPInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/cp/DataGenCPInstruction.java
index 971274d..8d2e83f 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/cp/DataGenCPInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/cp/DataGenCPInstruction.java
@@ -283,12 +283,12 @@ public class DataGenCPInstruction extends
UnaryCPInstruction {
CPOperand rows = new CPOperand(s[2]);
CPOperand cols = new CPOperand("1", ValueType.INT64,
DataType.SCALAR);
boolean replace =
(!s[3].contains(Lop.VARIABLE_NAME_PLACEHOLDER) && Boolean.valueOf(s[3]));
-
- long seed = Long.parseLong(s[SEED_POSITION_SAMPLE]);
+ long seed =
!s[SEED_POSITION_SAMPLE].contains(Lop.VARIABLE_NAME_PLACEHOLDER) ?
+ Long.parseLong(s[SEED_POSITION_SAMPLE]) : -1;
int blen = Integer.parseInt(s[5]);
- return new DataGenCPInstruction(op, method, null, out,
rows, cols, null, blen, s[1], replace, seed, opcode,
- str);
+ return new DataGenCPInstruction(op, method, null,
+ out, rows, cols, null, blen, s[1], replace,
seed, opcode, str);
}
else if(method == OpOpDG.TIME) {
return new DataGenCPInstruction(op, method, out,
opcode, str);
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/spark/RandSPInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/spark/RandSPInstruction.java
index b3c9424..377e0c8 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/spark/RandSPInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/spark/RandSPInstruction.java
@@ -285,14 +285,11 @@ public class RandSPInstruction extends UnarySPInstruction
{
null, null, blen, from, to, incr, opcode, str);
}
else if ( method == OpOpDG.SAMPLE) {
- String max =
!s[1].contains(Lop.VARIABLE_NAME_PLACEHOLDER) ?
- s[1] : "0";
+ String max =
!s[1].contains(Lop.VARIABLE_NAME_PLACEHOLDER) ? s[1] : "0";
CPOperand rows = new CPOperand(s[2]);
CPOperand cols = new CPOperand("1", ValueType.INT64,
DataType.SCALAR);
- boolean replace =
(!s[3].contains(Lop.VARIABLE_NAME_PLACEHOLDER)
- && Boolean.valueOf(s[3]));
-
- long seed = Long.parseLong(s[4]);
+ boolean replace =
!s[3].contains(Lop.VARIABLE_NAME_PLACEHOLDER) && Boolean.valueOf(s[3]);
+ long seed =
!s[4].contains(Lop.VARIABLE_NAME_PLACEHOLDER) ? Long.parseLong(s[4]) : -1;
int blen = Integer.parseInt(s[5]);
return new RandSPInstruction(op, method, null, out,
rows, cols,
diff --git
a/src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java
b/src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java
index 863775d..989c8c4 100644
--- a/src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java
+++ b/src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java
@@ -5461,9 +5461,9 @@ public class MatrixBlock extends MatrixValue implements
CacheBlock, Externalizab
/**
* @param thatMatrix matrix value
* @param thatScalar scalar double
- * @param resultBlock result matrix block
+ * @param ret result matrix block
* @param updateClen when this matrix already has the desired number of
columns updateClen can be set to false
- * @return resultBlock
+ * @return result matrix block
*/
public MatrixBlock ctableSeqOperations(MatrixValue thatMatrix, double
thatScalar, MatrixBlock ret, boolean updateClen) {
MatrixBlock that = checkType(thatMatrix);
diff --git
a/src/test/java/org/apache/sysds/test/functions/data/rand/SampleSeedTest.java
b/src/test/java/org/apache/sysds/test/functions/data/rand/SampleSeedTest.java
new file mode 100644
index 0000000..acbbba5
--- /dev/null
+++
b/src/test/java/org/apache/sysds/test/functions/data/rand/SampleSeedTest.java
@@ -0,0 +1,82 @@
+/*
+ * 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.data.rand;
+
+import java.util.HashMap;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.apache.sysds.common.Types.ExecMode;
+import org.apache.sysds.common.Types.ExecType;
+import org.apache.sysds.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysds.test.AutomatedTestBase;
+import org.apache.sysds.test.TestConfiguration;
+import org.apache.sysds.test.TestUtils;
+
+public class SampleSeedTest extends AutomatedTestBase
+{
+ private final static String TEST_NAME = "SampleSeed";
+ private final static String TEST_DIR = "functions/data/";
+ private final static String TEST_CLASS_DIR = TEST_DIR +
SampleSeedTest.class.getSimpleName() + "/";
+
+ private final static int rows = 30;
+ private final static int cols = 3;
+
+ @Override
+ public void setUp() {
+ TestUtils.clearAssertionInformation();
+ addTestConfiguration( TEST_NAME, new
TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[] { "R" }) );
+ }
+
+ @Test
+ public void testMatrixVarSeedCP() {
+ runSampleSeedTest(TEST_NAME, ExecType.CP);
+ }
+
+ //FIXME spark different results with different seed
+ //(For now we set without replacement, once fix change FALSE to TRUE)
+ @Test
+ public void testMatrixVarSeedSP() {
+ runSampleSeedTest(TEST_NAME, ExecType.SPARK);
+ }
+
+ private void runSampleSeedTest(String TEST_NAME, ExecType instType) {
+ ExecMode platformOld = setExecMode(instType);
+
+ try {
+ getAndLoadTestConfiguration(TEST_NAME);
+
+ String HOME = SCRIPT_DIR + TEST_DIR;
+ fullDMLScriptName = HOME + TEST_NAME + ".dml";
+ programArgs = new String[]{"-args",
+ Integer.toString(rows), Integer.toString(cols),
output("R") };
+
+ //run test
+ runTest(true, false, null, -1);
+
+ //compare matrices
+ HashMap<CellIndex, Double> dmlfile =
readDMLMatrixFromOutputDir("R");
+ Assert.assertEquals(Double.valueOf(55), dmlfile.get(new
CellIndex(1,1))); //52 w/ TRUE
+ }
+ finally {
+ resetExecMode(platformOld);
+ }
+ }
+}
diff --git a/src/test/scripts/functions/data/SampleSeed.dml
b/src/test/scripts/functions/data/SampleSeed.dml
new file mode 100644
index 0000000..d2ebba6
--- /dev/null
+++ b/src/test/scripts/functions/data/SampleSeed.dml
@@ -0,0 +1,29 @@
+#-------------------------------------------------------------
+#
+# 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.
+#
+#-------------------------------------------------------------
+
+X = rand(rows=$1, cols=$2, min=10, max=10, seed=7)
+
+seed = 7
+if(sum(X) < 10)
+ seed = 3
+
+R = as.matrix(sum(sample(10, 10, FALSE, seed)))
+write(R, $3);
