diff --git a/src/main/java/org/apache/sysds/hops/estim/EstimatorRowWise.java b/src/main/java/org/apache/sysds/hops/estim/EstimatorRowWise.java new file mode 100644 index 00000000000..eaffc520fc6 --- /dev/null +++ b/src/main/java/org/apache/sysds/hops/estim/EstimatorRowWise.java @@ -0,0 +1,350 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.sysds.hops.estim; + +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.NotImplementedException; +import org.apache.sysds.hops.OptimizerUtils; +import org.apache.sysds.runtime.data.SparseRow; +import org.apache.sysds.runtime.matrix.data.MatrixBlock; +import org.apache.sysds.runtime.meta.DataCharacteristics; +import org.apache.sysds.runtime.meta.MatrixCharacteristics; + +import java.util.function.DoubleBinaryOperator; +import java.util.function.DoubleUnaryOperator; +import java.util.stream.DoubleStream; +import java.util.stream.IntStream; + +/** + * This estimator implements an approach based on row-wise sparsity estimation, + * introduced in + * Lin, Chunxu, Wensheng Luo, Yixiang Fang, Chenhao Ma, Xilin Liu and Yuchi Ma: + * On Efficient Large Sparse Matrix Chain Multiplication. + * Proceedings of the ACM on Management of Data 2 (2024): 1 - 27. + */ +public class EstimatorRowWise extends SparsityEstimator { + @Override + public DataCharacteristics estim(MMNode root) { + estimInternChain(root); + double sparsity = ((RSVector)root.getSynopsis()).avg(); + + DataCharacteristics outputCharacteristics = deriveOutputCharacteristics(root, sparsity); + return root.setDataCharacteristics(outputCharacteristics); + } + + @Override + public double estim(MatrixBlock m1, MatrixBlock m2) { + return estim(m1, m2, OpCode.MM); + } + + @Override + public double estim(MatrixBlock m1, MatrixBlock m2, OpCode op) { + if( isExactMetadataOp(op) ) { + return estimExactMetaData(m1.getDataCharacteristics(), + m2.getDataCharacteristics(), op).getSparsity(); + } + + RSVector rsOut = estimIntern(m1, m2, op); + return rsOut.avg(); + } + + @Override + public double estim(MatrixBlock m1, OpCode op) { + if( isExactMetadataOp(op) ) + return estimExactMetaData(m1.getDataCharacteristics(), null, op).getSparsity(); + throw new NotImplementedException(); + } + + private void estimInternChain(MMNode node) { + estimInternChain(node, null, null); + } + + private void estimInternChain(MMNode node, RSVector rsRightNeighbor, OpCode opRightNeighbor) { + RSVector rsOut; + if(node.isLeaf()) { + MatrixBlock mb = node.getData(); + if(rsRightNeighbor != null) + rsOut = estimIntern(mb, rsRightNeighbor, opRightNeighbor); + else + rsOut = getRowWiseSparsityVector(mb); + } + else { + switch(node.getOp()) { + case MM: + estimInternChain(node.getRight(), rsRightNeighbor, opRightNeighbor); + estimInternChain(node.getLeft(), (RSVector)(node.getRight().getSynopsis()), node.getOp()); + rsOut = (RSVector)node.getLeft().getSynopsis(); + break; + case CBIND: + /** NOTE: considering the current node as new DAG for estimation (cut), since the row sparsity of + * the right neighbor cannot be aggregated into a cbind operation when having only row sparsity vectors + */ + estimInternChain(node.getLeft()); + estimInternChain(node.getRight()); + RSVector rsCBind = estimInternCBind((RSVector)(node.getLeft().getSynopsis()), (RSVector)(node.getRight().getSynopsis())); + if(rsRightNeighbor != null) { + rsOut = (RSVector)estimInternMMFallback(rsCBind, rsRightNeighbor); + if(opRightNeighbor != OpCode.MM) + throw new NotImplementedException("Fallback sparsity estimation has only been " + + "considered for MM operation w/ right neighbor, yet"); + } + else + rsOut = (RSVector)rsCBind; + break; + case RBIND: + /** NOTE: considering the current node as new DAG for estimation (cut), since the row sparsity of + * the right neighbor cannot be aggregated into an rbind operation when having only row sparsity vectors + */ + estimInternChain(node.getLeft()); + estimInternChain(node.getRight()); + RSVector rsRBind = estimInternRBind((RSVector)(node.getLeft().getSynopsis()), (RSVector)(node.getRight().getSynopsis())); + if(rsRightNeighbor != null) { + rsOut = (RSVector)estimInternMMFallback(rsRBind, rsRightNeighbor); + if(opRightNeighbor != OpCode.MM) + throw new NotImplementedException("Fallback sparsity estimation has only been " + + "considered for MM operation w/ right neighbor, yet"); + } + else + rsOut = (RSVector)rsRBind; + break; + case PLUS: + /** NOTE: considering the current node as new DAG for estimation (cut), since the row sparsity of + * the right neighbor cannot be aggregated into an element-wise operation when having only row sparsity vectors + */ + estimInternChain(node.getLeft()); + estimInternChain(node.getRight()); + RSVector rsPlus = estimInternPlus((RSVector)(node.getLeft().getSynopsis()), (RSVector)(node.getRight().getSynopsis())); + if(rsRightNeighbor != null) { + rsOut = (RSVector)estimInternMMFallback(rsPlus, rsRightNeighbor); + if(opRightNeighbor != OpCode.MM) + throw new NotImplementedException("Fallback sparsity estimation has only been " + + "considered for MM operation w/ right neighbor, yet"); + } + else + rsOut = (RSVector)rsPlus; + break; + case MULT: + /** NOTE: considering the current node as new DAG for estimation (cut), since the row sparsity of + * the right neighbor cannot be aggregated into an element-wise operation when having only row sparsity vectors + */ + estimInternChain(node.getLeft()); + estimInternChain(node.getRight()); + RSVector rsMult = estimInternMult((RSVector)(node.getLeft().getSynopsis()), (RSVector)(node.getRight().getSynopsis())); + if(rsRightNeighbor != null) { + rsOut = (RSVector)estimInternMMFallback(rsMult, rsRightNeighbor); + if(opRightNeighbor != OpCode.MM) + throw new NotImplementedException("Fallback sparsity estimation has only been " + + "considered for MM operation w/ right neighbor, yet"); + } + else + rsOut = (RSVector)rsMult; + break; + default: + throw new NotImplementedException("Chain estimation for operator " + node.getOp().toString() + + " is not supported yet."); + } + } + node.setSynopsis(rsOut); + node.setDataCharacteristics(deriveOutputCharacteristics(node, rsOut.avg())); + return; + } + + private RSVector estimIntern(MatrixBlock m1, MatrixBlock m2, OpCode op) { + RSVector rsM2 = getRowWiseSparsityVector(m2); + return estimIntern(m1, rsM2, op); + } + + private RSVector estimIntern(MatrixBlock m1, RSVector rsM2, OpCode op) { + switch(op) { + case MM: + return estimInternMM(m1, rsM2); + case CBIND: + return estimInternCBind(getRowWiseSparsityVector(m1), rsM2); + case RBIND: + return estimInternRBind(getRowWiseSparsityVector(m1), rsM2); + case PLUS: + return estimInternPlus(getRowWiseSparsityVector(m1), rsM2); + case MULT: + return estimInternMult(getRowWiseSparsityVector(m1), rsM2); + default: + throw new NotImplementedException("Sparsity estimation for operation " + op.toString() + " not supported yet."); + } + } + + // Corresponds to Algorithm 1 in the publication + private RSVector estimInternMM(MatrixBlock m1, RSVector rsM2) { + RSVector rsOut = new RSVector(IntStream.range(0, m1.getNumRows()).mapToDouble( + r -> (double) 1 - IntStream.of(getNonZeroColumnIndices(m1, r)).mapToDouble( + c -> (double) 1 - rsM2.get(c) + ).reduce((double) 1, (currentVal, val) -> currentVal * val)) + .toArray()); + return rsOut; + } + + // NOTE: this is the best estimation possible when we only have the two row sparsity vectors + private RSVector estimInternMMFallback(RSVector rsM1, RSVector rsM2) { + // NOTE: Considering the average would probably not be far off while saving computing time + // double avgRsM2 = DoubleStream.of(rsM2).average().orElse(0); + // RSVector rsOut = DoubleStream.of(rsM1).map( + // rsM1I -> (double) 1 - Math.pow((double) 1 - (rsM1I * avgRsM2), rsM2.length)).toArray(); + RSVector rsOut = rsM1.map( + rsM1I -> (double) 1 - rsM2.reduce((double) 1, + (currentVal, rsM2J) -> currentVal * ((double) 1 - (rsM1I * rsM2J)))); + return rsOut; + } + + private RSVector estimInternCBind(RSVector rsM1, RSVector rsM2) { + return new RSVector(IntStream.range(0, rsM1.size()).mapToDouble( + idx -> (rsM1.get(idx) + rsM2.get(idx)) / (double) 2).toArray()); + } + + private RSVector estimInternRBind(RSVector rsM1, RSVector rsM2) { + return rsM1.append(rsM2); + } + + private RSVector estimInternPlus(RSVector rsM1, RSVector rsM2) { + // row-wise average case estimates + // rsM1 + rsM2 - (rsM1 * rsM2) + return rsM1.add(rsM2).subtract(rsM1.multiply(rsM2)); + } + + private RSVector estimInternMult(RSVector rsM1, RSVector rsM2) { + // row-wise average case estimates + // rsM1 * rsM2 + return rsM1.multiply(rsM2); + } + + private RSVector getRowWiseSparsityVector(MatrixBlock mb) { + int numRows = mb.getNumRows(); + if(mb.isInSparseFormat()) { + double[] rsArray = new double[numRows]; + for(int counter = 0; counter < numRows; counter++) { + SparseRow sparseRow = mb.getSparseBlock().get(counter); + rsArray[counter] = (sparseRow == null) ? 0 : (double) sparseRow.size() / mb.getNumColumns(); + } + return new RSVector(rsArray); + } + else { + return new RSVector(IntStream.range(0, numRows).mapToDouble( + rIdx -> (double) mb.getDenseBlock().countNonZeros(rIdx) / mb.getNumColumns()).toArray()); + } + } + + private int[] getNonZeroColumnIndices(MatrixBlock mb, final int rIdx) { + int[] nonZeroCols; + if(mb.isInSparseFormat()) { + SparseRow sparseRow = mb.getSparseBlock().get(rIdx); + nonZeroCols = (sparseRow == null) ? new int[0] : sparseRow.indexes(); + } + else { + nonZeroCols = IntStream.range(0, mb.getNumColumns()) + .filter(cIdx -> mb.get(rIdx, cIdx) != 0).toArray(); + } + return nonZeroCols; + } + + public static DataCharacteristics deriveOutputCharacteristics(MMNode node, double spOut) { + if(node.isLeaf() || + (node.getDataCharacteristics() != null && node.getDataCharacteristics().getNonZeros() != -1)) { + return node.getDataCharacteristics(); + } + + MMNode nodeLeft = node.getLeft(); + MMNode nodeRight = node.getRight(); + switch(node.getOp()) { + case MM: + return new MatrixCharacteristics(nodeLeft.getRows(), nodeRight.getCols(), + OptimizerUtils.getNnz(nodeLeft.getRows(), nodeRight.getCols(), spOut)); + case MULT: + case PLUS: + case NEQZERO: + case EQZERO: + return new MatrixCharacteristics(nodeLeft.getRows(), nodeLeft.getCols(), + OptimizerUtils.getNnz(nodeLeft.getRows(), nodeLeft.getCols(), spOut)); + case RBIND: + return new MatrixCharacteristics(nodeLeft.getRows()+nodeLeft.getRows(), nodeLeft.getCols(), + OptimizerUtils.getNnz(nodeLeft.getRows()+nodeRight.getRows(), nodeLeft.getCols(), spOut)); + case CBIND: + return new MatrixCharacteristics(nodeLeft.getRows(), nodeLeft.getCols()+nodeRight.getCols(), + OptimizerUtils.getNnz(nodeLeft.getRows(), nodeLeft.getCols()+nodeRight.getCols(), spOut)); + case DIAG: + int ncol = nodeLeft.getCols()==1 ? nodeLeft.getRows() : 1; + return new MatrixCharacteristics(nodeLeft.getRows(), ncol, + OptimizerUtils.getNnz(nodeLeft.getRows(), ncol, spOut)); + case TRANS: + case RESHAPE: + throw new NotImplementedException("Characteristics derivation for trans and reshape has not been " + + "implemented yet, but could be implemented similar to EstimatorMatrixHistogram.java"); + default: + throw new NotImplementedException(); + } + } + + public static class RSVector { + private final double[] rs; + + public RSVector(double[] rs) { + this.rs = rs; + } + + public double[] get() { + return this.rs; + } + + public double get(int idx) { + return this.rs[idx]; + } + + public int size() { + return this.rs.length; + } + + public double avg() { + return DoubleStream.of(this.rs).average().orElse(0); + } + + public RSVector append(RSVector that) { + return new RSVector(ArrayUtils.addAll(this.rs, that.get())); + } + + public RSVector map(DoubleUnaryOperator mapper) { + return new RSVector(DoubleStream.of(this.rs).map(mapper).toArray()); + } + + public double reduce(double identity, DoubleBinaryOperator op) { + return DoubleStream.of(this.rs).reduce(identity, op); + } + + public RSVector add(RSVector that) { + return new RSVector(IntStream.range(0, this.size()).mapToDouble( + idx -> this.get(idx) + that.get(idx)).toArray()); + } + + public RSVector subtract(RSVector that) { + return new RSVector(IntStream.range(0, this.size()).mapToDouble( + idx -> this.get(idx) - that.get(idx)).toArray()); + } + + public RSVector multiply(RSVector that) { + return new RSVector(IntStream.range(0, this.size()).mapToDouble( + idx -> this.get(idx) * that.get(idx)).toArray()); + } + }; +}; diff --git a/src/test/java/org/apache/sysds/test/component/estim/OpBindChainTest.java b/src/test/java/org/apache/sysds/test/component/estim/OpBindChainTest.java index 35efedaf625..4726cf36daa 100644 --- a/src/test/java/org/apache/sysds/test/component/estim/OpBindChainTest.java +++ b/src/test/java/org/apache/sysds/test/component/estim/OpBindChainTest.java @@ -24,6 +24,7 @@ import org.apache.sysds.hops.estim.EstimatorBasicWorst; import org.apache.sysds.hops.estim.EstimatorBitsetMM; import org.apache.sysds.hops.estim.EstimatorMatrixHistogram; +import org.apache.sysds.hops.estim.EstimatorRowWise; import org.apache.sysds.hops.estim.EstimatorLayeredGraph; import org.apache.sysds.hops.estim.MMNode; import org.apache.sysds.hops.estim.SparsityEstimator; @@ -127,8 +128,19 @@ public void testLGCasecbind() { new EstimatorLayeredGraph(EstimatorLayeredGraph.ROUNDS, 3), m, k, n, sparsity, cbind); } - - + + // Row Wise Sparsity Estimator + @Test + public void testRowWiseRbind() { + runSparsityEstimateTest(new EstimatorRowWise(), m, k, n, sparsity, rbind); + } + + @Test + public void testRowWiseCbind() { + runSparsityEstimateTest(new EstimatorRowWise(), m, k, n, sparsity, cbind); + } + + private static void runSparsityEstimateTest(SparsityEstimator estim, int m, int k, int n, double[] sp, OpCode op) { MatrixBlock m1; MatrixBlock m2; diff --git a/src/test/java/org/apache/sysds/test/component/estim/OpBindTest.java b/src/test/java/org/apache/sysds/test/component/estim/OpBindTest.java index 3e7ad24fe86..31a9be713bc 100644 --- a/src/test/java/org/apache/sysds/test/component/estim/OpBindTest.java +++ b/src/test/java/org/apache/sysds/test/component/estim/OpBindTest.java @@ -24,6 +24,7 @@ import org.apache.sysds.hops.estim.EstimatorBasicWorst; import org.apache.sysds.hops.estim.EstimatorBitsetMM; import org.apache.sysds.hops.estim.EstimatorMatrixHistogram; +import org.apache.sysds.hops.estim.EstimatorRowWise; import org.apache.sysds.hops.estim.EstimatorLayeredGraph; import org.apache.sysds.hops.estim.SparsityEstimator; import org.apache.sysds.hops.estim.SparsityEstimator.OpCode; @@ -132,7 +133,18 @@ public void testSampleCaserbind() { public void testSampleCasecbind() { runSparsityEstimateTest(new EstimatorSample(), m, k, n, sparsity, cbind); }*/ - + + // Row Wise Sparsity Estimator + @Test + public void testRowWiseRbind() { + runSparsityEstimateTest(new EstimatorRowWise(), m, k, n, sparsity, rbind); + } + + @Test + public void testRowWiseCbind() { + runSparsityEstimateTest(new EstimatorRowWise(), m, k, n, sparsity, cbind); + } + private static void runSparsityEstimateTest(SparsityEstimator estim, int m, int k, int n, double[] sp, OpCode op) { MatrixBlock m1; diff --git a/src/test/java/org/apache/sysds/test/component/estim/OpElemWChainTest.java b/src/test/java/org/apache/sysds/test/component/estim/OpElemWChainTest.java index a1b6594a927..2388f50d50e 100644 --- a/src/test/java/org/apache/sysds/test/component/estim/OpElemWChainTest.java +++ b/src/test/java/org/apache/sysds/test/component/estim/OpElemWChainTest.java @@ -25,6 +25,7 @@ import org.apache.sysds.hops.estim.EstimatorBitsetMM; import org.apache.sysds.hops.estim.EstimatorLayeredGraph; import org.apache.sysds.hops.estim.EstimatorMatrixHistogram; +import org.apache.sysds.hops.estim.EstimatorRowWise; import org.apache.sysds.hops.estim.EstimatorDensityMap; import org.apache.sysds.hops.estim.MMNode; import org.apache.sysds.hops.estim.SparsityEstimator; @@ -118,8 +119,18 @@ public void testLGCasemult() { public void testLGCaseplus() { runSparsityEstimateTest(new EstimatorLayeredGraph(), m, n, sparsity, plus); } - - + + // Row Wise Sparsity Estimator + @Test + public void testRowWiseCaseMult() { + runSparsityEstimateTest(new EstimatorRowWise(), m, n, sparsity, mult); + } + + @Test + public void testRowWiseCasePlus() { + runSparsityEstimateTest(new EstimatorRowWise(), m, n, sparsity, plus); + } + private static void runSparsityEstimateTest(SparsityEstimator estim, int m, int n, double[] sp, OpCode op) { MatrixBlock m1 = MatrixBlock.randOperations(m, n, sp[0], 1, 1, "uniform", 3); MatrixBlock m2 = MatrixBlock.randOperations(m, n, sp[1], 1, 1, "uniform", 5); diff --git a/src/test/java/org/apache/sysds/test/component/estim/OpElemWTest.java b/src/test/java/org/apache/sysds/test/component/estim/OpElemWTest.java index f8ddb91bcef..8d9710dafb1 100644 --- a/src/test/java/org/apache/sysds/test/component/estim/OpElemWTest.java +++ b/src/test/java/org/apache/sysds/test/component/estim/OpElemWTest.java @@ -25,6 +25,7 @@ import org.apache.sysds.hops.estim.EstimatorBitsetMM; import org.apache.sysds.hops.estim.EstimatorDensityMap; import org.apache.sysds.hops.estim.EstimatorMatrixHistogram; +import org.apache.sysds.hops.estim.EstimatorRowWise; import org.apache.sysds.hops.estim.EstimatorLayeredGraph; import org.apache.sysds.hops.estim.EstimatorSample; import org.apache.sysds.hops.estim.SparsityEstimator; @@ -128,7 +129,18 @@ public void testSampleMult() { public void testSamplePlus() { runSparsityEstimateTest(new EstimatorSample(), m, n, sparsity, plus); } - + + // Row Wise Sparsity Estimator + @Test + public void testRowWiseMult() { + runSparsityEstimateTest(new EstimatorRowWise(), m, n, sparsity, mult); + } + + @Test + public void testRowWisePlus() { + runSparsityEstimateTest(new EstimatorRowWise(), m, n, sparsity, plus); + } + private static void runSparsityEstimateTest(SparsityEstimator estim, int m, int n, double[] sp, OpCode op) { MatrixBlock m1 = MatrixBlock.randOperations(m, n, sp[0], 1, 1, "uniform", 3); MatrixBlock m2 = MatrixBlock.randOperations(m, n, sp[1], 1, 1, "uniform", 7); diff --git a/src/test/java/org/apache/sysds/test/component/estim/OpSingleTest.java b/src/test/java/org/apache/sysds/test/component/estim/OpSingleTest.java index d40f84c4fb3..1e39847ab37 100644 --- a/src/test/java/org/apache/sysds/test/component/estim/OpSingleTest.java +++ b/src/test/java/org/apache/sysds/test/component/estim/OpSingleTest.java @@ -26,6 +26,7 @@ import org.apache.sysds.hops.estim.EstimatorBasicWorst; import org.apache.sysds.hops.estim.EstimatorBitsetMM; import org.apache.sysds.hops.estim.EstimatorLayeredGraph; +import org.apache.sysds.hops.estim.EstimatorRowWise; import org.apache.sysds.hops.estim.SparsityEstimator; import org.apache.sysds.hops.estim.SparsityEstimator.OpCode; import org.apache.sysds.runtime.matrix.data.MatrixBlock; @@ -40,7 +41,7 @@ public class OpSingleTest extends AutomatedTestBase private final static int m = 600; private final static int k = 300; private final static double sparsity = 0.2; -// private final static OpCode eqzero = OpCode.EQZERO; + // private final static OpCode eqzero = OpCode.EQZERO; private final static OpCode diag = OpCode.DIAG; private final static OpCode neqzero = OpCode.NEQZERO; private final static OpCode trans = OpCode.TRANS; @@ -237,7 +238,33 @@ public void testLGCasetrans() { // public void testSampleCasereshape() { // runSparsityEstimateTest(new EstimatorSample(), m, k, sparsity, reshape); // } - + + // Row Wise Sparsity Estimator + // @Test + // public void testRowWiseEqzero() { + // runSparsityEstimateTest(new EstimatorRowWise(), m, k, sparsity, eqzero); + // } + + // @Test + // public void testRowWiseDiag() { + // runSparsityEstimateTest(new EstimatorRowWise(), m, m, sparsity, diag); + // } + + @Test + public void testRowWiseNeqzero() { + runSparsityEstimateTest(new EstimatorRowWise(), m, k, sparsity, neqzero); + } + + @Test + public void testRowWiseTrans() { + runSparsityEstimateTest(new EstimatorRowWise(), m, k, sparsity, trans); + } + + @Test + public void testRowWiseReshape() { + runSparsityEstimateTest(new EstimatorRowWise(), m, k, sparsity, reshape); + } + private static void runSparsityEstimateTest(SparsityEstimator estim, int m, int k, double sp, OpCode op) { MatrixBlock m1 = MatrixBlock.randOperations(m, k, sp, 1, 1, "uniform", 3); MatrixBlock m2 = new MatrixBlock(); @@ -252,13 +279,7 @@ private static void runSparsityEstimateTest(SparsityEstimator estim, int m, int est = estim.estim(m1, op); break; case NEQZERO: - m2 = m1; - est = estim.estim(m1, op); - break; case TRANS: - m2 = m1; - est = estim.estim(m1, op); - break; case RESHAPE: m2 = m1; est = estim.estim(m1, op); diff --git a/src/test/java/org/apache/sysds/test/component/estim/OuterProductTest.java b/src/test/java/org/apache/sysds/test/component/estim/OuterProductTest.java index fdc33d878db..f71d9989ccd 100644 --- a/src/test/java/org/apache/sysds/test/component/estim/OuterProductTest.java +++ b/src/test/java/org/apache/sysds/test/component/estim/OuterProductTest.java @@ -26,6 +26,7 @@ import org.apache.sysds.hops.estim.EstimatorDensityMap; import org.apache.sysds.hops.estim.EstimatorMatrixHistogram; import org.apache.sysds.hops.estim.EstimatorLayeredGraph; +import org.apache.sysds.hops.estim.EstimatorRowWise; import org.apache.sysds.hops.estim.EstimatorSample; import org.apache.sysds.hops.estim.SparsityEstimator; import org.apache.sysds.runtime.instructions.InstructionUtils; @@ -150,6 +151,16 @@ public void testLayeredGraphCase2() { runSparsityEstimateTest(new EstimatorLayeredGraph(), m, k, n, case2); } + @Test + public void testRowWiseCase1() { + runSparsityEstimateTest(new EstimatorRowWise(), m, k, n, case1); + } + + @Test + public void testRowWiseCase2() { + runSparsityEstimateTest(new EstimatorRowWise(), m, k, n, case2); + } + private static void runSparsityEstimateTest(SparsityEstimator estim, int m, int k, int n, double[] sp) { MatrixBlock m1 = MatrixBlock.randOperations(m, k, sp[0], 1, 1, "uniform", 3); MatrixBlock m2 = MatrixBlock.randOperations(k, n, sp[1], 1, 1, "uniform", 3); diff --git a/src/test/java/org/apache/sysds/test/component/estim/SelfProductTest.java b/src/test/java/org/apache/sysds/test/component/estim/SelfProductTest.java index d99f38d939b..2feeae6fc37 100644 --- a/src/test/java/org/apache/sysds/test/component/estim/SelfProductTest.java +++ b/src/test/java/org/apache/sysds/test/component/estim/SelfProductTest.java @@ -28,6 +28,7 @@ import org.apache.sysds.hops.estim.EstimatorDensityMap; import org.apache.sysds.hops.estim.EstimatorLayeredGraph; import org.apache.sysds.hops.estim.EstimatorMatrixHistogram; +import org.apache.sysds.hops.estim.EstimatorRowWise; import org.apache.sysds.hops.estim.EstimatorSample; import org.apache.sysds.hops.estim.EstimatorSampleRa; import org.apache.sysds.hops.estim.SparsityEstimator; @@ -156,7 +157,15 @@ public void testLayeredGraphCase1() { public void testLayeredGraphCase2() { runSparsityEstimateTest(new EstimatorLayeredGraph(), m, sparsity2); } - + + @Test + public void testRowWiseCase() { + runSparsityEstimateTest(new EstimatorRowWise(), m/4, sparsity0); + runSparsityEstimateTest(new EstimatorRowWise(), m/2, sparsity1); + runSparsityEstimateTest(new EstimatorRowWise(), m, sparsity2); + runSparsityEstimateTest(new EstimatorRowWise(), m, sparsity3); + } + private static void runSparsityEstimateTest(SparsityEstimator estim, int n, double sp) { MatrixBlock m1 = MatrixBlock.randOperations(n, n, sp, 1, 1, "uniform", 3); MatrixBlock m3 = m1.aggregateBinaryOperations(m1, m1, diff --git a/src/test/java/org/apache/sysds/test/component/estim/SquaredProductChainTest.java b/src/test/java/org/apache/sysds/test/component/estim/SquaredProductChainTest.java index f799b02c96d..502ed62de29 100644 --- a/src/test/java/org/apache/sysds/test/component/estim/SquaredProductChainTest.java +++ b/src/test/java/org/apache/sysds/test/component/estim/SquaredProductChainTest.java @@ -26,6 +26,7 @@ import org.apache.sysds.hops.estim.EstimatorDensityMap; import org.apache.sysds.hops.estim.EstimatorLayeredGraph; import org.apache.sysds.hops.estim.EstimatorMatrixHistogram; +import org.apache.sysds.hops.estim.EstimatorRowWise; import org.apache.sysds.hops.estim.MMNode; import org.apache.sysds.hops.estim.SparsityEstimator; import org.apache.sysds.hops.estim.SparsityEstimator.OpCode; @@ -146,7 +147,17 @@ public void testLayeredGraph32Case1() { public void testLayeredGraph32Case2() { runSparsityEstimateTest(new EstimatorLayeredGraph(32), m, k, n, n2, case2); } - + + @Test + public void testRowWiseCase1() { + runSparsityEstimateTest(new EstimatorRowWise(), m, k, n, n2, case1); + } + + @Test + public void testRowWiseCase2() { + runSparsityEstimateTest(new EstimatorRowWise(), m, k, n, n2, case2); + } + private static void runSparsityEstimateTest(SparsityEstimator estim, int m, int k, int n, int n2, double[] sp) { MatrixBlock m1 = MatrixBlock.randOperations(m, k, sp[0], 1, 1, "uniform", 1); MatrixBlock m2 = MatrixBlock.randOperations(k, n, sp[1], 1, 1, "uniform", 2); diff --git a/src/test/java/org/apache/sysds/test/component/estim/SquaredProductTest.java b/src/test/java/org/apache/sysds/test/component/estim/SquaredProductTest.java index 2a898f9c39f..678c5daa31a 100644 --- a/src/test/java/org/apache/sysds/test/component/estim/SquaredProductTest.java +++ b/src/test/java/org/apache/sysds/test/component/estim/SquaredProductTest.java @@ -25,6 +25,7 @@ import org.apache.sysds.hops.estim.EstimatorBitsetMM; import org.apache.sysds.hops.estim.EstimatorDensityMap; import org.apache.sysds.hops.estim.EstimatorMatrixHistogram; +import org.apache.sysds.hops.estim.EstimatorRowWise; import org.apache.sysds.hops.estim.EstimatorLayeredGraph; import org.apache.sysds.hops.estim.EstimatorSample; import org.apache.sysds.hops.estim.SparsityEstimator; @@ -154,7 +155,17 @@ public void testLayeredGraphCase1() { public void testLayeredGraphCase2() { runSparsityEstimateTest(new EstimatorLayeredGraph(), m, k, n, case2); } - + + @Test + public void testRowWiseCase1() { + runSparsityEstimateTest(new EstimatorRowWise(), m, k, n, case1); + } + + @Test + public void testRowWiseCase2() { + runSparsityEstimateTest(new EstimatorRowWise(), m, k, n, case2); + } + private static void runSparsityEstimateTest(SparsityEstimator estim, int m, int k, int n, double[] sp) { MatrixBlock m1 = MatrixBlock.randOperations(m, k, sp[0], 1, 1, "uniform", 3); MatrixBlock m2 = MatrixBlock.randOperations(k, n, sp[1], 1, 1, "uniform", 7);