Skip to content

Commit 7cd9d18

Browse files
committed
fix comments
1 parent a2c3aa6 commit 7cd9d18

File tree

3 files changed

+3
-12
lines changed

3 files changed

+3
-12
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,6 @@ public Lop constructLops() {
240240
default:
241241
throw new HopsException(this.printErrorLocation() + "Invalid Matrix Mult Method (" + _method + ") while constructing SPARK lops.");
242242
}
243-
// } else if (et == ExecType.OOC) {
244-
// Lop in1 = getInput().get(0).constructLops();
245-
// Lop in2 = getInput().get(1).constructLops();
246-
// MatMultCP matmult = new MatMultCP(in1, in2, getDataType(), getValueType(),
247-
// et, OptimizerUtils.getConstrainedNumThreads(_maxNumThreads));
248-
// setOutputDimensions(matmult);
249-
// setLineNumbers(matmult);
250-
// setLops(matmult);
251243
}
252244
} else
253245
throw new HopsException(this.printErrorLocation() + "Invalid operation in AggBinary Hop, aggBin(" + innerOp + "," + outerOp + ") while constructing lops.");

src/main/java/org/apache/sysds/runtime/instructions/ooc/OOCInstruction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public abstract class OOCInstruction extends Instruction {
3030
protected static final Log LOG = LogFactory.getLog(OOCInstruction.class.getName());
3131

3232
public enum OOCType {
33-
Reblock, AggregateUnary, Binary, Unary, MAPMM, Reorg, AggregateBinary
33+
Reblock, AggregateUnary, Binary, Unary, MAPMM, Reorg, AggregateBinary, MMTSJ
3434
}
3535

3636
protected final OOCInstruction.OOCType _ooctype;

src/main/java/org/apache/sysds/runtime/instructions/ooc/TSMMOOCInstruction.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ public static TSMMOOCInstruction parseInstruction(String str) {
5454
String[] parts = InstructionUtils.getInstructionPartsWithValueType(str);
5555
InstructionUtils.checkNumFields(parts, 3);
5656
String opcode = parts[0];
57-
CPOperand in1 = new CPOperand(parts[1]); // the larget matrix (streamed)
57+
CPOperand in1 = new CPOperand(parts[1]); // the large matrix (streamed), columns <= blocksize
5858
CPOperand out = new CPOperand(parts[2]);
5959
MMTSJ.MMTSJType mmtsjType = MMTSJ.MMTSJType.valueOf(parts[3]);
6060

6161
AggregateOperator agg = new AggregateOperator(0, Plus.getPlusFnObject());
6262
AggregateBinaryOperator ba = new AggregateBinaryOperator(Multiply.getMultiplyFnObject(), agg);
6363

64-
return new TSMMOOCInstruction(OOCType.MAPMM, ba, in1, out, mmtsjType, opcode, str);
64+
return new TSMMOOCInstruction(OOCType.MMTSJ, ba, in1, out, mmtsjType, opcode, str);
6565
}
6666

6767
@Override
@@ -70,7 +70,6 @@ public void processInstruction( ExecutionContext ec ) {
7070
MatrixObject min = ec.getMatrixObject(input1); // big matrix
7171

7272
// number of colBlocks for early block output
73-
long nBlocks = min.getDataCharacteristics().getNumColBlocks();
7473
int nCols = (int) min.getDataCharacteristics().getCols();
7574

7675
LocalTaskQueue<IndexedMatrixValue> qIn = min.getStreamHandle();

0 commit comments

Comments
 (0)