Skip to content

Commit

Permalink
[SYSTEMDS-3807] Fix test code coverage and minor lineage issues
Browse files Browse the repository at this point in the history
Recently ubuntu-latest changed to ubuntu-24 which changed the default
java version from 11 to 17. This seems to cause problems, even when
fixing the java version to 11. So in order to restore the code coverage
support, we now fix ubuntu-22 until we can rebuild our docker image.
  • Loading branch information
mboehm7 committed Dec 14, 2024
1 parent 091144d commit d3fcfb1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/javaTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
os: [ubuntu-22.04]
tests: [
"org.apache.sysds.test.applications.**",
"**.test.usertest.**",
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest]
os: [ubuntu-22.04]
java: ['11']
javadist: ['adopt']
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -624,13 +624,10 @@ public void setMatrixOutputAndLineage(String varName, MatrixBlock outputData, Li
mo.release();
}

@SuppressWarnings("unused")
public void setMatrixOutputAndLineage(String varName, Future<MatrixBlock> fmb, LineageItem li) {
if (isAutoCreateVars() && !containsVariable(varName)) {
//FIXME without adding this fmo object here to the symbol table
// it would crash in federated operations (autocreatevars)
MatrixObject fmo = new MatrixObjectFuture(Types.ValueType.FP64,
OptimizerUtils.getUniqueTempFileName(), fmb);
setVariable(varName, new MatrixObjectFuture(Types.ValueType.FP64,
OptimizerUtils.getUniqueTempFileName(), fmb));
}
MatrixObject mo = getMatrixObject(varName);
MatrixObjectFuture fmo = new MatrixObjectFuture(mo, fmb);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -420,14 +420,7 @@ else if(cacheData instanceof FrameObject) {
}
else if(cacheData instanceof ListObject) {
out = DataConverter.toString((ListObject) cacheData,
rows,
cols,
sparse,
separator,
lineSeparator,
rows,
cols,
decimal);
rows, cols, sparse, separator, lineSeparator, rows, cols, decimal);
}
else {
throw new DMLRuntimeException("toString only converts "
Expand Down Expand Up @@ -549,9 +542,7 @@ else if(opcode.equalsIgnoreCase("lowertri") || opcode.equalsIgnoreCase("uppertri
else if(opcode.equalsIgnoreCase("transformdecode") || opcode.equalsIgnoreCase("transformapply")) {
CPOperand target = new CPOperand(params.get("target"), ValueType.FP64, DataType.FRAME);
CPOperand meta = getLiteral("meta", ValueType.UNKNOWN, DataType.FRAME);
CPOperand spec = getStringLiteral("spec");
//FIXME: Taking only spec file name as a literal leads to wrong reuse
//TODO: Add Embedding to the lineage item
CPOperand spec = new CPOperand(params.get("spec"), ValueType.STRING, DataType.SCALAR);
return Pair.of(output.getName(),
new LineageItem(getOpcode(), LineageItemUtils.getLineage(ec, target, meta, spec)));
}
Expand Down

0 comments on commit d3fcfb1

Please sign in to comment.