[systemds] branch main updated: [MINOR] FedPlanner Cleaning

[sebwrede]

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

sebwrede pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/systemds.git


The following commit(s) were added to refs/heads/main by this push:
     new 04fd7503e3 [MINOR] FedPlanner Cleaning
04fd7503e3 is described below

commit 04fd7503e38928870b0e95561621040df198ce57
Author: sebwrede <swr...@know-center.at>
AuthorDate: Thu Jul 7 11:05:11 2022 +0200

    [MINOR] FedPlanner Cleaning
    
    Closes #1658.
---
 .../hops/fedplanner/FederatedPlannerCostbased.java  | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git 
a/src/main/java/org/apache/sysds/hops/fedplanner/FederatedPlannerCostbased.java 
b/src/main/java/org/apache/sysds/hops/fedplanner/FederatedPlannerCostbased.java
index 368882793a..4a2cab2854 100644
--- 
a/src/main/java/org/apache/sysds/hops/fedplanner/FederatedPlannerCostbased.java
+++ 
b/src/main/java/org/apache/sysds/hops/fedplanner/FederatedPlannerCostbased.java
@@ -231,22 +231,6 @@ public class FederatedPlannerCostbased extends 
AFederatedPlanner {
                }
        }
 
-       /**
-        * Return parameter map containing the mapping from parameter name to 
input hop
-        * for all parameters of the function hop.
-        * @param funcOp hop for which the mapping of parameter names to input 
hops are made
-        * @return parameter map or empty map if function has no parameters
-        */
-       private Map<String,Hop> getParamMap(FunctionOp funcOp){
-               String[] inputNames = funcOp.getInputVariableNames();
-               Map<String,Hop> paramMap = new HashMap<>();
-               if ( inputNames != null ){
-                       for ( int i = 0; i < funcOp.getInput().size(); i++ )
-                               paramMap.put(inputNames[i],funcOp.getInput(i));
-               }
-               return paramMap;
-       }
-
        /**
         * Set final fedouts of all hops starting from terminal hops.
         */
@@ -384,7 +368,7 @@ public class FederatedPlannerCostbased extends 
AFederatedPlanner {
 
        private ArrayList<Hop> getHopInputs(Hop currentHop, Map<String, Hop> 
paramMap){
                if ( HopRewriteUtils.isData(currentHop, 
Types.OpOpData.TRANSIENTREAD) )
-                       return 
FederatedPlannerUtils.getTransientInputs(currentHop, paramMap, transientWrites);
+                       return getTransientInputs(currentHop, paramMap);
                else
                        return currentHop.getInput();
        }
@@ -451,9 +435,6 @@ public class FederatedPlannerCostbased extends 
AFederatedPlanner {
         * @return inputs of currentHop
         */
        private ArrayList<Hop> getTransientInputs(Hop currentHop, Map<String, 
Hop> paramMap){
-               // FIXME: does not work for function calls (except when the 
return names match the variables their results are assigned to)
-               //  `model = l2svm(...)` works (because `m_l2svm = 
function(...) return(Matrix[Double] model)`),
-               //  `m = l2svm(...)` does not
                Hop tWriteHop = null;
                if ( paramMap != null)
                        tWriteHop = paramMap.get(currentHop.getName());