Repository: incubator-systemml Updated Branches: refs/heads/master 21ac752d8 -> 6963f5e10
Hotfix to make sure only uak+/ua+ is compiled for GPU. Closes #325. Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/6963f5e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/6963f5e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/6963f5e1 Branch: refs/heads/master Commit: 6963f5e10a7c3e462b24013f1a35cc656718f2dd Parents: 21ac752 Author: Nakul Jindal <[email protected]> Authored: Tue Jan 3 16:44:28 2017 -0800 Committer: Niketan Pansare <[email protected]> Committed: Tue Jan 3 16:44:28 2017 -0800 ---------------------------------------------------------------------- src/main/java/org/apache/sysml/hops/AggUnaryOp.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/6963f5e1/src/main/java/org/apache/sysml/hops/AggUnaryOp.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/hops/AggUnaryOp.java b/src/main/java/org/apache/sysml/hops/AggUnaryOp.java index 5d795f1..4d991f4 100644 --- a/src/main/java/org/apache/sysml/hops/AggUnaryOp.java +++ b/src/main/java/org/apache/sysml/hops/AggUnaryOp.java @@ -145,8 +145,11 @@ public class AggUnaryOp extends Hop implements MultiThreadedHop else { //general case int k = OptimizerUtils.getConstrainedNumThreads(_maxNumThreads); if(DMLScript.USE_ACCELERATOR && (DMLScript.FORCE_ACCELERATOR || getMemEstimate() < OptimizerUtils.GPU_MEMORY_BUDGET) && (_op == AggOp.SUM)) { - et = ExecType.GPU; - k = 1; + // Only implemented methods for GPU + if (_op == AggOp.SUM && _direction == Direction.RowCol) { + et = ExecType.GPU; + k = 1; + } } agg1 = new PartialAggregate(input.constructLops(), HopsAgg2Lops.get(_op), HopsDirection2Lops.get(_direction), getDataType(),getValueType(), et, k);
