Skip to content

[SYSTEMDS-2748] Compressed Sparse MM + TSMM #1122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Baunsgaard wants to merge 4 commits into from
Closed

[SYSTEMDS-2748] Compressed Sparse MM + TSMM #1122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8972597
[SYSTEMDS-2748] Compressed Sparse MM + TSMM
Baunsgaard Dec 8, 2020
4cf1f0e
cmbf transpose in place
Baunsgaard Dec 18, 2020
79e22ee
Revert to old transpose
Baunsgaard Dec 30, 2020
0cad79c
cleanup
Baunsgaard Dec 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/main/java/org/apache/sysds/conf/DMLConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ public class DMLConfig
public static final String COMPRESSED_LINALG = "sysds.compressed.linalg"; //auto, cost, true, false
public static final String COMPRESSED_LOSSY = "sysds.compressed.lossy";
public static final String COMPRESSED_VALID_COMPRESSIONS = "sysds.compressed.valid.compressions";
public static final String COMPRESSED_OVERLAPPING = "sysds.compressed.overlapping"; // true, false
public static final String COMPRESSED_SAMPLING_RATIO = "sysds.compressed.sampling.ratio"; // 0.1
public static final String COMPRESSED_COCODE = "sysds.compressed.cocode"; // COST
public static final String NATIVE_BLAS = "sysds.native.blas";
public static final String NATIVE_BLAS_DIR = "sysds.native.blas.directory";
public static final String CODEGEN = "sysds.codegen.enabled"; //boolean
Expand Down Expand Up @@ -121,6 +124,9 @@ public class DMLConfig
_defaultVals.put(COMPRESSED_LINALG, Compression.CompressConfig.AUTO.name() );
_defaultVals.put(COMPRESSED_LOSSY, "false" );
_defaultVals.put(COMPRESSED_VALID_COMPRESSIONS, "DDC,OLE,RLE");
_defaultVals.put(COMPRESSED_OVERLAPPING, "false" );
_defaultVals.put(COMPRESSED_SAMPLING_RATIO, "0.01");
_defaultVals.put(COMPRESSED_COCODE, "COST");
_defaultVals.put(CODEGEN, "false" );
_defaultVals.put(CODEGEN_API, GeneratorAPI.JAVA.name() );
_defaultVals.put(CODEGEN_COMPILER, CompilerType.AUTO.name() );
Expand Down Expand Up @@ -385,7 +391,8 @@ public String getConfigInfo() {
String[] tmpConfig = new String[] {
LOCAL_TMP_DIR,SCRATCH_SPACE,OPTIMIZATION_LEVEL, DEFAULT_BLOCK_SIZE,
CP_PARALLEL_OPS, CP_PARALLEL_IO, NATIVE_BLAS, NATIVE_BLAS_DIR,
COMPRESSED_LINALG, COMPRESSED_LOSSY, COMPRESSED_VALID_COMPRESSIONS,
COMPRESSED_LINALG, COMPRESSED_LOSSY, COMPRESSED_VALID_COMPRESSIONS, COMPRESSED_OVERLAPPING,
COMPRESSED_SAMPLING_RATIO, COMPRESSED_COCODE,
CODEGEN, CODEGEN_API, CODEGEN_COMPILER, CODEGEN_OPTIMIZER, CODEGEN_PLANCACHE, CODEGEN_LITERALS,
STATS_MAX_WRAP_LEN, PRINT_GPU_MEMORY_INFO,
AVAILABLE_GPUS, SYNCHRONIZE_GPU, EAGER_CUDA_FREE, FLOATING_POINT_PRECISION, GPU_EVICTION_POLICY,
Expand Down
15 changes: 14 additions & 1 deletion src/main/java/org/apache/sysds/hops/AggBinaryOp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.apache.sysds.common.Types.OpOp2;
import org.apache.sysds.common.Types.ReOrgOp;
import org.apache.sysds.common.Types.ValueType;
import org.apache.sysds.conf.ConfigurationManager;
import org.apache.sysds.hops.rewrite.HopRewriteUtils;
import org.apache.sysds.lops.Lop;
import org.apache.sysds.lops.LopProperties.ExecType;
Expand Down Expand Up @@ -598,7 +599,7 @@ private void constructCPLopsPMM()
private void constructCPLopsMM(ExecType et)
{
Lop matmultCP = null;

String cla = ConfigurationManager.getDMLConfig().getTextValue("sysds.compressed.linalg");
if (et == ExecType.GPU) {
Hop h1 = getInput().get(0);
Hop h2 = getInput().get(1);
Expand All @@ -615,6 +616,18 @@ private void constructCPLopsMM(ExecType et)
matmultCP = new MatMultCP(left, right, getDataType(), getValueType(), et, leftTrans, rightTrans);
setOutputDimensions(matmultCP);
}
else if (cla.equals("true") || cla.equals("cost")){
Hop h1 = getInput().get(0);
Hop h2 = getInput().get(1);
int k = OptimizerUtils.getConstrainedNumThreads(_maxNumThreads);
boolean leftTrans = HopRewriteUtils.isTransposeOperation(h1);
boolean rightTrans = HopRewriteUtils.isTransposeOperation(h2);
Lop left = !leftTrans ? h1.constructLops() :
h1.getInput().get(0).constructLops();
Lop right = !rightTrans ? h2.constructLops() :
h2.getInput().get(0).constructLops();
matmultCP = new MatMultCP(left, right, getDataType(), getValueType(), et, k, leftTrans, rightTrans);
}
else {
if( isLeftTransposeRewriteApplicable(true) ) {
matmultCP = constructCPLopsMMWithLeftTransposeRewrite();
Expand Down
47 changes: 29 additions & 18 deletions src/main/java/org/apache/sysds/lops/MatMultCP.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,58 +24,69 @@
import org.apache.sysds.common.Types.DataType;
import org.apache.sysds.common.Types.ValueType;

public class MatMultCP extends Lop
{
public class MatMultCP extends Lop {
private int numThreads = -1;
private boolean isLeftTransposed; // Used for GPU matmult operation
private boolean isRightTransposed;

private boolean useTranspose;

public MatMultCP(Lop input1, Lop input2, DataType dt, ValueType vt, ExecType et) {
this(input1, input2, dt, vt, et, 1);
}

public MatMultCP(Lop input1, Lop input2, DataType dt, ValueType vt, ExecType et, int k) {
super(Lop.Type.MatMultCP, dt, vt);
init(input1, input2, dt, vt, et);
numThreads = k;
}
public MatMultCP(Lop input1, Lop input2, DataType dt, ValueType vt, ExecType et,
boolean isLeftTransposed, boolean isRightTransposed) {

public MatMultCP(Lop input1, Lop input2, DataType dt, ValueType vt, ExecType et, boolean isLeftTransposed,
boolean isRightTransposed) {
super(Lop.Type.Binary, dt, vt);
init(input1, input2, dt, vt, et);
this.isLeftTransposed = isLeftTransposed;
this.isRightTransposed = isRightTransposed;
this.useTranspose = true;
}


public MatMultCP(Lop input1, Lop input2, DataType dt, ValueType vt, ExecType et, int k, boolean isLeftTransposed,
boolean isRightTransposed) {
this(input1, input2, dt, vt, et, k);
this.isLeftTransposed = isLeftTransposed;
this.isRightTransposed = isRightTransposed;
this.useTranspose = true;
}

private void init(Lop input1, Lop input2, DataType dt, ValueType vt, ExecType et) {
addInput(input1);
addInput(input2);
input1.addOutput(this);
input2.addOutput(this);
lps.setProperties( inputs, et);
lps.setProperties(inputs, et);
}

@Override
public String toString() {
return " Operation: ba+*";
}

@Override
public String getInstructions(String input1, String input2, String output) {
if( getExecType() == ExecType.CP ) {
return InstructionUtils.concatOperands(
getExecType().name(), "ba+*",
if(!useTranspose) {
return InstructionUtils.concatOperands(getExecType().name(),
"ba+*",
getInputs().get(0).prepInputOperand(input1),
getInputs().get(1).prepInputOperand(input2),
prepOutputOperand(output), String.valueOf(numThreads));
prepOutputOperand(output),
String.valueOf(numThreads));
}
else { //GPU
return InstructionUtils.concatOperands(
getExecType().name(), "ba+*",
else { // GPU or compressed
return InstructionUtils.concatOperands(getExecType().name(),
"ba+*",
getInputs().get(0).prepInputOperand(input1),
getInputs().get(1).prepInputOperand(input2),
prepOutputOperand(output), String.valueOf(numThreads),
prepOutputOperand(output),
String.valueOf(numThreads),
String.valueOf(isLeftTransposed),
String.valueOf(isRightTransposed));
}
Expand Down
21 changes: 4 additions & 17 deletions src/main/java/org/apache/sysds/runtime/compress/AbstractCompressedMatrixBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
import org.apache.sysds.runtime.matrix.operators.COVOperator;
import org.apache.sysds.runtime.matrix.operators.Operator;
import org.apache.sysds.runtime.matrix.operators.QuaternaryOperator;
import org.apache.sysds.runtime.matrix.operators.ReorgOperator;
import org.apache.sysds.runtime.matrix.operators.TernaryOperator;
import org.apache.sysds.runtime.matrix.operators.UnaryOperator;
import org.apache.sysds.runtime.util.IndexRange;
Expand Down Expand Up @@ -82,6 +81,7 @@ public AbstractCompressedMatrixBlock() {

/**
* Create a potentially overlapping Compressed Matrix Block.
*
* @param overLapping boolean specifying if the matrix blocks columns are overlapping.
*/
public AbstractCompressedMatrixBlock(boolean overLapping) {
Expand Down Expand Up @@ -175,13 +175,6 @@ public void incrementalAggregate(AggregateOperator aggOp, MatrixValue newWithCor
throw new DMLRuntimeException("CompressedMatrixBlock: incrementalAggregate not supported.");
}

@Override
public MatrixBlock reorgOperations(ReorgOperator op, MatrixValue ret, int startRow, int startColumn, int length) {
printDecompressWarning("reorgOperations");
MatrixBlock tmp = decompress();
return tmp.reorgOperations(op, ret, startRow, startColumn, length);
}

@Override
public MatrixBlock append(MatrixBlock that, MatrixBlock ret, boolean cbind) {
if(cbind) // use supported operation
Expand Down Expand Up @@ -394,13 +387,6 @@ public MatrixBlock rexpandOperations(MatrixBlock ret, double max, boolean rows,
return tmp.rexpandOperations(ret, max, rows, cast, ignore, k);
}

@Override
public MatrixBlock replaceOperations(MatrixValue result, double pattern, double replacement) {
printDecompressWarning("replaceOperations");
MatrixBlock tmp = decompress();
return tmp.replaceOperations(result, pattern, replacement);
}

@Override
public void ctableOperations(Operator op, double scalar, MatrixValue that, CTableMap resultMap,
MatrixBlock resultBlock) {
Expand Down Expand Up @@ -507,8 +493,9 @@ private static boolean isCompressed(MatrixBlock mb) {
return(mb instanceof CompressedMatrixBlock);
}

protected static MatrixBlock getUncompressed(MatrixValue mVal) {
return isCompressed((MatrixBlock) mVal) ? ((CompressedMatrixBlock) mVal).decompress(OptimizerUtils.getConstrainedNumThreads(-1)) : (MatrixBlock) mVal;
public static MatrixBlock getUncompressed(MatrixValue mVal) {
return isCompressed((MatrixBlock) mVal) ? ((CompressedMatrixBlock) mVal)
.decompress(OptimizerUtils.getConstrainedNumThreads(-1)) : (MatrixBlock) mVal;
}

protected void printDecompressWarning(String operation) {
Expand Down
Loading