Merge branch 'feat/java-matrix-sqrt-implementation' into feat/sqrt-matrix-combined

Author: trp-ex

src/main/java/org/apache/sysds/common/Builtins.java

@@ -326,6 +326,7 @@ public enum Builtins {
 	STFT("stft", false, ReturnType.MULTI_RETURN),
 	SQRT("sqrt", false),
 	SQRT_MATRIX("matrixSqrt", true),
+	SQRT_MATRIX_JAVA("sqrt_matrix_java", false, ReturnType.SINGLE_RETURN),
 	SUM("sum", false),
 	SVD("svd", false, ReturnType.MULTI_RETURN),
 	TABLE("table", "ctable", false),

src/main/java/org/apache/sysds/common/Types.java

@@ -542,7 +542,7 @@ public enum OpOp1 {
 		CUMSUMPROD, DETECTSCHEMA, COLNAMES, EIGEN, EXISTS, EXP, FLOOR, INVERSE,
 		IQM, ISNA, ISNAN, ISINF, LENGTH, LINEAGE, LOG, NCOL, NOT, NROW,
 		MEDIAN, PREFETCH, PRINT, ROUND, SIN, SINH, SIGN, SOFTMAX, SQRT, STOP, _EVICT,
-		SVD, TAN, TANH, TYPEOF, TRIGREMOTE,
+		SVD, TAN, TANH, TYPEOF, TRIGREMOTE, SQRT_MATRIX_JAVA,
 		//fused ML-specific operators for performance 
 		SPROP, //sample proportion: P * (1 - P)
 		SIGMOID, //sigmoid function: 1 / (1 + exp(-X))

src/main/java/org/apache/sysds/hops/UnaryOp.java

@@ -512,7 +512,7 @@ && getInput().get(0).getParent().size()==1 ) //unary is only parent
 
 		//ensure cp exec type for single-node operations
 		if( _op == OpOp1.PRINT || _op == OpOp1.ASSERT || _op == OpOp1.STOP || _op == OpOp1.TYPEOF
-			|| _op == OpOp1.INVERSE || _op == OpOp1.EIGEN || _op == OpOp1.CHOLESKY || _op == OpOp1.SVD
+			|| _op == OpOp1.INVERSE || _op == OpOp1.EIGEN || _op == OpOp1.CHOLESKY || _op == OpOp1.SVD || _op == OpOp1.SQRT_MATRIX_JAVA
 			|| getInput().get(0).getDataType() == DataType.LIST || isMetadataOperation() )
 		{
 			_etype = ExecType.CP;

src/main/java/org/apache/sysds/parser/BuiltinFunctionExpression.java

@@ -1759,6 +1759,19 @@ && isConstant(in[2])
 			output.setDimensions(in.getDim1(), in.getDim2());
 			output.setBlocksize(in.getBlocksize());
 			break;
+
+		case SQRT_MATRIX_JAVA:
+
+			checkNumParameters(1);
+			checkMatrixParam(getFirstExpr());
+			output.setDataType(DataType.MATRIX);
+			output.setValueType(ValueType.FP64);
+			Identifier sqrt = getFirstExpr().getOutput();
+			if(sqrt.dimsKnown() && sqrt.getDim1() != sqrt.getDim2())
+				raiseValidateError("Input to sqrtMatrix() must be square matrix -- given: a " + sqrt.getDim1() + "x" + sqrt.getDim2() + " matrix.", conditional);
+			output.setDimensions( sqrt.getDim1(),  sqrt.getDim2());
+			output.setBlocksize( sqrt.getBlocksize());
+			break;
 
 		case CHOLESKY:
 		{

src/main/java/org/apache/sysds/parser/DMLTranslator.java

@@ -2749,6 +2749,7 @@ else if ( in.length == 2 )
 			break;
 
 		case INVERSE:
+		case SQRT_MATRIX_JAVA:
 		case CHOLESKY:
 		case TYPEOF:
 		case DETECTSCHEMA:

src/main/java/org/apache/sysds/runtime/instructions/CPInstructionParser.java

@@ -208,6 +208,7 @@ public class CPInstructionParser extends InstructionParser {
 		String2CPInstructionType.put( "ucummax", CPType.Unary);
 		String2CPInstructionType.put( "stop"  , CPType.Unary);
 		String2CPInstructionType.put( "inverse", CPType.Unary);
+		String2CPInstructionType.put( "sqrt_matrix_java", CPType.Unary);
 		String2CPInstructionType.put( "cholesky",CPType.Unary);
 		String2CPInstructionType.put( "sprop", CPType.Unary);
 		String2CPInstructionType.put( "sigmoid", CPType.Unary);

src/main/java/org/apache/sysds/runtime/matrix/data/LibCommonsMath.java

@@ -80,7 +80,7 @@ private LibCommonsMath() {
 	}
 
 	public static boolean isSupportedUnaryOperation( String opcode ) {
-		return ( opcode.equals("inverse") || opcode.equals("cholesky") );
+		return ( opcode.equals("inverse") || opcode.equals("cholesky") || opcode.equals("sqrt_matrix_java") );
 	}
 
 	public static boolean isSupportedMultiReturnOperation( String opcode ) {
@@ -111,6 +111,8 @@ public static MatrixBlock unaryOperations(MatrixBlock inj, String opcode) {
 			return computeMatrixInverse(matrixInput);
 		else if (opcode.equals("cholesky"))
 			return computeCholesky(matrixInput);
+		else if (opcode.equals("sqrt_matrix_java"))
+			return computeSqrt(inj);
 		return null;
 	}
 
@@ -512,7 +514,19 @@ private static MatrixBlock[] computeSvd(MatrixBlock in) {
 
 		return new MatrixBlock[] { U, Sigma, V };
 	}
-	
+
+	/**
+	 * Computes the square root of a matrix Calls Apache Commons Math EigenDecomposition.
+	 *
+	 * @param in Input matrix
+	 * @return matrix block
+	 */
+	private static MatrixBlock computeSqrt(MatrixBlock in) {
+		Array2DRowRealMatrix matrixInput = DataConverter.convertToArray2DRowRealMatrix(in);
+		EigenDecomposition ed = new EigenDecomposition(matrixInput);
+		return DataConverter.convertToMatrixBlock(ed.getSquareRoot());
+	}
+
 	/**
 	 * Function to compute matrix inverse via matrix decomposition.
 	 *