Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.apache.sysds.runtime.matrix.operators.Operator;
import org.apache.sysds.runtime.meta.DataCharacteristics;
import org.apache.sysds.runtime.ooc.stream.StreamContext;
import org.apache.sysds.runtime.ooc.util.OOCInstructionUtils;

public class CSVReblockOOCInstruction extends ComputationOOCInstruction {
private final int blen;
Expand Down Expand Up @@ -74,14 +75,14 @@ public void processInstruction(ExecutionContext ec) {
final long cols = mc.getCols();
final long nnz = mc.getNonZeros();

submitOOCTask(() -> {
OOCInstructionUtils.submitOOCTask(() -> {
try {
reader.readMatrixAsStream(qOut, fileName, rows, cols, blen, nnz);
}
catch(Exception ex) {
throw (ex instanceof DMLRuntimeException) ? (DMLRuntimeException) ex : new DMLRuntimeException(ex);
}
}, new StreamContext().addOutStream(qOut));
}, new StreamContext(_callerId, getExtendedOpcode()).addOutStream(qOut));

MatrixObject mout = ec.getMatrixObject(output);
mout.setStreamHandle(qOut);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.apache.sysds.runtime.matrix.data.RandomMatrixGenerator;
import org.apache.sysds.runtime.matrix.operators.UnaryOperator;
import org.apache.sysds.runtime.ooc.stream.StreamContext;
import org.apache.sysds.runtime.ooc.util.OOCInstructionUtils;
import org.apache.sysds.runtime.util.UtilFunctions;

public class DataGenOOCInstruction extends UnaryOOCInstruction {
Expand Down Expand Up @@ -259,8 +260,7 @@ else if(method == Types.OpOpDG.SEQ) {
final int maxK = (int) UtilFunctions.getSeqLength(lfrom, lto, lincr);
final double finalLincr = lincr;


submitOOCTask(() -> {
OOCInstructionUtils.submitOOCTask(() -> {
int k = 0;
double curFrom = lfrom;
double curTo;
Expand All @@ -286,7 +286,7 @@ else if(method == Types.OpOpDG.SEQ) {
}

qOut.closeInput();
}, new StreamContext().addOutStream(qOut));
}, new StreamContext(_callerId, getExtendedOpcode()).addOutStream(qOut));
}
else
throw new NotImplementedException();
Expand Down
Loading
Loading