File tree Expand file tree Collapse file tree 1 file changed +13
-3
lines changed
src/main/java/org/apache/sysds/hops Expand file tree Collapse file tree 1 file changed +13
-3
lines changed Original file line number Diff line number Diff line change @@ -407,16 +407,26 @@ public void constructAndSetLopsDataFlowProperties() {
407407
408408 private void constructAndSetReblockLopIfRequired ()
409409 {
410- //determine execution type
411- ExecType et = DMLScript .USE_OOC ? ExecType .OOC : ExecType .CP ;
410+ // ExecType et = DMLScript.USE_OOC ? ExecType.OOC : ExecType.CP;
411+
412+ // determine execution type while preserving global / forced exec type
413+ ExecType et = (getForcedExecType () != null ) ? getForcedExecType () : getExecType ();
414+
415+ if ( et == null ) {
416+ if ( DMLScript .USE_OOC )
417+ et = ExecType .OOC ;
418+ else
419+ et = ExecType .CP ;
420+ }
421+
412422 if ( DMLScript .getGlobalExecMode () != ExecMode .SINGLE_NODE
413423 && !(getDataType ()==DataType .SCALAR ) )
414424 {
415425 et = ExecType .SPARK ;
416426 }
417427
418428 //add reblock lop to output if required
419- if ( _requiresReblock && et != ExecType .CP )
429+ if ( _requiresReblock && ( et == ExecType .OOC || et == ExecType . SPARK ) )
420430 {
421431 Lop input = getLops ();
422432
You can’t perform that action at this time.
0 commit comments