(systemds) branch main updated: [SYSTEMDS-3807] Fix test code coverage and minor lineage issues

[mboehm7]

This is an automated email from the ASF dual-hosted git repository.

mboehm7 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/systemds.git


The following commit(s) were added to refs/heads/main by this push:
     new d3fcfb13cc [SYSTEMDS-3807] Fix test code coverage and minor lineage 
issues
d3fcfb13cc is described below

commit d3fcfb13ccb69f4cfc4338cd0323b44dc1be4c55
Author: Matthias Boehm <mboe...@gmail.com>
AuthorDate: Sat Dec 14 10:17:26 2024 +0100

    [SYSTEMDS-3807] Fix test code coverage and minor lineage issues
    
    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.
---
 .github/workflows/javaTests.yml                             |  4 ++--
 .../runtime/controlprogram/context/ExecutionContext.java    |  7 ++-----
 .../instructions/cp/ParameterizedBuiltinCPInstruction.java  | 13 ++-----------
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/javaTests.yml b/.github/workflows/javaTests.yml
index b4341c544c..ce7a64d05a 100644
--- a/.github/workflows/javaTests.yml
+++ b/.github/workflows/javaTests.yml
@@ -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.**",
@@ -124,7 +124,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: ['11']
         javadist: ['adopt']
     steps:
diff --git 
a/src/main/java/org/apache/sysds/runtime/controlprogram/context/ExecutionContext.java
 
b/src/main/java/org/apache/sysds/runtime/controlprogram/context/ExecutionContext.java
index 20d602fc38..fa87d452d1 100644
--- 
a/src/main/java/org/apache/sysds/runtime/controlprogram/context/ExecutionContext.java
+++ 
b/src/main/java/org/apache/sysds/runtime/controlprogram/context/ExecutionContext.java
@@ -624,13 +624,10 @@ public class ExecutionContext {
                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);
diff --git 
a/src/main/java/org/apache/sysds/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java
 
b/src/main/java/org/apache/sysds/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java
index 6bfaf1f96f..16836579d2 100644
--- 
a/src/main/java/org/apache/sysds/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java
+++ 
b/src/main/java/org/apache/sysds/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java
@@ -420,14 +420,7 @@ public class ParameterizedBuiltinCPInstruction extends 
ComputationCPInstruction
                        }
                        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 "
@@ -549,9 +542,7 @@ public class ParameterizedBuiltinCPInstruction extends 
ComputationCPInstruction
                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)));
                }