[systemds] branch master updated: [SYSTEMDS-2953] Fix execution context creation in constant folding

[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 2a78db4  [SYSTEMDS-2953] Fix execution context creation in constant 
folding
2a78db4 is described below

commit 2a78db42e9d65e4ab1e256e87913f343d243f523
Author: Matthias Boehm <mboe...@gmail.com>
AuthorDate: Sun May 23 19:42:53 2021 +0200

    [SYSTEMDS-2953] Fix execution context creation in constant folding
    
    This patches fixes a recently introduce bug that assumed that every
    execution context is created with an available program, but this is
    clearly not the case in constant folding and other primitives.
---
 .../sysds/runtime/controlprogram/context/ExecutionContextFactory.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/sysds/runtime/controlprogram/context/ExecutionContextFactory.java
 
b/src/main/java/org/apache/sysds/runtime/controlprogram/context/ExecutionContextFactory.java
index 6f408b2..bc96c97 100644
--- 
a/src/main/java/org/apache/sysds/runtime/controlprogram/context/ExecutionContextFactory.java
+++ 
b/src/main/java/org/apache/sysds/runtime/controlprogram/context/ExecutionContextFactory.java
@@ -55,7 +55,7 @@ public class ExecutionContextFactory
                                //NOTE: even in case of forced singlenode 
operations, users might still 
                                //want to run remote parfor which requires the 
correct execution context
                                if( 
OptimizerUtils.getDefaultExecutionMode()==ExecMode.HYBRID
-                                       && !(prog.getDMLProg()!=null && 
prog.getDMLProg().containsRemoteParfor()))
+                                       && !(prog!=null && 
prog.getDMLProg()!=null && prog.getDMLProg().containsRemoteParfor()))
                                        ec = new ExecutionContext(allocateVars, 
allocateLineage, prog);
                                else
                                        ec = new 
SparkExecutionContext(allocateVars, allocateLineage, prog);