This is an automated email from the ASF dual-hosted git repository.
baunsgaard 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 8356ce098f [MINOR] Resolve wildcard imports
8356ce098f is described below
commit 8356ce098fa5011420668f28dbf652aa727e7890
Author: Sebastian Baunsgaard <[email protected]>
AuthorDate: Wed Sep 6 11:57:34 2023 +0200
[MINOR] Resolve wildcard imports
This commit resolve all the wildcard imports in the system (except)
the auto generated files DmlLexer and DmlParser.
---
src/main/java/org/apache/sysds/lops/Sql.java | 12 ++++--
.../paramserv/FederatedPSControlThread.java | 43 +++++++++++++++-------
.../controlprogram/paramserv/ParamServer.java | 7 +++-
.../cp/ParameterizedBuiltinCPInstruction.java | 22 ++++++-----
.../cp/ParamservBuiltinCPInstruction.java | 36 ++++++++++++++++--
.../spark/utils/RDDConverterUtils.java | 5 ++-
.../java/org/apache/sysds/runtime/io/hdf5/H5.java | 7 ++--
.../iogen/template/FrameGenerateReader.java | 17 ++++++---
.../sysds/runtime/lineage/LineageDebugger.java | 18 ++++++---
.../privacy/propagation/PrivacyPropagator.java | 18 ++++++++-
.../transform/encode/ColumnEncoderDummycode.java | 4 +-
.../transform/encode/MultiColumnEncoder.java | 5 ++-
.../org/apache/sysds/runtime/util/AutoDiff.java | 22 +++++++++--
.../setoperations/SetOperationsTestBase.java | 8 +++-
.../sysds/test/functions/frame/TypeOfTest.java | 16 +++++---
.../MatrixMultiplicationPropagatorTest.java | 13 +++++--
.../TransformFrameEncodeWordEmbeddingMMTest.java | 18 +++++----
...ransformFrameEncodeWordEmbeddingRowSumTest.java | 20 ++++++----
18 files changed, 210 insertions(+), 81 deletions(-)
diff --git a/src/main/java/org/apache/sysds/lops/Sql.java
b/src/main/java/org/apache/sysds/lops/Sql.java
index c687346cbf..cd1653891a 100644
--- a/src/main/java/org/apache/sysds/lops/Sql.java
+++ b/src/main/java/org/apache/sysds/lops/Sql.java
@@ -19,13 +19,17 @@
package org.apache.sysds.lops;
-import org.apache.sysds.parser.DataExpression;
-import org.apache.sysds.runtime.instructions.InstructionUtils;
+import static org.apache.sysds.parser.DataExpression.SQL_CONN;
+import static org.apache.sysds.parser.DataExpression.SQL_PASS;
+import static org.apache.sysds.parser.DataExpression.SQL_QUERY;
+import static org.apache.sysds.parser.DataExpression.SQL_USER;
import java.util.HashMap;
-import static org.apache.sysds.common.Types.*;
-import static org.apache.sysds.parser.DataExpression.*;
+import org.apache.sysds.common.Types.DataType;
+import org.apache.sysds.common.Types.ValueType;
+import org.apache.sysds.parser.DataExpression;
+import org.apache.sysds.runtime.instructions.InstructionUtils;
public class Sql extends Lop {
private HashMap<String, Lop> _inputParams;
diff --git
a/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/FederatedPSControlThread.java
b/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/FederatedPSControlThread.java
index 642b08f51a..c7cb14f392 100644
---
a/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/FederatedPSControlThread.java
+++
b/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/FederatedPSControlThread.java
@@ -19,6 +19,19 @@
package org.apache.sysds.runtime.controlprogram.paramserv;
+import static org.apache.sysds.runtime.util.ProgramConverter.NEWLINE;
+import static org.apache.sysds.runtime.util.ProgramConverter.PROG_BEGIN;
+import static org.apache.sysds.runtime.util.ProgramConverter.PROG_END;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
import org.apache.commons.lang3.NotImplementedException;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.logging.Log;
@@ -34,32 +47,34 @@ import
org.apache.sysds.runtime.controlprogram.FunctionProgramBlock;
import org.apache.sysds.runtime.controlprogram.ProgramBlock;
import org.apache.sysds.runtime.controlprogram.caching.MatrixObject;
import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
-import org.apache.sysds.runtime.controlprogram.federated.*;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedData;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedRequest;
import
org.apache.sysds.runtime.controlprogram.federated.FederatedRequest.RequestType;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedResponse;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedUDF;
+import org.apache.sysds.runtime.controlprogram.federated.FederationUtils;
import
org.apache.sysds.runtime.controlprogram.paramserv.homomorphicEncryption.PublicKey;
import
org.apache.sysds.runtime.controlprogram.paramserv.homomorphicEncryption.SEALClient;
import org.apache.sysds.runtime.controlprogram.parfor.stat.Timing;
import org.apache.sysds.runtime.functionobjects.Multiply;
import org.apache.sysds.runtime.instructions.Instruction;
import org.apache.sysds.runtime.instructions.InstructionUtils;
-import org.apache.sysds.runtime.instructions.cp.*;
+import org.apache.sysds.runtime.instructions.cp.BooleanObject;
+import org.apache.sysds.runtime.instructions.cp.CPOperand;
+import org.apache.sysds.runtime.instructions.cp.CiphertextMatrix;
+import org.apache.sysds.runtime.instructions.cp.Data;
+import org.apache.sysds.runtime.instructions.cp.DoubleObject;
+import org.apache.sysds.runtime.instructions.cp.FunctionCallCPInstruction;
+import org.apache.sysds.runtime.instructions.cp.IntObject;
+import org.apache.sysds.runtime.instructions.cp.ListObject;
+import org.apache.sysds.runtime.instructions.cp.PlaintextMatrix;
+import org.apache.sysds.runtime.instructions.cp.StringObject;
+import org.apache.sysds.runtime.lineage.LineageItem;
import org.apache.sysds.runtime.matrix.data.MatrixBlock;
import org.apache.sysds.runtime.matrix.operators.RightScalarOperator;
-import org.apache.sysds.runtime.lineage.LineageItem;
import org.apache.sysds.runtime.util.ProgramConverter;
import org.apache.sysds.utils.stats.ParamServStatistics;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import static org.apache.sysds.runtime.util.ProgramConverter.*;
-
public class FederatedPSControlThread extends PSWorker implements
Callable<Void> {
private static final long serialVersionUID = 6846648059569648791L;
protected static final Log LOG =
LogFactory.getLog(ParamServer.class.getName());
diff --git
a/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/ParamServer.java
b/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/ParamServer.java
index dda4a70370..0bbdbee219 100644
---
a/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/ParamServer.java
+++
b/src/main/java/org/apache/sysds/runtime/controlprogram/paramserv/ParamServer.java
@@ -19,14 +19,17 @@
package org.apache.sysds.runtime.controlprogram.paramserv;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import org.apache.commons.lang3.NotImplementedException;
import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.NotImplementedException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sysds.api.DMLScript;
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 18a199e930..b0c86efdbd 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
@@ -19,6 +19,14 @@
package org.apache.sysds.runtime.instructions.cp;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -30,7 +38,11 @@ import org.apache.sysds.lops.Lop;
import org.apache.sysds.parser.ParameterizedBuiltinFunctionExpression;
import org.apache.sysds.parser.Statement;
import org.apache.sysds.runtime.DMLRuntimeException;
-import org.apache.sysds.runtime.controlprogram.caching.*;
+import org.apache.sysds.runtime.controlprogram.caching.CacheBlock;
+import org.apache.sysds.runtime.controlprogram.caching.CacheableData;
+import org.apache.sysds.runtime.controlprogram.caching.FrameObject;
+import org.apache.sysds.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysds.runtime.controlprogram.caching.TensorObject;
import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
import org.apache.sysds.runtime.controlprogram.context.ExecutionContextFactory;
import org.apache.sysds.runtime.data.TensorBlock;
@@ -54,14 +66,6 @@ import
org.apache.sysds.runtime.transform.tokenize.TokenizerFactory;
import org.apache.sysds.runtime.util.AutoDiff;
import org.apache.sysds.runtime.util.DataConverter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
public class ParameterizedBuiltinCPInstruction extends
ComputationCPInstruction {
private static final Log LOG =
LogFactory.getLog(ParameterizedBuiltinCPInstruction.class.getName());
private static final int TOSTRING_MAXROWS = 100;
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/cp/ParamservBuiltinCPInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/cp/ParamservBuiltinCPInstruction.java
index 51db6ed751..229d216437 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/cp/ParamservBuiltinCPInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/cp/ParamservBuiltinCPInstruction.java
@@ -19,6 +19,30 @@
package org.apache.sysds.runtime.instructions.cp;
+import static org.apache.sysds.parser.Statement.PS_AGGREGATION_FUN;
+import static org.apache.sysds.parser.Statement.PS_BATCH_SIZE;
+import static org.apache.sysds.parser.Statement.PS_EPOCHS;
+import static org.apache.sysds.parser.Statement.PS_FEATURES;
+import static org.apache.sysds.parser.Statement.PS_FED_RUNTIME_BALANCING;
+import static org.apache.sysds.parser.Statement.PS_FED_WEIGHTING;
+import static org.apache.sysds.parser.Statement.PS_FREQUENCY;
+import static org.apache.sysds.parser.Statement.PS_HE;
+import static org.apache.sysds.parser.Statement.PS_HYPER_PARAMS;
+import static org.apache.sysds.parser.Statement.PS_LABELS;
+import static org.apache.sysds.parser.Statement.PS_MODE;
+import static org.apache.sysds.parser.Statement.PS_MODEL;
+import static org.apache.sysds.parser.Statement.PS_MODELAVG;
+import static org.apache.sysds.parser.Statement.PS_NBATCHES;
+import static org.apache.sysds.parser.Statement.PS_NUM_BACKUP_WORKERS;
+import static org.apache.sysds.parser.Statement.PS_PARALLELISM;
+import static org.apache.sysds.parser.Statement.PS_SCHEME;
+import static org.apache.sysds.parser.Statement.PS_SEED;
+import static org.apache.sysds.parser.Statement.PS_UPDATE_FUN;
+import static org.apache.sysds.parser.Statement.PS_UPDATE_TYPE;
+import static org.apache.sysds.parser.Statement.PS_VAL_FEATURES;
+import static org.apache.sysds.parser.Statement.PS_VAL_FUN;
+import static org.apache.sysds.parser.Statement.PS_VAL_LABELS;
+
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -49,7 +73,15 @@ import
org.apache.sysds.runtime.controlprogram.LocalVariableMap;
import org.apache.sysds.runtime.controlprogram.caching.MatrixObject;
import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
import org.apache.sysds.runtime.controlprogram.context.SparkExecutionContext;
-import org.apache.sysds.runtime.controlprogram.paramserv.*;
+import
org.apache.sysds.runtime.controlprogram.paramserv.FederatedPSControlThread;
+import org.apache.sysds.runtime.controlprogram.paramserv.HEParamServer;
+import org.apache.sysds.runtime.controlprogram.paramserv.LocalPSWorker;
+import org.apache.sysds.runtime.controlprogram.paramserv.LocalParamServer;
+import org.apache.sysds.runtime.controlprogram.paramserv.ParamServer;
+import org.apache.sysds.runtime.controlprogram.paramserv.ParamservUtils;
+import org.apache.sysds.runtime.controlprogram.paramserv.SparkPSBody;
+import org.apache.sysds.runtime.controlprogram.paramserv.SparkPSWorker;
+import org.apache.sysds.runtime.controlprogram.paramserv.SparkParamservUtils;
import
org.apache.sysds.runtime.controlprogram.paramserv.dp.DataPartitionFederatedScheme;
import
org.apache.sysds.runtime.controlprogram.paramserv.dp.DataPartitionLocalScheme;
import
org.apache.sysds.runtime.controlprogram.paramserv.dp.FederatedDataPartitioner;
@@ -63,8 +95,6 @@ import org.apache.sysds.runtime.privacy.PrivacyConstraint;
import org.apache.sysds.runtime.util.ProgramConverter;
import org.apache.sysds.utils.stats.ParamServStatistics;
-import static org.apache.sysds.parser.Statement.*;
-
public class ParamservBuiltinCPInstruction extends
ParameterizedBuiltinCPInstruction {
private static final Log LOG =
LogFactory.getLog(ParamservBuiltinCPInstruction.class.getName());
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/spark/utils/RDDConverterUtils.java
b/src/main/java/org/apache/sysds/runtime/instructions/spark/utils/RDDConverterUtils.java
index 7874e90f50..7c49c104c1 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/spark/utils/RDDConverterUtils.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/spark/utils/RDDConverterUtils.java
@@ -32,7 +32,10 @@ import org.apache.hadoop.mapred.SequenceFileOutputFormat;
import org.apache.spark.api.java.JavaPairRDD;
import org.apache.spark.api.java.JavaRDD;
import org.apache.spark.api.java.JavaSparkContext;
-import org.apache.spark.api.java.function.*;
+import org.apache.spark.api.java.function.FlatMapFunction;
+import org.apache.spark.api.java.function.Function;
+import org.apache.spark.api.java.function.PairFlatMapFunction;
+import org.apache.spark.api.java.function.PairFunction;
import org.apache.spark.ml.feature.LabeledPoint;
import org.apache.spark.ml.linalg.DenseVector;
import org.apache.spark.ml.linalg.SparseVector;
diff --git a/src/main/java/org/apache/sysds/runtime/io/hdf5/H5.java
b/src/main/java/org/apache/sysds/runtime/io/hdf5/H5.java
index 858f18c39c..0ab909f0a3 100644
--- a/src/main/java/org/apache/sysds/runtime/io/hdf5/H5.java
+++ b/src/main/java/org/apache/sysds/runtime/io/hdf5/H5.java
@@ -19,12 +19,13 @@
package org.apache.sysds.runtime.io.hdf5;
-import org.apache.sysds.runtime.io.hdf5.message.H5SymbolTableMessage;
-
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
import java.nio.ByteBuffer;
import java.util.List;
+import org.apache.sysds.runtime.io.hdf5.message.H5SymbolTableMessage;
+
public class H5 {
// H5 format write/read steps:
diff --git
a/src/main/java/org/apache/sysds/runtime/iogen/template/FrameGenerateReader.java
b/src/main/java/org/apache/sysds/runtime/iogen/template/FrameGenerateReader.java
index 76439cfa8c..3f725e41e8 100644
---
a/src/main/java/org/apache/sysds/runtime/iogen/template/FrameGenerateReader.java
+++
b/src/main/java/org/apache/sysds/runtime/iogen/template/FrameGenerateReader.java
@@ -19,26 +19,31 @@
package org.apache.sysds.runtime.iogen.template;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
-import org.apache.hadoop.mapred.*;
+import org.apache.hadoop.mapred.FileInputFormat;
+import org.apache.hadoop.mapred.InputSplit;
+import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapred.RecordReader;
+import org.apache.hadoop.mapred.Reporter;
+import org.apache.hadoop.mapred.TextInputFormat;
import org.apache.sysds.common.Types;
import org.apache.sysds.conf.ConfigurationManager;
import org.apache.sysds.runtime.DMLRuntimeException;
+import org.apache.sysds.runtime.frame.data.FrameBlock;
import org.apache.sysds.runtime.io.FrameReader;
import org.apache.sysds.runtime.io.IOUtilFunctions;
import org.apache.sysds.runtime.iogen.CustomProperties;
import org.apache.sysds.runtime.iogen.RowIndexStructure;
-import org.apache.sysds.runtime.frame.data.FrameBlock;
import org.apache.sysds.runtime.matrix.data.Pair;
import org.apache.sysds.runtime.util.InputStreamInputFormat;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-
public abstract class FrameGenerateReader extends FrameReader {
protected CustomProperties _props;
diff --git
a/src/main/java/org/apache/sysds/runtime/lineage/LineageDebugger.java
b/src/main/java/org/apache/sysds/runtime/lineage/LineageDebugger.java
index 1730c5a45a..9fb63657de 100644
--- a/src/main/java/org/apache/sysds/runtime/lineage/LineageDebugger.java
+++ b/src/main/java/org/apache/sysds/runtime/lineage/LineageDebugger.java
@@ -20,17 +20,23 @@
package org.apache.sysds.runtime.lineage;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.Queue;
+
import org.apache.sysds.runtime.controlprogram.caching.CacheableData;
import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
import org.apache.sysds.runtime.instructions.Instruction;
-import org.apache.sysds.runtime.instructions.cp.*;
+import org.apache.sysds.runtime.instructions.cp.BuiltinNaryCPInstruction;
+import org.apache.sysds.runtime.instructions.cp.CPOperand;
+import org.apache.sysds.runtime.instructions.cp.ComputationCPInstruction;
+import
org.apache.sysds.runtime.instructions.cp.MultiReturnBuiltinCPInstruction;
+import
org.apache.sysds.runtime.instructions.cp.MultiReturnParameterizedBuiltinCPInstruction;
+import org.apache.sysds.runtime.instructions.cp.SqlCPInstruction;
+import org.apache.sysds.runtime.instructions.cp.VariableCPInstruction;
import org.apache.sysds.runtime.matrix.data.MatrixBlock;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Queue;
-import java.util.LinkedList;
-
public class LineageDebugger {
public static final int POS_NAN = 0;
public static final int POS_POSITIVE_INFINITY = 1;
diff --git
a/src/main/java/org/apache/sysds/runtime/privacy/propagation/PrivacyPropagator.java
b/src/main/java/org/apache/sysds/runtime/privacy/propagation/PrivacyPropagator.java
index 673bc9d9cd..09c6a8786a 100644
---
a/src/main/java/org/apache/sysds/runtime/privacy/propagation/PrivacyPropagator.java
+++
b/src/main/java/org/apache/sysds/runtime/privacy/propagation/PrivacyPropagator.java
@@ -44,7 +44,23 @@ import org.apache.sysds.hops.UnaryOp;
import org.apache.sysds.parser.DataExpression;
import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
import org.apache.sysds.runtime.instructions.Instruction;
-import org.apache.sysds.runtime.instructions.cp.*;
+import org.apache.sysds.runtime.instructions.cp.AggregateBinaryCPInstruction;
+import org.apache.sysds.runtime.instructions.cp.AppendCPInstruction;
+import org.apache.sysds.runtime.instructions.cp.BuiltinNaryCPInstruction;
+import org.apache.sysds.runtime.instructions.cp.CPInstruction;
+import org.apache.sysds.runtime.instructions.cp.CPOperand;
+import org.apache.sysds.runtime.instructions.cp.ComputationCPInstruction;
+import org.apache.sysds.runtime.instructions.cp.Data;
+import org.apache.sysds.runtime.instructions.cp.FunctionCallCPInstruction;
+import org.apache.sysds.runtime.instructions.cp.ListAppendRemoveCPInstruction;
+import org.apache.sysds.runtime.instructions.cp.ListObject;
+import org.apache.sysds.runtime.instructions.cp.MMChainCPInstruction;
+import org.apache.sysds.runtime.instructions.cp.MMTSJCPInstruction;
+import
org.apache.sysds.runtime.instructions.cp.MultiReturnBuiltinCPInstruction;
+import
org.apache.sysds.runtime.instructions.cp.MultiReturnParameterizedBuiltinCPInstruction;
+import org.apache.sysds.runtime.instructions.cp.ScalarObject;
+import org.apache.sysds.runtime.instructions.cp.SqlCPInstruction;
+import org.apache.sysds.runtime.instructions.cp.VariableCPInstruction;
import org.apache.sysds.runtime.matrix.data.MatrixBlock;
import org.apache.sysds.runtime.privacy.DMLPrivacyException;
import org.apache.sysds.runtime.privacy.PrivacyConstraint;
diff --git
a/src/main/java/org/apache/sysds/runtime/transform/encode/ColumnEncoderDummycode.java
b/src/main/java/org/apache/sysds/runtime/transform/encode/ColumnEncoderDummycode.java
index f30743ff27..160b716496 100644
---
a/src/main/java/org/apache/sysds/runtime/transform/encode/ColumnEncoderDummycode.java
+++
b/src/main/java/org/apache/sysds/runtime/transform/encode/ColumnEncoderDummycode.java
@@ -24,7 +24,9 @@ import static
org.apache.sysds.runtime.util.UtilFunctions.getEndIndex;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
import org.apache.sysds.api.DMLScript;
import org.apache.sysds.runtime.DMLRuntimeException;
diff --git
a/src/main/java/org/apache/sysds/runtime/transform/encode/MultiColumnEncoder.java
b/src/main/java/org/apache/sysds/runtime/transform/encode/MultiColumnEncoder.java
index 7a2cc1d660..def429d57b 100644
---
a/src/main/java/org/apache/sysds/runtime/transform/encode/MultiColumnEncoder.java
+++
b/src/main/java/org/apache/sysds/runtime/transform/encode/MultiColumnEncoder.java
@@ -30,7 +30,10 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Collectors;
diff --git a/src/main/java/org/apache/sysds/runtime/util/AutoDiff.java
b/src/main/java/org/apache/sysds/runtime/util/AutoDiff.java
index 3f45253de3..36d12772c5 100644
--- a/src/main/java/org/apache/sysds/runtime/util/AutoDiff.java
+++ b/src/main/java/org/apache/sysds/runtime/util/AutoDiff.java
@@ -19,9 +19,19 @@
package org.apache.sysds.runtime.util;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+
import org.apache.commons.lang3.mutable.MutableInt;
import org.apache.sysds.common.Types;
-import org.apache.sysds.hops.*;
+import org.apache.sysds.hops.DataGenOp;
+import org.apache.sysds.hops.DataOp;
+import org.apache.sysds.hops.Hop;
+import org.apache.sysds.hops.LiteralOp;
+import org.apache.sysds.hops.ReorgOp;
import org.apache.sysds.hops.recompile.Recompiler;
import org.apache.sysds.hops.rewrite.HopRewriteUtils;
import org.apache.sysds.parser.DataExpression;
@@ -34,14 +44,18 @@ import
org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
import org.apache.sysds.runtime.instructions.Instruction;
import org.apache.sysds.runtime.instructions.InstructionParser;
import org.apache.sysds.runtime.instructions.InstructionUtils;
-import org.apache.sysds.runtime.instructions.cp.*;
+import org.apache.sysds.runtime.instructions.cp.CPInstruction;
+import org.apache.sysds.runtime.instructions.cp.CPOperand;
+import org.apache.sysds.runtime.instructions.cp.Data;
+import org.apache.sysds.runtime.instructions.cp.DataGenCPInstruction;
+import org.apache.sysds.runtime.instructions.cp.ListObject;
+import org.apache.sysds.runtime.instructions.cp.ScalarObjectFactory;
+import org.apache.sysds.runtime.instructions.cp.VariableCPInstruction;
import org.apache.sysds.runtime.instructions.spark.RandSPInstruction;
import org.apache.sysds.runtime.lineage.LineageItem;
import org.apache.sysds.runtime.lineage.LineageParser;
import org.apache.sysds.utils.Explain;
-import java.util.*;
-
public class AutoDiff {
private static final String ADVARPREFIX = "adVar";
private static final boolean DEBUG = false;
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/setoperations/SetOperationsTestBase.java
b/src/test/java/org/apache/sysds/test/functions/builtin/setoperations/SetOperationsTestBase.java
index 3c42aa29c8..f8d2a44b61 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/setoperations/SetOperationsTestBase.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/setoperations/SetOperationsTestBase.java
@@ -19,6 +19,12 @@
package org.apache.sysds.test.functions.builtin.setoperations;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+
import org.apache.sysds.common.Types;
import org.apache.sysds.common.Types.ExecType;
import org.apache.sysds.runtime.matrix.data.MatrixValue;
@@ -30,8 +36,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import java.util.*;
-
@RunWith(Parameterized.class)
@net.jcip.annotations.NotThreadSafe
public abstract class SetOperationsTestBase extends AutomatedTestBase {
diff --git
a/src/test/java/org/apache/sysds/test/functions/frame/TypeOfTest.java
b/src/test/java/org/apache/sysds/test/functions/frame/TypeOfTest.java
index c94bfdc6fb..5c59403734 100644
--- a/src/test/java/org/apache/sysds/test/functions/frame/TypeOfTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/frame/TypeOfTest.java
@@ -19,22 +19,26 @@
package org.apache.sysds.test.functions.frame;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
import org.apache.sysds.api.DMLScript;
import org.apache.sysds.common.Types;
-import org.apache.sysds.common.Types.FileFormat;
import org.apache.sysds.common.Types.ExecType;
+import org.apache.sysds.common.Types.FileFormat;
import org.apache.sysds.runtime.frame.data.FrameBlock;
-import org.apache.sysds.runtime.io.*;
+import org.apache.sysds.runtime.io.FrameReader;
+import org.apache.sysds.runtime.io.FrameReaderBinaryBlock;
+import org.apache.sysds.runtime.io.FrameReaderFactory;
+import org.apache.sysds.runtime.io.FrameWriter;
+import org.apache.sysds.runtime.io.FrameWriterFactory;
import org.apache.sysds.runtime.meta.MatrixCharacteristics;
import org.apache.sysds.runtime.util.HDFSTool;
import org.apache.sysds.runtime.util.UtilFunctions;
import org.apache.sysds.test.AutomatedTestBase;
import org.apache.sysds.test.TestConfiguration;
import org.apache.sysds.test.TestUtils;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
public class TypeOfTest extends AutomatedTestBase {
private final static String TEST_NAME = "TypeOf";
diff --git
a/src/test/java/org/apache/sysds/test/functions/privacy/propagation/MatrixMultiplicationPropagatorTest.java
b/src/test/java/org/apache/sysds/test/functions/privacy/propagation/MatrixMultiplicationPropagatorTest.java
index 6174d5e2dc..a9c29af65c 100644
---
a/src/test/java/org/apache/sysds/test/functions/privacy/propagation/MatrixMultiplicationPropagatorTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/privacy/propagation/MatrixMultiplicationPropagatorTest.java
@@ -19,6 +19,11 @@
package org.apache.sysds.test.functions.privacy.propagation;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.List;
import java.util.Map;
import java.util.stream.Stream;
@@ -27,14 +32,16 @@ import org.apache.sysds.runtime.data.DenseBlock;
import org.apache.sysds.runtime.data.DenseBlockLFP64;
import org.apache.sysds.runtime.matrix.data.MatrixBlock;
import org.apache.sysds.runtime.privacy.PrivacyConstraint;
-import org.apache.sysds.runtime.privacy.propagation.*;
import org.apache.sysds.runtime.privacy.PrivacyConstraint.PrivacyLevel;
import org.apache.sysds.runtime.privacy.finegrained.DataRange;
+import
org.apache.sysds.runtime.privacy.propagation.MatrixMultiplicationPropagator;
+import
org.apache.sysds.runtime.privacy.propagation.MatrixMultiplicationPropagatorNaive;
+import
org.apache.sysds.runtime.privacy.propagation.MatrixMultiplicationPropagatorPrivateFirst;
+import
org.apache.sysds.runtime.privacy.propagation.MatrixMultiplicationPropagatorPrivateFirstOptimized;
+import org.apache.sysds.runtime.privacy.propagation.OperatorType;
import org.apache.sysds.test.AutomatedTestBase;
import org.junit.Test;
-import static org.junit.Assert.*;
-
public class MatrixMultiplicationPropagatorTest extends AutomatedTestBase {
@Override
diff --git
a/src/test/java/org/apache/sysds/test/functions/transform/TransformFrameEncodeWordEmbeddingMMTest.java
b/src/test/java/org/apache/sysds/test/functions/transform/TransformFrameEncodeWordEmbeddingMMTest.java
index 1359497a93..79c7fdf388 100644
---
a/src/test/java/org/apache/sysds/test/functions/transform/TransformFrameEncodeWordEmbeddingMMTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/transform/TransformFrameEncodeWordEmbeddingMMTest.java
@@ -20,19 +20,23 @@
package org.apache.sysds.test.functions.transform;
-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 org.junit.Test;
+import static
org.apache.sysds.test.functions.transform.TransformFrameEncodeWordEmbedding2Test.generateRandomStrings;
+import static
org.apache.sysds.test.functions.transform.TransformFrameEncodeWordEmbedding2Test.manuallyDeriveWordEmbeddings;
+import static
org.apache.sysds.test.functions.transform.TransformFrameEncodeWordEmbedding2Test.shuffleAndMultiplyStrings;
+import static
org.apache.sysds.test.functions.transform.TransformFrameEncodeWordEmbedding2Test.writeDictToCsvFile;
+import static
org.apache.sysds.test.functions.transform.TransformFrameEncodeWordEmbedding2Test.writeStringsToCsvFile;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static
org.apache.sysds.test.functions.transform.TransformFrameEncodeWordEmbedding2Test.*;
+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 org.junit.Test;
public class TransformFrameEncodeWordEmbeddingMMTest extends AutomatedTestBase
{
private final static String TEST_NAME1 =
"TransformFrameEncodeWordEmbeddingsMM";
diff --git
a/src/test/java/org/apache/sysds/test/functions/transform/TransformFrameEncodeWordEmbeddingRowSumTest.java
b/src/test/java/org/apache/sysds/test/functions/transform/TransformFrameEncodeWordEmbeddingRowSumTest.java
index 31916821f6..1d07469484 100644
---
a/src/test/java/org/apache/sysds/test/functions/transform/TransformFrameEncodeWordEmbeddingRowSumTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/transform/TransformFrameEncodeWordEmbeddingRowSumTest.java
@@ -19,6 +19,18 @@
package org.apache.sysds.test.functions.transform;
+import static
org.apache.sysds.runtime.functionobjects.KahanPlus.getKahanPlusFnObject;
+import static
org.apache.sysds.test.functions.transform.TransformFrameEncodeWordEmbedding2Test.generateRandomStrings;
+import static
org.apache.sysds.test.functions.transform.TransformFrameEncodeWordEmbedding2Test.manuallyDeriveWordEmbeddings;
+import static
org.apache.sysds.test.functions.transform.TransformFrameEncodeWordEmbedding2Test.shuffleAndMultiplyStrings;
+import static
org.apache.sysds.test.functions.transform.TransformFrameEncodeWordEmbedding2Test.writeDictToCsvFile;
+import static
org.apache.sysds.test.functions.transform.TransformFrameEncodeWordEmbedding2Test.writeStringsToCsvFile;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.sysds.common.Types;
import org.apache.sysds.runtime.functionobjects.KahanPlus;
import org.apache.sysds.runtime.instructions.cp.KahanObject;
@@ -28,14 +40,6 @@ import org.apache.sysds.test.TestConfiguration;
import org.apache.sysds.test.TestUtils;
import org.junit.Test;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static
org.apache.sysds.runtime.functionobjects.KahanPlus.getKahanPlusFnObject;
-import static
org.apache.sysds.test.functions.transform.TransformFrameEncodeWordEmbedding2Test.*;
-
public class TransformFrameEncodeWordEmbeddingRowSumTest extends
AutomatedTestBase {
private final static String TEST_NAME1 =
"TransformFrameEncodeWordEmbeddingsRowSum";
private final static String TEST_NAME2 =
"TransformFrameEncodeWordEmbeddingsColSum";
