Baunsgaard commented on a change in pull request #1218:
URL: https://github.com/apache/systemds/pull/1218#discussion_r613140924
##########
File path:
src/main/java/org/apache/sysds/runtime/instructions/fed/FEDInstructionUtils.java
##########
@@ -316,7 +320,9 @@ else if(inst instanceof QuaternarySPInstruction) {
}
else if(inst instanceof SpoofSPInstruction) {
SpoofSPInstruction instruction = (SpoofSPInstruction)
inst;
- if(instruction.getOperatorClass().getSuperclass() ==
SpoofCellwise.class && instruction.isFederated(ec)) {
+ if((instruction.getOperatorClass().getSuperclass() ==
SpoofCellwise.class
+ ||
instruction.getOperatorClass().getSuperclass() == SpoofRowwise.class)
Review comment:
add verification like previous commment
##########
File path:
src/test/java/org/apache/sysds/test/functions/federated/codegen/FederatedCellwiseTmplTest.java
##########
@@ -147,8 +145,8 @@ private void testFederatedCodegen(ExecMode exec_mode) {
// generate dataset
// matrix handled by two federated workers
- double[][] X1 = getRandomMatrix(fed_rows, fed_cols, 0, 1,
sparsity, 3);
- double[][] X2 = getRandomMatrix(fed_rows, fed_cols, 0, 1,
sparsity, 7);
+ double[][] X1 = getRandomMatrix(fed_rows, fed_cols, 0, 1, 1, 3);
+ double[][] X2 = getRandomMatrix(fed_rows, fed_cols, 0, 1, 1, 7);
Review comment:
with this you are saying that the test does not care if the input is
sparse or dense, if this is the case then to reduce the running time of these
test i suggest making all the inputs sparse rather than dense, perhaps set it
to 0.1 ?
##########
File path:
src/test/java/org/apache/sysds/test/functions/federated/codegen/FederatedRowwiseTmplTest.java
##########
@@ -0,0 +1,181 @@
+/*
+ * 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.federated.codegen;
+
+import java.io.File;
+import org.apache.sysds.common.Types.ExecMode;
+import org.apache.sysds.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysds.runtime.meta.MatrixCharacteristics;
+import org.apache.sysds.runtime.util.HDFSTool;
+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.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+
+@RunWith(value = Parameterized.class)
[email protected]
+public class FederatedRowwiseTmplTest extends AutomatedTestBase
+{
+ private final static String TEST_NAME = "FederatedRowwiseTmplTest";
+
+ private final static String TEST_DIR = "functions/federated/codegen/";
+ private final static String TEST_CLASS_DIR = TEST_DIR +
FederatedRowwiseTmplTest.class.getSimpleName() + "/";
+
+ private final static String TEST_CONF = "SystemDS-config-codegen.xml";
+
+ private final static String OUTPUT_NAME = "Z";
+ private final static double TOLERANCE = 1e-13;
+ private final static int BLOCKSIZE = 1024;
+
+ @Parameterized.Parameter()
+ public int test_num;
+ @Parameterized.Parameter(1)
+ public int rows;
+ @Parameterized.Parameter(2)
+ public int cols;
+
+ @Override
+ public void setUp() {
+ addTestConfiguration(TEST_NAME, new
TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[]{OUTPUT_NAME}));
+ }
+
+ @Parameterized.Parameters
+ public static Collection<Object[]> data() {
+ // rows must be even
+ return Arrays.asList(new Object[][] {
+ // {test_num, rows, cols}
+
+ {1, 6, 4},
+ {2, 6, 2},
+ {3, 6, 4},
+ {4, 6, 4},
+ {10, 150, 10},
+ {15, 150, 10},
+ {20, 1500, 8},
+ {21, 1500, 8},
+ {25, 600, 10},
+ {31, 150, 10},
+ {40, 300, 20},
+ {45, 1500, 100},
+ {50, 376, 4},
+ });
+ }
+
+ @BeforeClass
+ public static void init() {
+ TestUtils.clearDirectory(TEST_DATA_DIR + TEST_CLASS_DIR);
+ }
+
+ // @Test
+ // public void federatedCodegenRowwiseSingleNode() {
+ // testFederatedCodegenRowwise(ExecMode.SINGLE_NODE);
+ // }
+ //
+ // @Test
+ // public void federatedCodegenRowwiseSpark() {
+ // testFederatedCodegenRowwise(ExecMode.SPARK);
+ // }
+
+ @Test
+ public void federatedCodegenCellwiseHybrid() {
+ testFederatedCodegenRowwise(ExecMode.HYBRID);
+ }
+
+ private void testFederatedCodegenRowwise(ExecMode exec_mode) {
+ // store the previous platform config to restore it after the
test
+ ExecMode platform_old = setExecMode(exec_mode);
+
+ getAndLoadTestConfiguration(TEST_NAME);
+ String HOME = SCRIPT_DIR + TEST_DIR;
+
+ int fed_rows = rows / 2;
+ int fed_cols = cols;
+
+ // generate dataset
+ // matrix handled by two federated workers
+ double[][] X1 = getRandomMatrix(fed_rows, fed_cols, 0, 1, 1, 3);
+ double[][] X2 = getRandomMatrix(fed_rows, fed_cols, 0, 1, 1, 7);
+
+ writeInputMatrixWithMTD("X1", X1, false, new
MatrixCharacteristics(fed_rows, fed_cols, BLOCKSIZE, fed_rows * fed_cols));
+ writeInputMatrixWithMTD("X2", X2, false, new
MatrixCharacteristics(fed_rows, fed_cols, BLOCKSIZE, fed_rows * fed_cols));
+
+ // empty script name because we don't execute any script, just
start the worker
+ fullDMLScriptName = "";
+ int port1 = getRandomAvailablePort();
+ int port2 = getRandomAvailablePort();
+ Thread thread1 = startLocalFedWorkerThread(port1,
FED_WORKER_WAIT_S);
+ Thread thread2 = startLocalFedWorkerThread(port2);
+
+ getAndLoadTestConfiguration(TEST_NAME);
+
+ // Run reference dml script with normal matrix
+ fullDMLScriptName = HOME + TEST_NAME + "Reference.dml";
+ programArgs = new String[] {"-stats", "-nvargs",
+ "in_X1=" + input("X1"), "in_X2=" + input("X2"),
+ "in_test_num=" + Integer.toString(test_num),
+ "out_Z=" + expected(OUTPUT_NAME)};
+ runTest(true, false, null, -1);
+
+ // Run actual dml script with federated matrix
+ fullDMLScriptName = HOME + TEST_NAME + ".dml";
+ programArgs = new String[] {"-stats", "-nvargs",
+ "in_X1=" + TestUtils.federatedAddress(port1,
input("X1")),
+ "in_X2=" + TestUtils.federatedAddress(port2,
input("X2")),
+ "in_test_num=" + Integer.toString(test_num),
+ "rows=" + rows, "cols=" + cols,
+ "out_Z=" + output(OUTPUT_NAME)};
+ runTest(true, false, null, -1);
+
+ // compare the results via files
+ HashMap<CellIndex, Double> refResults =
readDMLMatrixFromExpectedDir(OUTPUT_NAME);
+ HashMap<CellIndex, Double> fedResults =
readDMLMatrixFromOutputDir(OUTPUT_NAME);
+ TestUtils.compareMatrices(fedResults, refResults, TOLERANCE,
"Fed", "Ref");
+
+ TestUtils.shutdownThreads(thread1, thread2);
+
+ // check for federated operations
+ Assert.assertTrue(heavyHittersContainsSubString("fed_spoofRA"));
Review comment:
just verifying that it calls the spoof operation is fine, but i would
like some verification that the result is correct as well.
If this is not possible in all your tests cases i suggest adding one where
you have a known result, that you then verify calculates correctly.
##########
File path:
src/test/java/org/apache/sysds/test/functions/federated/codegen/FederatedRowwiseTmplTest.java
##########
@@ -0,0 +1,181 @@
+/*
+ * 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.federated.codegen;
+
+import java.io.File;
+import org.apache.sysds.common.Types.ExecMode;
+import org.apache.sysds.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysds.runtime.meta.MatrixCharacteristics;
+import org.apache.sysds.runtime.util.HDFSTool;
+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.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+
+@RunWith(value = Parameterized.class)
[email protected]
+public class FederatedRowwiseTmplTest extends AutomatedTestBase
+{
+ private final static String TEST_NAME = "FederatedRowwiseTmplTest";
+
+ private final static String TEST_DIR = "functions/federated/codegen/";
+ private final static String TEST_CLASS_DIR = TEST_DIR +
FederatedRowwiseTmplTest.class.getSimpleName() + "/";
+
+ private final static String TEST_CONF = "SystemDS-config-codegen.xml";
+
+ private final static String OUTPUT_NAME = "Z";
+ private final static double TOLERANCE = 1e-13;
+ private final static int BLOCKSIZE = 1024;
+
+ @Parameterized.Parameter()
+ public int test_num;
+ @Parameterized.Parameter(1)
+ public int rows;
+ @Parameterized.Parameter(2)
+ public int cols;
+
+ @Override
+ public void setUp() {
+ addTestConfiguration(TEST_NAME, new
TestConfiguration(TEST_CLASS_DIR, TEST_NAME, new String[]{OUTPUT_NAME}));
+ }
+
+ @Parameterized.Parameters
+ public static Collection<Object[]> data() {
+ // rows must be even
+ return Arrays.asList(new Object[][] {
+ // {test_num, rows, cols}
+
+ {1, 6, 4},
+ {2, 6, 2},
+ {3, 6, 4},
+ {4, 6, 4},
+ {10, 150, 10},
+ {15, 150, 10},
+ {20, 1500, 8},
+ {21, 1500, 8},
+ {25, 600, 10},
+ {31, 150, 10},
+ {40, 300, 20},
+ {45, 1500, 100},
+ {50, 376, 4},
+ });
+ }
+
+ @BeforeClass
+ public static void init() {
+ TestUtils.clearDirectory(TEST_DATA_DIR + TEST_CLASS_DIR);
+ }
+
+ // @Test
+ // public void federatedCodegenRowwiseSingleNode() {
+ // testFederatedCodegenRowwise(ExecMode.SINGLE_NODE);
+ // }
+ //
+ // @Test
+ // public void federatedCodegenRowwiseSpark() {
+ // testFederatedCodegenRowwise(ExecMode.SPARK);
+ // }
Review comment:
Have you verified if these work? or just copied them?
if the latter, please try to execute them, and then enable them if it works,
if they don't work add an @Ignore clause to them such that they show up as
tests that currently are skipped. Or try to fix it so that they work.
--
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:
[email protected]
