[systemds] branch master updated: [SYSTEMDS-2858] Federated parameterserver shceme isolated argument

[baunsgaard]

This is an automated email from the ASF dual-hosted git repository.

baunsgaard 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 2d48bb5  [SYSTEMDS-2858] Federated parameterserver shceme isolated 
argument
2d48bb5 is described below

commit 2d48bb5ffab38fba82d90c99dec81378f862eeff
Author: baunsgaard <baunsga...@tugraz.at>
AuthorDate: Thu Feb 11 17:01:38 2021 +0100

    [SYSTEMDS-2858] Federated parameterserver shceme isolated argument
---
 src/main/java/org/apache/sysds/parser/Statement.java               | 1 +
 .../runtime/instructions/cp/ParamservBuiltinCPInstruction.java     | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/sysds/parser/Statement.java 
b/src/main/java/org/apache/sysds/parser/Statement.java
index 38d16cd..eb32865 100644
--- a/src/main/java/org/apache/sysds/parser/Statement.java
+++ b/src/main/java/org/apache/sysds/parser/Statement.java
@@ -101,6 +101,7 @@ public abstract class Statement implements ParseInfo
        public enum PSScheme {
                DISJOINT_CONTIGUOUS, DISJOINT_ROUND_ROBIN, DISJOINT_RANDOM, 
OVERLAP_RESHUFFLE
        }
+       public static final String PS_FED_SCHEME = "fed_scheme";
        public enum FederatedPSScheme {
                KEEP_DATA_ON_WORKER, SHUFFLE, REPLICATE_TO_MAX, 
SUBSAMPLE_TO_MIN, BALANCE_TO_AVG
        }
diff --git 
a/src/main/java/org/apache/sysds/runtime/instructions/cp/ParamservBuiltinCPInstruction.java
 
b/src/main/java/org/apache/sysds/runtime/instructions/cp/ParamservBuiltinCPInstruction.java
index 785915d..0fa5297 100644
--- 
a/src/main/java/org/apache/sysds/runtime/instructions/cp/ParamservBuiltinCPInstruction.java
+++ 
b/src/main/java/org/apache/sysds/runtime/instructions/cp/ParamservBuiltinCPInstruction.java
@@ -41,6 +41,7 @@ import static org.apache.sysds.parser.Statement.PS_MODE;
 import static org.apache.sysds.parser.Statement.PS_MODEL;
 import static org.apache.sysds.parser.Statement.PS_PARALLELISM;
 import static org.apache.sysds.parser.Statement.PS_SCHEME;
+import static org.apache.sysds.parser.Statement.PS_FED_SCHEME;
 import static org.apache.sysds.parser.Statement.PS_UPDATE_FUN;
 import static org.apache.sysds.parser.Statement.PS_UPDATE_TYPE;
 import static org.apache.sysds.parser.Statement.PS_FED_RUNTIME_BALANCING;
@@ -526,11 +527,11 @@ public class ParamservBuiltinCPInstruction extends 
ParameterizedBuiltinCPInstruc
 
        private FederatedPSScheme getFederatedScheme() {
                FederatedPSScheme federated_scheme = DEFAULT_FEDERATED_SCHEME;
-               if (getParameterMap().containsKey(PS_SCHEME)) {
+               if (getParameterMap().containsKey(PS_FED_SCHEME)) {
                        try {
-                               federated_scheme = 
FederatedPSScheme.valueOf(getParam(PS_SCHEME));
+                               federated_scheme = 
FederatedPSScheme.valueOf(getParam(PS_FED_SCHEME));
                        } catch (IllegalArgumentException e) {
-                               throw new 
DMLRuntimeException(String.format("Paramserv function in federated mode: not 
support data partition scheme '%s'", getParam(PS_SCHEME)));
+                               throw new 
DMLRuntimeException(String.format("Paramserv function in federated mode: not 
support data partition scheme '%s'", getParam(PS_FED_SCHEME)));
                        }
                }
                return federated_scheme;