You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by ba...@apache.org on 2020/06/16 08:35:58 UTC
[systemml] branch master updated: [MINOR] Add fed prefix for stats
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/systemml.git
The following commit(s) were added to refs/heads/master by this push:
new a4853cf [MINOR] Add fed prefix for stats
a4853cf is described below
commit a4853cf98b62cadce0b53600ad720821dd134527
Author: Sebastian <ba...@tugraz.at>
AuthorDate: Tue Jun 16 10:35:29 2020 +0200
[MINOR] Add fed prefix for stats
Adds Federated prefix to instructions, so the statistics returned
show federated instruction executions just like Spark or GPU
instructions.
Minor fix in Startup of worker allowing log4j to work again.
Closes #970
---
bin/systemds | 2 +-
src/main/java/org/apache/sysds/runtime/instructions/Instruction.java | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/bin/systemds b/bin/systemds
index 9590f14..b4bbedd 100755
--- a/bin/systemds
+++ b/bin/systemds
@@ -289,7 +289,7 @@ if [ $WORKER == 1 ]; then
CMD=" \
java $SYSTEMDS_STANDALONE_OPTS \
-cp $CLASSPATH \
- -Dlog4j.configuration=file:$LOG4JPROP \
+ $LOG4JPROP \
org.apache.sysds.api.DMLScript \
-w $PORT"
diff --git a/src/main/java/org/apache/sysds/runtime/instructions/Instruction.java b/src/main/java/org/apache/sysds/runtime/instructions/Instruction.java
index db867ef..e72324e 100644
--- a/src/main/java/org/apache/sysds/runtime/instructions/Instruction.java
+++ b/src/main/java/org/apache/sysds/runtime/instructions/Instruction.java
@@ -57,6 +57,7 @@ public abstract class Instruction
public static final String INSTRUCTION_DELIM = Lop.INSTRUCTION_DELIMITOR;
public static final String SP_INST_PREFIX = "sp_";
public static final String GPU_INST_PREFIX = "gpu_";
+ public static final String FEDERATED_INST_PREFIX = "fed_";
//basic instruction meta data
protected String instString = null;
@@ -197,6 +198,8 @@ public abstract class Instruction
extendedOpcode = SP_INST_PREFIX + getOpcode();
else if( getType() == IType.GPU )
extendedOpcode = GPU_INST_PREFIX + getOpcode();
+ else if( getType() == IType.FEDERATED)
+ extendedOpcode = FEDERATED_INST_PREFIX + getOpcode();
else
extendedOpcode = getOpcode();
}