Repository: systemml Updated Branches: refs/heads/master 9067654e7 -> 2a6fa063e
[HOTFIX] Fix solve handling in consolidated binary instructions Project: http://git-wip-us.apache.org/repos/asf/systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/2a6fa063 Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/2a6fa063 Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/2a6fa063 Branch: refs/heads/master Commit: 2a6fa063edafc38e323a3b18903bb029791fd445 Parents: 9067654 Author: Matthias Boehm <[email protected]> Authored: Thu Jan 4 23:12:19 2018 -0800 Committer: Matthias Boehm <[email protected]> Committed: Thu Jan 4 23:12:19 2018 -0800 ---------------------------------------------------------------------- .../org/apache/sysml/runtime/instructions/InstructionUtils.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/systemml/blob/2a6fa063/src/main/java/org/apache/sysml/runtime/instructions/InstructionUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/InstructionUtils.java b/src/main/java/org/apache/sysml/runtime/instructions/InstructionUtils.java index 0749d16..5e829ee 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/InstructionUtils.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/InstructionUtils.java @@ -79,6 +79,7 @@ import org.apache.sysml.runtime.instructions.cp.CPOperand; import org.apache.sysml.runtime.instructions.gpu.GPUInstruction.GPUINSTRUCTION_TYPE; import org.apache.sysml.runtime.instructions.mr.MRInstruction.MRType; import org.apache.sysml.runtime.instructions.spark.SPInstruction.SPType; +import org.apache.sysml.runtime.matrix.data.LibCommonsMath; import org.apache.sysml.runtime.matrix.operators.AggregateOperator; import org.apache.sysml.runtime.matrix.operators.AggregateTernaryOperator; import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator; @@ -493,6 +494,8 @@ public class InstructionUtils public static Operator parseBinaryOrBuiltinOperator(String opcode, CPOperand in1, CPOperand in2) throws DMLRuntimeException { + if( LibCommonsMath.isSupportedMatrixMatrixOperation(opcode) ) + return null; boolean matrixScalar = (in1.getDataType() != in2.getDataType()); return Builtin.isBuiltinFnObject(opcode) ? (matrixScalar ? new RightScalarOperator( Builtin.getBuiltinFnObject(opcode), 0) :
