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 e4f988d251dbb6d73c05a3f5267a221c13dfef40 Author: Matthias Boehm <[email protected]> AuthorDate: Thu Aug 10 12:08:32 2023 +0200 [MINOR] Fix warnings and code quality issues --- src/main/java/org/apache/sysds/hops/DnnOp.java | 3 +-- .../org/apache/sysds/runtime/frame/data/FrameBlock.java | 8 +++----- .../org/apache/sysds/runtime/iogen/FormatIdentifyer.java | 16 ++++++++-------- .../java/org/apache/sysds/runtime/iogen/RawIndex.java | 2 +- .../runtime/iogen/template/MatrixGenerateReader.java | 2 +- .../java/org/apache/sysds/performance/TimingUtils.java | 2 +- .../apache/sysds/performance/compression/APerfTest.java | 2 +- .../sysds/performance/compression/IOBandwidth.java | 2 +- .../apache/sysds/performance/compression/Serialize.java | 2 +- .../org/apache/sysds/test/component/misc/ThreadPool.java | 4 ++-- 10 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/apache/sysds/hops/DnnOp.java b/src/main/java/org/apache/sysds/hops/DnnOp.java index 8c51619dcc..3502696583 100644 --- a/src/main/java/org/apache/sysds/hops/DnnOp.java +++ b/src/main/java/org/apache/sysds/hops/DnnOp.java @@ -598,7 +598,6 @@ public class DnnOp extends MultiThreadedHop { // filter_shape1, filter_shape2, filter_shape3, filter_shape4 DnnParameters parseInput() { - Hop imageHeightHop = null; Hop filterHeightHop = null; if(op == OpOpDnn.MAX_POOL_BACKWARD || op == OpOpDnn.AVG_POOL_BACKWARD || op == OpOpDnn.CONV2D || op == OpOpDnn.CONV2D_BACKWARD_FILTER @@ -641,7 +640,7 @@ public class DnnOp extends MultiThreadedHop { } } - if(imageHeightHop == filterHeightHop && _cachedParams.R < 0 && _cachedParams.H > 0) { + if(_cachedParams.R < 0 && _cachedParams.H > 0) { // Unknown R, but known H and both are equal // This happens for one-dimensional conv2d where H=R and H can be inferred from the parent hop _cachedParams.R = _cachedParams.H; diff --git a/src/main/java/org/apache/sysds/runtime/frame/data/FrameBlock.java b/src/main/java/org/apache/sysds/runtime/frame/data/FrameBlock.java index 94ab8f00de..2b32921881 100644 --- a/src/main/java/org/apache/sysds/runtime/frame/data/FrameBlock.java +++ b/src/main/java/org/apache/sysds/runtime/frame/data/FrameBlock.java @@ -701,11 +701,9 @@ public class FrameBlock implements CacheBlock<FrameBlock>, Externalizable { Array[] tmpData = new Array[ncol]; for(int j = 0; j < ncol; j++) tmpData[j] = ArrayFactory.create(cols[j]); - _colnames = empty ? null : (String[]) ArrayUtils.addAll(getColumnNames(), createColNames(getNumColumns(), ncol)); // before - // schema - // modification - _schema = empty ? tmpSchema : (ValueType[]) ArrayUtils.addAll(_schema, tmpSchema); - _coldata = empty ? tmpData : (Array[]) ArrayUtils.addAll(_coldata, tmpData); + _colnames = empty ? null : ArrayUtils.addAll(getColumnNames(), createColNames(getNumColumns(), ncol)); // before schema modification + _schema = empty ? tmpSchema : ArrayUtils.addAll(_schema, tmpSchema); + _coldata = empty ? tmpData : ArrayUtils.addAll(_coldata, tmpData); _nRow = cols[0].length; _msize = -1; } diff --git a/src/main/java/org/apache/sysds/runtime/iogen/FormatIdentifyer.java b/src/main/java/org/apache/sysds/runtime/iogen/FormatIdentifyer.java index 3cbc174d64..95a12516fd 100644 --- a/src/main/java/org/apache/sysds/runtime/iogen/FormatIdentifyer.java +++ b/src/main/java/org/apache/sysds/runtime/iogen/FormatIdentifyer.java @@ -1029,8 +1029,8 @@ public class FormatIdentifyer { private Pair<Set<String>, Set<String>> getNewRefineKeys(LongestCommonSubsequence lcs, String firstKey, ArrayList<String> prefixesRemoved, ArrayList<String> prefixes, Set<String> refineKeys) { - Set<String> setRefineLCS = new HashSet<String>(); - Set<String> newSetRefineLCS = new HashSet<String>(); + Set<String> setRefineLCS = new HashSet<>(); + Set<String> newSetRefineLCS = new HashSet<>(); for(String refineKey : refineKeys) { boolean flagRefine = true; @@ -1054,7 +1054,7 @@ public class FormatIdentifyer { for(int i = 0; i < prefixesRemoved.size() ; i++) { String psStr = prefixesRemoved.get(i).substring(0, firstKey.length()); ArrayList<String> list1 = lcs.getLCS(refineKey, psStr); - Set<String> set = new HashSet<String>(); + Set<String> set = new HashSet<>(); set.addAll(list1); for(String lcsKeys : set) { @@ -1084,7 +1084,7 @@ public class FormatIdentifyer { String str2 = string2.substring(0, string2.length() - firstKey.length()); ArrayList<String> list1 = lcs.getLCS(str1, str2); - Set<String> setLCS = new HashSet<String>(); + Set<String> setLCS = new HashSet<>(); setLCS.addAll(list1); Set<String> refineKeysStep = new HashSet<>(); @@ -1723,26 +1723,26 @@ public class FormatIdentifyer { return result; } - Comparator<ArrayList<String>> AscendingArrayOfStringComparator = new Comparator<ArrayList<String>>() { + Comparator<ArrayList<String>> AscendingArrayOfStringComparator = new Comparator<>() { @Override public int compare(ArrayList<String> strings, ArrayList<String> t1) { return Integer.compare(strings.size(), t1.size()); } }; - Comparator<String> AscendingStringLengthComparator = new Comparator<String>() { + Comparator<String> AscendingStringLengthComparator = new Comparator<>() { @Override public int compare(String s, String t1) { return s.length() - t1.length(); } }; - Comparator<Pair<String, Integer>> AscendingPairStringComparator = new Comparator<Pair<String, Integer>>() { + Comparator<Pair<String, Integer>> AscendingPairStringComparator = new Comparator<>() { @Override public int compare(Pair<String, Integer> stringIntegerPair, Pair<String, Integer> t1) { return stringIntegerPair.getKey().length() - t1.getKey().length(); } }; - Comparator<Pair<String, ArrayList<Integer>>> AscendingPairListComparator = new Comparator<Pair<String, ArrayList<Integer>>>() { + Comparator<Pair<String, ArrayList<Integer>>> AscendingPairListComparator = new Comparator<>() { @Override public int compare(Pair<String, ArrayList<Integer>> stringArrayListPair, Pair<String, ArrayList<Integer>> t1) { boolean flag = true; diff --git a/src/main/java/org/apache/sysds/runtime/iogen/RawIndex.java b/src/main/java/org/apache/sysds/runtime/iogen/RawIndex.java index 943246a4b9..a72a8b709d 100644 --- a/src/main/java/org/apache/sysds/runtime/iogen/RawIndex.java +++ b/src/main/java/org/apache/sysds/runtime/iogen/RawIndex.java @@ -294,7 +294,7 @@ public class RawIndex { private void addActualValueToList(String stringValue, Integer position, HashMap<Double, ArrayList<Pair<Integer, Integer>>> list) { try { double d = UtilFunctions.getDouble(stringValue); - Pair<Integer, Integer> pair = new Pair<Integer, Integer>(position, stringValue.length()); + Pair<Integer, Integer> pair = new Pair<>(position, stringValue.length()); if(!list.containsKey(d)) { ArrayList<Pair<Integer, Integer>> tmpList = new ArrayList<>(); tmpList.add(pair); diff --git a/src/main/java/org/apache/sysds/runtime/iogen/template/MatrixGenerateReader.java b/src/main/java/org/apache/sysds/runtime/iogen/template/MatrixGenerateReader.java index b31630c552..207ad5f18b 100644 --- a/src/main/java/org/apache/sysds/runtime/iogen/template/MatrixGenerateReader.java +++ b/src/main/java/org/apache/sysds/runtime/iogen/template/MatrixGenerateReader.java @@ -252,7 +252,7 @@ public abstract class MatrixGenerateReader extends MatrixReader { catch(Exception e) { throw new IOException("Thread pool Error " + e.getMessage(), e); } - MatrixBlock ret = createOutputMatrixBlock(row, _props.getNcols(), (int) row, estnnz, true, false); + MatrixBlock ret = createOutputMatrixBlock(row, _props.getNcols(), row, estnnz, true, false); return ret; } diff --git a/src/test/java/org/apache/sysds/performance/TimingUtils.java b/src/test/java/org/apache/sysds/performance/TimingUtils.java index ed10b0a1d0..be5268f3ee 100644 --- a/src/test/java/org/apache/sysds/performance/TimingUtils.java +++ b/src/test/java/org/apache/sysds/performance/TimingUtils.java @@ -112,7 +112,7 @@ public interface TimingUtils { private static String statsMeanSTD(double[] v) { final int l = v.length; - final int remove = (int) Math.floor((double) l * 0.05); + final int remove = (int) Math.floor(l * 0.05); Arrays.sort(v); double total = 0; diff --git a/src/test/java/org/apache/sysds/performance/compression/APerfTest.java b/src/test/java/org/apache/sysds/performance/compression/APerfTest.java index de67e9ff7c..c73f7773d2 100644 --- a/src/test/java/org/apache/sysds/performance/compression/APerfTest.java +++ b/src/test/java/org/apache/sysds/performance/compression/APerfTest.java @@ -37,7 +37,7 @@ public abstract class APerfTest<T, G> { protected final int N; protected APerfTest(int N, IGenerate<G> gen) { - ret = new ArrayList<T>(N); + ret = new ArrayList<>(N); this.gen = gen; this.N = N; } diff --git a/src/test/java/org/apache/sysds/performance/compression/IOBandwidth.java b/src/test/java/org/apache/sysds/performance/compression/IOBandwidth.java index c09dddd9b4..f9c67b974c 100644 --- a/src/test/java/org/apache/sysds/performance/compression/IOBandwidth.java +++ b/src/test/java/org/apache/sysds/performance/compression/IOBandwidth.java @@ -164,7 +164,7 @@ public class IOBandwidth extends APerfTest<IOBandwidth.InOut, MatrixBlock> { ret.sort(IOBandwidth::compare); final int l = ret.size(); - final int remove = (int) Math.floor((double) l * 0.05); + final int remove = (int) Math.floor(l * 0.05); final int el = l - remove * 2; diff --git a/src/test/java/org/apache/sysds/performance/compression/Serialize.java b/src/test/java/org/apache/sysds/performance/compression/Serialize.java index 17fc3feda0..5c169c0805 100644 --- a/src/test/java/org/apache/sysds/performance/compression/Serialize.java +++ b/src/test/java/org/apache/sysds/performance/compression/Serialize.java @@ -249,7 +249,7 @@ public class Serialize extends APerfTest<Serialize.InOut, MatrixBlock> { ret.sort(Serialize::compare); final int l = ret.size(); - final int remove = (int) Math.floor((double) l * 0.05); + final int remove = (int) Math.floor(l * 0.05); final int el = l - remove * 2; diff --git a/src/test/java/org/apache/sysds/test/component/misc/ThreadPool.java b/src/test/java/org/apache/sysds/test/component/misc/ThreadPool.java index af6de205d9..41659e5726 100644 --- a/src/test/java/org/apache/sysds/test/component/misc/ThreadPool.java +++ b/src/test/java/org/apache/sysds/test/component/misc/ThreadPool.java @@ -304,7 +304,7 @@ public class ThreadPool { when(p.shutdownNow()).thenReturn(null); assertNull(c.shutdownNow()); - Collection<Callable<Integer>> cc = (Collection<Callable<Integer>>) null; + Collection<Callable<Integer>> cc = null; when(p.invokeAll(cc)).thenReturn(null); assertNull(c.invokeAll(cc)); when(p.invokeAll(cc, 1L, TimeUnit.DAYS)).thenReturn(null); @@ -378,7 +378,7 @@ public class ThreadPool { public void invokeAndShutdown() throws InterruptedException { ExecutorService p = mock(ExecutorService.class); ExecutorService c = new CommonThreadPool(p); - Collection<Callable<Integer>> cc = (Collection<Callable<Integer>>) null; + Collection<Callable<Integer>> cc = null; when(p.invokeAll(cc)).thenReturn(new ArrayList<Future<Integer>>()); CommonThreadPool.invokeAndShutdown(c, null); }
