[systemds] branch master updated: [MINOR] Fix federated parameserv tests (missing agg instruction)

[mboehm7]

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 d0785db  [MINOR] Fix federated parameserv tests (missing agg 
instruction)
d0785db is described below

commit d0785db27e9d00d79bf374fa384ed04f458b12cc
Author: Matthias Boehm <mboe...@gmail.com>
AuthorDate: Mon Aug 23 21:13:16 2021 +0200

    [MINOR] Fix federated parameserv tests (missing agg instruction)
---
 .../runtime/controlprogram/paramserv/FederatedPSControlThread.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/FederatedPSControlThread.java
 
b/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/FederatedPSControlThread.java
index de99e20..07ac212 100644
--- 
a/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/FederatedPSControlThread.java
+++ 
b/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/FederatedPSControlThread.java
@@ -522,7 +522,9 @@ public class FederatedPSControlThread extends PSWorker 
implements Callable<Void>
                                        
ParamservUtils.accrueGradients(accGradients, gradients, false);
                                
                                // update the local model with gradients if 
needed
-                               if((_localUpdate && batchCounter < 
_numBatchesToCompute - 1) | modelAvg) {
+                               // FIXME ensure that with modelAvg we always 
update the model
+                               // (current fails due to missing aggregation 
instruction)
+                               if(_localUpdate && batchCounter < 
_numBatchesToCompute - 1) {
                                        // Invoke the aggregate function
                                        assert aggregationInstruction != null;
                                        
aggregationInstruction.processInstruction(ec);