You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemds.apache.org by mb...@apache.org on 2020/11/01 10:48:13 UTC
[systemds] branch master updated: [SYSTEMDS-2681] Fix federated
bivariate statistics tests (threaded)
This is an automated email from the ASF dual-hosted git repository.
mboehm7 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git
The following commit(s) were added to refs/heads/master by this push:
new c18bf0e [SYSTEMDS-2681] Fix federated bivariate statistics tests (threaded)
c18bf0e is described below
commit c18bf0e3e299e7fe3f2b928e2ec026339565b794
Author: Matthias Boehm <mb...@gmail.com>
AuthorDate: Sun Nov 1 11:47:53 2020 +0100
[SYSTEMDS-2681] Fix federated bivariate statistics tests (threaded)
---
.../java/org/apache/sysds/test/AutomatedTestBase.java | 1 +
.../federated/algorithms/FederatedBivarTest.java | 8 ++++----
.../federated/primitives/FederatedStatisticsTest.java | 19 ++-----------------
3 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/src/test/java/org/apache/sysds/test/AutomatedTestBase.java b/src/test/java/org/apache/sysds/test/AutomatedTestBase.java
index c269742..d802997 100644
--- a/src/test/java/org/apache/sysds/test/AutomatedTestBase.java
+++ b/src/test/java/org/apache/sysds/test/AutomatedTestBase.java
@@ -1412,6 +1412,7 @@ public abstract class AutomatedTestBase {
* @param port Port to use for the JVM
* @return the process associated with the worker.
*/
+ @Deprecated
protected Process startLocalFedWorker(int port) {
Process process = null;
String separator = System.getProperty("file.separator");
diff --git a/src/test/java/org/apache/sysds/test/functions/federated/algorithms/FederatedBivarTest.java b/src/test/java/org/apache/sysds/test/functions/federated/algorithms/FederatedBivarTest.java
index ed9150a..e8a4233 100644
--- a/src/test/java/org/apache/sysds/test/functions/federated/algorithms/FederatedBivarTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/federated/algorithms/FederatedBivarTest.java
@@ -108,10 +108,10 @@ public class FederatedBivarTest extends AutomatedTestBase {
int port2 = getRandomAvailablePort();
int port3 = getRandomAvailablePort();
int port4 = getRandomAvailablePort();
- Process t1 = startLocalFedWorker(port1);
- Process t2 = startLocalFedWorker(port2);
- Process t3 = startLocalFedWorker(port3);
- Process t4 = startLocalFedWorker(port4);
+ Thread t1 = startLocalFedWorkerThread(port1);
+ Thread t2 = startLocalFedWorkerThread(port2);
+ Thread t3 = startLocalFedWorkerThread(port3);
+ Thread t4 = startLocalFedWorkerThread(port4);
TestConfiguration config = availableTestConfigurations.get(TEST_NAME);
loadTestConfiguration(config);
diff --git a/src/test/java/org/apache/sysds/test/functions/federated/primitives/FederatedStatisticsTest.java b/src/test/java/org/apache/sysds/test/functions/federated/primitives/FederatedStatisticsTest.java
index 8350147..0eccc8d 100644
--- a/src/test/java/org/apache/sysds/test/functions/federated/primitives/FederatedStatisticsTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/federated/primitives/FederatedStatisticsTest.java
@@ -19,8 +19,6 @@
package org.apache.sysds.test.functions.federated.primitives;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.util.Arrays;
import java.util.Collection;
@@ -97,20 +95,8 @@ public class FederatedStatisticsTest extends AutomatedTestBase {
fullDMLScriptName = "";
int port1 = getRandomAvailablePort();
int port2 = getRandomAvailablePort();
- Process t1 = startLocalFedWorker(port1);
- Process t2 = startLocalFedWorker(port2);
-
- BufferedReader output = new BufferedReader(new InputStreamReader(t1.getInputStream()));
- BufferedReader error = new BufferedReader(new InputStreamReader(t1.getInputStream()));
-
- Thread t = new Thread(() -> {
- output.lines().forEach(s -> System.out.println(s));
- });
- Thread te = new Thread(() -> {
- error.lines().forEach(s -> System.err.println(s));
- });
- t.start();
- te.start();
+ Thread t1 = startLocalFedWorkerThread(port1);
+ Thread t2 = startLocalFedWorkerThread(port2);
TestConfiguration config = availableTestConfigurations.get(TEST_NAME);
loadTestConfiguration(config);
@@ -133,7 +119,6 @@ public class FederatedStatisticsTest extends AutomatedTestBase {
compareResults(1e-9);
TestUtils.shutdownThreads(t1, t2);
- TestUtils.shutdownThreads(t, te);
// check for federated operations
Assert.assertTrue("contains federated matrix mult", heavyHittersContainsString("fed_ba+*"));