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 f00fefb91c89a486ccb99f871b8eca7105425c00 Author: Matthias Boehm <[email protected]> AuthorDate: Tue Dec 13 13:35:17 2022 +0100 [MINOR] Fix various warnings (unused imports, variables, etc) --- .../java/org/apache/sysds/hops/recompile/Recompiler.java | 2 +- src/main/java/org/apache/sysds/lops/Checkpoint.java | 2 -- src/main/java/org/apache/sysds/lops/compile/Dag.java | 16 ---------------- .../sysds/lops/compile/linearization/ILinearize.java | 3 +-- .../runtime/controlprogram/context/ExecutionContext.java | 2 ++ .../controlprogram/context/MatrixObjectFuture.java | 1 + .../runtime/controlprogram/federated/FederationMap.java | 3 --- .../MultiReturnParameterizedBuiltinFEDInstruction.java | 1 - .../java/org/apache/sysds/runtime/io/FrameReader.java | 1 - .../org/apache/sysds/runtime/lineage/LineageCache.java | 1 - .../apache/sysds/runtime/lineage/LineageCacheConfig.java | 1 + .../apache/sysds/runtime/matrix/data/MatrixBlock.java | 1 - .../countdistinct/CountDistinctFunctionSketch.java | 3 --- .../org/apache/sysds/runtime/util/DataConverter.java | 3 --- src/test/java/org/apache/sysds/test/TestUtils.java | 1 - .../sysds/test/functions/async/PrefetchRDDTest.java | 2 +- .../test/functions/frame/FrameIndexingDistTest.java | 2 -- .../test/functions/homomorphicEncryption/InOutTest.java | 1 - .../apache/sysds/test/functions/unique/UniqueBase.java | 3 --- 19 files changed, 7 insertions(+), 42 deletions(-) diff --git a/src/main/java/org/apache/sysds/hops/recompile/Recompiler.java b/src/main/java/org/apache/sysds/hops/recompile/Recompiler.java index cb17cd26d6..f3fb0fcbc6 100644 --- a/src/main/java/org/apache/sysds/hops/recompile/Recompiler.java +++ b/src/main/java/org/apache/sysds/hops/recompile/Recompiler.java @@ -1620,7 +1620,7 @@ public class Recompiler { else { //read text input matrix (through buffer pool, matrix object carries all relevant //information including additional arguments for csv reblock) - CacheBlock mb = in.acquireRead(); + CacheBlock<?> mb = in.acquireRead(); //set output (incl update matrix characteristics) out.acquireModify(mb); diff --git a/src/main/java/org/apache/sysds/lops/Checkpoint.java b/src/main/java/org/apache/sysds/lops/Checkpoint.java index 6f56d287c0..7128634233 100644 --- a/src/main/java/org/apache/sysds/lops/Checkpoint.java +++ b/src/main/java/org/apache/sysds/lops/Checkpoint.java @@ -25,8 +25,6 @@ import org.apache.sysds.common.Types.ExecType; import org.apache.sysds.common.Types.ValueType; import org.apache.sysds.runtime.instructions.InstructionUtils; -import java.util.Arrays; - /** * Lop for checkpoint operations. For example, on Spark, the semantic of a checkpoint * is to persist an intermediate result into a specific storage level (e.g., mem_only). diff --git a/src/main/java/org/apache/sysds/lops/compile/Dag.java b/src/main/java/org/apache/sysds/lops/compile/Dag.java index ade809aea6..786e281d64 100644 --- a/src/main/java/org/apache/sysds/lops/compile/Dag.java +++ b/src/main/java/org/apache/sysds/lops/compile/Dag.java @@ -35,29 +35,13 @@ import org.apache.sysds.common.Types.ExecType; import org.apache.sysds.common.Types.FileFormat; import org.apache.sysds.common.Types.OpOp1; import org.apache.sysds.common.Types.OpOpData; -import org.apache.sysds.conf.ConfigurationManager; import org.apache.sysds.conf.DMLConfig; -import org.apache.sysds.hops.AggBinaryOp.SparkAggType; -import org.apache.sysds.lops.CSVReBlock; -import org.apache.sysds.lops.CentralMoment; -import org.apache.sysds.lops.Checkpoint; -import org.apache.sysds.lops.CoVariance; import org.apache.sysds.lops.Data; import org.apache.sysds.lops.FunctionCallCP; -import org.apache.sysds.lops.GroupedAggregate; -import org.apache.sysds.lops.GroupedAggregateM; import org.apache.sysds.lops.Lop; import org.apache.sysds.lops.Lop.Type; import org.apache.sysds.lops.LopsException; -import org.apache.sysds.lops.MMTSJ; -import org.apache.sysds.lops.MMZip; -import org.apache.sysds.lops.MapMultChain; import org.apache.sysds.lops.OutputParameters; -import org.apache.sysds.lops.ParameterizedBuiltin; -import org.apache.sysds.lops.PickByCount; -import org.apache.sysds.lops.ReBlock; -import org.apache.sysds.lops.SpoofFused; -import org.apache.sysds.lops.UAggOuterChain; import org.apache.sysds.lops.UnaryCP; import org.apache.sysds.lops.compile.linearization.ILinearize; import org.apache.sysds.parser.DataExpression; diff --git a/src/main/java/org/apache/sysds/lops/compile/linearization/ILinearize.java b/src/main/java/org/apache/sysds/lops/compile/linearization/ILinearize.java index 70ab1533df..6bc520d31a 100644 --- a/src/main/java/org/apache/sysds/lops/compile/linearization/ILinearize.java +++ b/src/main/java/org/apache/sysds/lops/compile/linearization/ILinearize.java @@ -37,7 +37,6 @@ import org.apache.sysds.common.Types.ExecType; import org.apache.sysds.common.Types.OpOp1; import org.apache.sysds.common.Types.DataType; import org.apache.sysds.conf.ConfigurationManager; -import org.apache.sysds.conf.DMLConfig; import org.apache.sysds.hops.AggBinaryOp.SparkAggType; import org.apache.sysds.hops.OptimizerUtils; import org.apache.sysds.lops.CSVReBlock; @@ -72,7 +71,6 @@ public interface ILinearize { public static List<Lop> linearize(List<Lop> v) { try { - DMLConfig dmlConfig = ConfigurationManager.getDMLConfig(); DagLinearization linearization = ConfigurationManager.getLinearizationOrder(); switch(linearization) { @@ -324,6 +322,7 @@ public interface ILinearize { return nodesWithBroadcast; } + @SuppressWarnings("unused") private static List<Lop> addAsyncEagerCheckpointLop(List<Lop> nodes) { List<Lop> nodesWithCheckpoint = new ArrayList<>(); // Find the Spark action nodes 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 b2f4cd5123..f075eea78a 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 @@ -604,6 +604,8 @@ public class ExecutionContext { 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); } diff --git a/src/main/java/org/apache/sysds/runtime/controlprogram/context/MatrixObjectFuture.java b/src/main/java/org/apache/sysds/runtime/controlprogram/context/MatrixObjectFuture.java index 3c5581937b..6ee9c1953c 100644 --- a/src/main/java/org/apache/sysds/runtime/controlprogram/context/MatrixObjectFuture.java +++ b/src/main/java/org/apache/sysds/runtime/controlprogram/context/MatrixObjectFuture.java @@ -29,6 +29,7 @@ import java.util.concurrent.Future; public class MatrixObjectFuture extends MatrixObject { + private static final long serialVersionUID = 8016955240352642173L; protected Future<MatrixBlock> _futureData; public MatrixObjectFuture(ValueType vt, String file, Future<MatrixBlock> fmb) { diff --git a/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederationMap.java b/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederationMap.java index 47533b1964..d1fa57829a 100644 --- a/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederationMap.java +++ b/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederationMap.java @@ -39,15 +39,12 @@ import org.apache.sysds.hops.fedplanner.FTypes.FType; import org.apache.sysds.lops.RightIndex; import org.apache.sysds.runtime.DMLRuntimeException; import org.apache.sysds.runtime.controlprogram.caching.CacheBlock; -import org.apache.sysds.runtime.controlprogram.caching.CacheBlockFactory; import org.apache.sysds.runtime.controlprogram.caching.CacheableData; import org.apache.sysds.runtime.controlprogram.federated.FederatedRequest.RequestType; -import org.apache.sysds.runtime.frame.data.FrameBlock; import org.apache.sysds.runtime.instructions.cp.CPOperand; import org.apache.sysds.runtime.instructions.cp.ScalarObject; import org.apache.sysds.runtime.instructions.cp.VariableCPInstruction; import org.apache.sysds.runtime.lineage.LineageItem; -import org.apache.sysds.runtime.matrix.data.MatrixBlock; import org.apache.sysds.runtime.util.CommonThreadPool; import org.apache.sysds.runtime.util.IndexRange; diff --git a/src/main/java/org/apache/sysds/runtime/instructions/fed/MultiReturnParameterizedBuiltinFEDInstruction.java b/src/main/java/org/apache/sysds/runtime/instructions/fed/MultiReturnParameterizedBuiltinFEDInstruction.java index 2b14bd68d4..416c2838af 100644 --- a/src/main/java/org/apache/sysds/runtime/instructions/fed/MultiReturnParameterizedBuiltinFEDInstruction.java +++ b/src/main/java/org/apache/sysds/runtime/instructions/fed/MultiReturnParameterizedBuiltinFEDInstruction.java @@ -37,7 +37,6 @@ import org.apache.sysds.common.Types.DataType; import org.apache.sysds.common.Types.ValueType; import org.apache.sysds.hops.fedplanner.FTypes; import org.apache.sysds.hops.fedplanner.FTypes.FType; -import org.apache.sysds.hops.OptimizerUtils; import org.apache.sysds.lops.PickByCount; import org.apache.sysds.runtime.DMLRuntimeException; import org.apache.sysds.runtime.controlprogram.caching.CacheableData; diff --git a/src/main/java/org/apache/sysds/runtime/io/FrameReader.java b/src/main/java/org/apache/sysds/runtime/io/FrameReader.java index 00f95e2cb2..db03d36f30 100644 --- a/src/main/java/org/apache/sysds/runtime/io/FrameReader.java +++ b/src/main/java/org/apache/sysds/runtime/io/FrameReader.java @@ -22,7 +22,6 @@ package org.apache.sysds.runtime.io; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; -import java.util.Arrays; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/org/apache/sysds/runtime/lineage/LineageCache.java b/src/main/java/org/apache/sysds/runtime/lineage/LineageCache.java index 87ddd7b8da..5e35181a04 100644 --- a/src/main/java/org/apache/sysds/runtime/lineage/LineageCache.java +++ b/src/main/java/org/apache/sysds/runtime/lineage/LineageCache.java @@ -39,7 +39,6 @@ import org.apache.sysds.runtime.controlprogram.federated.FederatedStatistics; import org.apache.sysds.runtime.controlprogram.federated.FederatedUDF; import org.apache.sysds.runtime.instructions.CPInstructionParser; import org.apache.sysds.runtime.instructions.Instruction; -import org.apache.sysds.runtime.instructions.cp.BroadcastCPInstruction; import org.apache.sysds.runtime.instructions.cp.CPInstruction.CPType; import org.apache.sysds.runtime.instructions.cp.CPOperand; import org.apache.sysds.runtime.instructions.cp.ComputationCPInstruction; 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 fe32f364e5..e7761b1333 100644 --- a/src/main/java/org/apache/sysds/runtime/lineage/LineageCacheConfig.java +++ b/src/main/java/org/apache/sysds/runtime/lineage/LineageCacheConfig.java @@ -258,6 +258,7 @@ public class LineageCacheConfig } // Check if the Spark instruction returns result back to local + @SuppressWarnings("unused") private static boolean isRightSparkOp(Instruction inst) { if (!(inst instanceof ComputationSPInstruction)) return false; diff --git a/src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java b/src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java index c07464bdee..923fecea8b 100644 --- a/src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java +++ b/src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java @@ -53,7 +53,6 @@ import org.apache.sysds.runtime.compress.DMLCompressionException; import org.apache.sysds.runtime.controlprogram.caching.CacheBlock; import org.apache.sysds.runtime.controlprogram.caching.MatrixObject.UpdateType; import org.apache.sysds.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer; -import org.apache.sysds.runtime.data.Block; import org.apache.sysds.runtime.data.DenseBlock; import org.apache.sysds.runtime.data.DenseBlockFP64; import org.apache.sysds.runtime.data.DenseBlockFactory; diff --git a/src/main/java/org/apache/sysds/runtime/matrix/data/sketch/countdistinct/CountDistinctFunctionSketch.java b/src/main/java/org/apache/sysds/runtime/matrix/data/sketch/countdistinct/CountDistinctFunctionSketch.java index 79c6daf39a..3a3df2a5f9 100644 --- a/src/main/java/org/apache/sysds/runtime/matrix/data/sketch/countdistinct/CountDistinctFunctionSketch.java +++ b/src/main/java/org/apache/sysds/runtime/matrix/data/sketch/countdistinct/CountDistinctFunctionSketch.java @@ -19,8 +19,6 @@ package org.apache.sysds.runtime.matrix.data.sketch.countdistinct; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.sysds.hops.OptimizerUtils; import org.apache.sysds.runtime.instructions.spark.data.CorrMatrixBlock; import org.apache.sysds.runtime.matrix.data.MatrixBlock; @@ -37,7 +35,6 @@ import java.util.stream.Stream; public class CountDistinctFunctionSketch extends CountDistinctSketch { - private static final Log LOG = LogFactory.getLog(CountDistinctFunctionSketch.class.getName()); public CountDistinctFunctionSketch(Operator op) { super(op); } diff --git a/src/main/java/org/apache/sysds/runtime/util/DataConverter.java b/src/main/java/org/apache/sysds/runtime/util/DataConverter.java index c21ef16fb9..c3426fce17 100644 --- a/src/main/java/org/apache/sysds/runtime/util/DataConverter.java +++ b/src/main/java/org/apache/sysds/runtime/util/DataConverter.java @@ -31,8 +31,6 @@ import java.util.Map.Entry; import java.util.StringTokenizer; import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.commons.math3.linear.Array2DRowRealMatrix; import org.apache.commons.math3.linear.BlockRealMatrix; import org.apache.commons.math3.linear.RealMatrix; @@ -83,7 +81,6 @@ import org.apache.sysds.runtime.meta.DataCharacteristics; * */ public class DataConverter { - private static final Log LOG = LogFactory.getLog(DataConverter.class.getName()); private static final String DELIM = " "; ////////////// diff --git a/src/test/java/org/apache/sysds/test/TestUtils.java b/src/test/java/org/apache/sysds/test/TestUtils.java index e4d7f64002..8565a1e2e5 100644 --- a/src/test/java/org/apache/sysds/test/TestUtils.java +++ b/src/test/java/org/apache/sysds/test/TestUtils.java @@ -38,7 +38,6 @@ import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.text.NumberFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; diff --git a/src/test/java/org/apache/sysds/test/functions/async/PrefetchRDDTest.java b/src/test/java/org/apache/sysds/test/functions/async/PrefetchRDDTest.java index 11af05f19d..b37154de75 100644 --- a/src/test/java/org/apache/sysds/test/functions/async/PrefetchRDDTest.java +++ b/src/test/java/org/apache/sysds/test/functions/async/PrefetchRDDTest.java @@ -108,7 +108,7 @@ public class PrefetchRDDTest extends AutomatedTestBase { System.out.println("Value w/o Prefetch "+R+" w/ Prefetch "+R_pf); //assert Prefetch instructions and number of success. long expected_numPF = !testname.equalsIgnoreCase(TEST_NAME+"3") ? 1 : 0; - long expected_successPF = !testname.equalsIgnoreCase(TEST_NAME+"3") ? 1 : 0; + //long expected_successPF = !testname.equalsIgnoreCase(TEST_NAME+"3") ? 1 : 0; long numPF = Statistics.getCPHeavyHitterCount("prefetch"); Assert.assertTrue("Violated Prefetch instruction count: "+numPF, numPF == expected_numPF); //long successPF = SparkStatistics.getAsyncPrefetchCount(); diff --git a/src/test/java/org/apache/sysds/test/functions/frame/FrameIndexingDistTest.java b/src/test/java/org/apache/sysds/test/functions/frame/FrameIndexingDistTest.java index 3ece402f88..d073b5d0c9 100644 --- a/src/test/java/org/apache/sysds/test/functions/frame/FrameIndexingDistTest.java +++ b/src/test/java/org/apache/sysds/test/functions/frame/FrameIndexingDistTest.java @@ -26,8 +26,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.sysds.api.DMLScript; import org.apache.sysds.common.Types.ExecMode; import org.apache.sysds.common.Types.ExecType; diff --git a/src/test/java/org/apache/sysds/test/functions/homomorphicEncryption/InOutTest.java b/src/test/java/org/apache/sysds/test/functions/homomorphicEncryption/InOutTest.java index 0d05a57ad3..b4dd5841f5 100644 --- a/src/test/java/org/apache/sysds/test/functions/homomorphicEncryption/InOutTest.java +++ b/src/test/java/org/apache/sysds/test/functions/homomorphicEncryption/InOutTest.java @@ -19,7 +19,6 @@ package org.apache.sysds.test.functions.homomorphicEncryption; -import org.apache.sysds.api.DMLException; import org.apache.sysds.common.Types; import org.apache.sysds.runtime.controlprogram.caching.MatrixObject; import org.apache.sysds.runtime.controlprogram.paramserv.NativeHEHelper; diff --git a/src/test/java/org/apache/sysds/test/functions/unique/UniqueBase.java b/src/test/java/org/apache/sysds/test/functions/unique/UniqueBase.java index 6b78a60290..d834fe45ae 100644 --- a/src/test/java/org/apache/sysds/test/functions/unique/UniqueBase.java +++ b/src/test/java/org/apache/sysds/test/functions/unique/UniqueBase.java @@ -20,13 +20,10 @@ package org.apache.sysds.test.functions.unique; import org.apache.sysds.common.Types; -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 java.util.HashMap; - public abstract class UniqueBase extends AutomatedTestBase { protected abstract String getTestName();
