This is an automated email from the ASF dual-hosted git repository. markd pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/systemds.git
commit 98af625fb8cc8e9bed57bd82a7bc536e4d13d74a Author: Mark Dokter <[email protected]> AuthorDate: Fri Feb 5 02:09:02 2021 +0100 [MINOR] Disable generation of GPU instruction for sum_sq reduction (needs a bugfix) --- src/main/java/org/apache/sysds/hops/AggUnaryOp.java | 2 +- src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeCell.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/sysds/hops/AggUnaryOp.java b/src/main/java/org/apache/sysds/hops/AggUnaryOp.java index f42434b..4e87baa 100644 --- a/src/main/java/org/apache/sysds/hops/AggUnaryOp.java +++ b/src/main/java/org/apache/sysds/hops/AggUnaryOp.java @@ -97,7 +97,7 @@ public class AggUnaryOp extends MultiThreadedHop return false; } else if ((_op == AggOp.SUM && (_direction == Direction.RowCol || _direction == Direction.Row || _direction == Direction.Col)) - || (_op == AggOp.SUM_SQ && (_direction == Direction.RowCol || _direction == Direction.Row || _direction == Direction.Col)) +// || (_op == AggOp.SUM_SQ && (_direction == Direction.RowCol || _direction == Direction.Row || _direction == Direction.Col)) || (_op == AggOp.MAX && (_direction == Direction.RowCol || _direction == Direction.Row || _direction == Direction.Col)) || (_op == AggOp.MIN && (_direction == Direction.RowCol || _direction == Direction.Row || _direction == Direction.Col)) || (_op == AggOp.MEAN && (_direction == Direction.RowCol || _direction == Direction.Row || _direction == Direction.Col)) diff --git a/src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeCell.java b/src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeCell.java index 3ea3d3b..99fcbdc 100644 --- a/src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeCell.java +++ b/src/main/java/org/apache/sysds/hops/codegen/cplan/CNodeCell.java @@ -238,6 +238,7 @@ public class CNodeCell extends CNodeTpl } @Override public boolean isSupported(GeneratorAPI api) { - return (api == GeneratorAPI.CUDA || api == GeneratorAPI.JAVA) && _output.isSupported(api); + return (api == GeneratorAPI.CUDA || api == GeneratorAPI.JAVA) && _output.isSupported(api) && + !(getSpoofAggOp() == SpoofCellwise.AggOp.SUM_SQ); } }
