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
commit 2a6bb746ebe0c0b6cd581a4e8c57bfb9e352448b Author: Matthias Boehm <[email protected]> AuthorDate: Mon Feb 6 17:54:32 2023 +0100 [MINOR] Various code cleanups (imports, annotations) --- src/main/java/org/apache/sysds/lops/MMRJ.java | 2 +- .../controlprogram/context/ExecutionContext.java | 1 + .../sysds/runtime/lineage/LineageCacheConfig.java | 3 -- .../component/frame/array/ColumnMetadataTests.java | 1 + .../functions/async/LineageReuseSparkTest.java | 35 +++++++++++----------- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/apache/sysds/lops/MMRJ.java b/src/main/java/org/apache/sysds/lops/MMRJ.java index bf19c703f0..5fff574b1f 100644 --- a/src/main/java/org/apache/sysds/lops/MMRJ.java +++ b/src/main/java/org/apache/sysds/lops/MMRJ.java @@ -59,7 +59,7 @@ public class MMRJ extends Lop @Override public String getInstructions(String input1, String input2, String output) { - boolean toCache = getOutputParameters().getLinCacheMarking(); + // FIXME boolean toCache = getOutputParameters().getLinCacheMarking(); return InstructionUtils.concatOperands( getExecType().name(), "rmm", 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 a39a04166b..278f23c765 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 @@ -602,6 +602,7 @@ 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 diff --git a/src/main/java/org/apache/sysds/runtime/lineage/LineageCacheConfig.java b/src/main/java/org/apache/sysds/runtime/lineage/LineageCacheConfig.java index b0c8a87db1..253825a5cd 100644 --- a/src/main/java/org/apache/sysds/runtime/lineage/LineageCacheConfig.java +++ b/src/main/java/org/apache/sysds/runtime/lineage/LineageCacheConfig.java @@ -21,7 +21,6 @@ package org.apache.sysds.runtime.lineage; import org.apache.commons.lang3.ArrayUtils; import org.apache.sysds.api.DMLScript; -import org.apache.sysds.common.Types; import org.apache.sysds.conf.ConfigurationManager; import org.apache.sysds.conf.DMLConfig; import org.apache.sysds.hops.AggBinaryOp; @@ -35,11 +34,9 @@ import org.apache.sysds.runtime.instructions.cp.ListIndexingCPInstruction; import org.apache.sysds.runtime.instructions.cp.MatrixIndexingCPInstruction; import org.apache.sysds.runtime.instructions.fed.ComputationFEDInstruction; import org.apache.sysds.runtime.instructions.gpu.GPUInstruction; -import org.apache.sysds.runtime.instructions.spark.AggregateUnarySPInstruction; import org.apache.sysds.runtime.instructions.spark.ComputationSPInstruction; import org.apache.sysds.runtime.instructions.spark.CpmmSPInstruction; import org.apache.sysds.runtime.instructions.spark.MapmmSPInstruction; -import org.apache.sysds.runtime.instructions.spark.TsmmSPInstruction; import java.util.Comparator; diff --git a/src/test/java/org/apache/sysds/test/component/frame/array/ColumnMetadataTests.java b/src/test/java/org/apache/sysds/test/component/frame/array/ColumnMetadataTests.java index ba2881c8bc..397fa0988a 100644 --- a/src/test/java/org/apache/sysds/test/component/frame/array/ColumnMetadataTests.java +++ b/src/test/java/org/apache/sysds/test/component/frame/array/ColumnMetadataTests.java @@ -111,6 +111,7 @@ public class ColumnMetadataTests { } @Test + @SuppressWarnings("unlikely-arg-type") public void equalsObject() { assertTrue(d.equals((Object) new ColumnMetadata(d))); assertFalse(d.equals(1324)); diff --git a/src/test/java/org/apache/sysds/test/functions/async/LineageReuseSparkTest.java b/src/test/java/org/apache/sysds/test/functions/async/LineageReuseSparkTest.java index 27b2bf24d2..9ed59d75d4 100644 --- a/src/test/java/org/apache/sysds/test/functions/async/LineageReuseSparkTest.java +++ b/src/test/java/org/apache/sysds/test/functions/async/LineageReuseSparkTest.java @@ -19,24 +19,23 @@ package org.apache.sysds.test.functions.async; - import java.util.ArrayList; - import java.util.HashMap; - import java.util.List; - - import org.apache.sysds.common.Types.ExecMode; - import org.apache.sysds.hops.OptimizerUtils; - import org.apache.sysds.hops.recompile.Recompiler; - import org.apache.sysds.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer; - import org.apache.sysds.runtime.lineage.Lineage; - import org.apache.sysds.runtime.lineage.LineageCacheConfig; - import org.apache.sysds.runtime.matrix.data.MatrixValue; - import org.apache.sysds.test.AutomatedTestBase; - import org.apache.sysds.test.TestConfiguration; - import org.apache.sysds.test.TestUtils; - import org.apache.sysds.utils.Statistics; - import org.junit.Assert; - import org.junit.Ignore; - import org.junit.Test; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import org.apache.sysds.common.Types.ExecMode; +import org.apache.sysds.hops.OptimizerUtils; +import org.apache.sysds.hops.recompile.Recompiler; +import org.apache.sysds.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer; +import org.apache.sysds.runtime.lineage.Lineage; +import org.apache.sysds.runtime.lineage.LineageCacheConfig; +import org.apache.sysds.runtime.matrix.data.MatrixValue; +import org.apache.sysds.test.AutomatedTestBase; +import org.apache.sysds.test.TestConfiguration; +import org.apache.sysds.test.TestUtils; +import org.apache.sysds.utils.Statistics; +import org.junit.Assert; +import org.junit.Test; public class LineageReuseSparkTest extends AutomatedTestBase {
