Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/main/java/org/apache/sysds/hops/Hop.java
Original file line number Diff line number Diff line change
Expand Up @@ -407,16 +407,26 @@ public void constructAndSetLopsDataFlowProperties() {

private void constructAndSetReblockLopIfRequired()
{
//determine execution type
ExecType et = DMLScript.USE_OOC ? ExecType.OOC : ExecType.CP;
// ExecType et = DMLScript.USE_OOC ? ExecType.OOC : ExecType.CP;

// determine execution type while preserving global / forced exec type
ExecType et = (getForcedExecType() != null) ? getForcedExecType() : getExecType();

if( et == null ) {
if( DMLScript.USE_OOC )
et = ExecType.OOC;
else
et = ExecType.CP;
}

if( DMLScript.getGlobalExecMode() != ExecMode.SINGLE_NODE
&& !(getDataType()==DataType.SCALAR) )
{
et = ExecType.SPARK;
}

//add reblock lop to output if required
if( _requiresReblock && et != ExecType.CP )
if( _requiresReblock && (et == ExecType.OOC || et == ExecType.SPARK))
{
Lop input = getLops();

Expand Down