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 c6be8360cf [MINOR] Various cleanups of prints and formatting
c6be8360cf is described below
commit c6be8360cfaac2a46b8be23150f8d4ca8caf84cf
Author: Sebastian Baunsgaard <[email protected]>
AuthorDate: Mon Jan 6 15:31:19 2025 +0100
[MINOR] Various cleanups of prints and formatting
---
.../apache/sysds/runtime/compress/lib/CLALibDecompress.java | 1 -
.../controlprogram/federated/FederatedWorkloadAnalyzer.java | 3 +--
.../sysds/runtime/frame/data/columns/ArrayWrapper.java | 6 +++---
.../sysds/runtime/frame/data/columns/BooleanArray.java | 2 +-
.../apache/sysds/runtime/frame/data/columns/RaggedArray.java | 5 -----
.../apache/sysds/runtime/frame/data/columns/StringArray.java | 12 +++++-------
.../sysds/runtime/transform/encode/EncoderFactory.java | 4 ++--
.../functions/builtin/part1/BuiltinAdasynRealDataTest.java | 3 ++-
.../federated/paramserv/EncryptedFederatedParamservTest.java | 3 +--
.../federated/paramserv/FederatedParamservTest.java | 1 -
.../functions/transform/TransformFrameEncodeBagOfWords.java | 2 --
11 files changed, 15 insertions(+), 27 deletions(-)
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibDecompress.java
b/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibDecompress.java
index cc585ed58e..1f0c9d9fc4 100644
--- a/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibDecompress.java
+++ b/src/main/java/org/apache/sysds/runtime/compress/lib/CLALibDecompress.java
@@ -367,7 +367,6 @@ public final class CLALibDecompress {
for(int i = 0; i < rlen; i += blklen)
tasks.add(new
DecompressSparseTask(filteredGroups, ret, i, Math.min(i + blklen, rlen)));
- LOG.error("tasks:" + tasks);
for(Future<Object> rt : pool.invokeAll(tasks))
rt.get();
}
diff --git
a/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedWorkloadAnalyzer.java
b/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedWorkloadAnalyzer.java
index 89abacbf19..fc0aa3b1a2 100644
---
a/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedWorkloadAnalyzer.java
+++
b/src/main/java/org/apache/sysds/runtime/controlprogram/federated/FederatedWorkloadAnalyzer.java
@@ -32,7 +32,7 @@ import
org.apache.sysds.runtime.instructions.cp.AggregateBinaryCPInstruction;
import org.apache.sysds.runtime.instructions.cp.ComputationCPInstruction;
public class FederatedWorkloadAnalyzer {
- protected static final Log LOG =
LogFactory.getLog(FederatedWorkerHandler.class.getName());
+ protected static final Log LOG =
LogFactory.getLog(FederatedWorkloadAnalyzer.class.getName());
/** Frequency value for how many instructions before we do a pass for
compression */
private static final int compressRunFrequency = 10;
@@ -49,7 +49,6 @@ public class FederatedWorkloadAnalyzer {
}
public void incrementWorkload(ExecutionContext ec, long tid,
Instruction ins) {
- LOG.error("Increment Workload " + tid + " " + ins + "\n" +
this);
if(ins instanceof ComputationCPInstruction)
incrementWorkload(ec, tid, (ComputationCPInstruction)
ins);
// currently we ignore everything that is not CP instructions
diff --git
a/src/main/java/org/apache/sysds/runtime/frame/data/columns/ArrayWrapper.java
b/src/main/java/org/apache/sysds/runtime/frame/data/columns/ArrayWrapper.java
index bee4b9965b..27c23eb99d 100644
---
a/src/main/java/org/apache/sysds/runtime/frame/data/columns/ArrayWrapper.java
+++
b/src/main/java/org/apache/sysds/runtime/frame/data/columns/ArrayWrapper.java
@@ -27,9 +27,9 @@ import org.apache.hadoop.io.Writable;
public class ArrayWrapper implements Writable {
- public Array<?> _a;
+ public Array<?> _a;
- public ArrayWrapper(Array<?> a){
+ public ArrayWrapper(Array<?> a) {
_a = a;
}
@@ -44,5 +44,5 @@ public class ArrayWrapper implements Writable {
int s = in.readInt();
_a = ArrayFactory.read(in, s);
}
-
+
}
diff --git
a/src/main/java/org/apache/sysds/runtime/frame/data/columns/BooleanArray.java
b/src/main/java/org/apache/sysds/runtime/frame/data/columns/BooleanArray.java
index a0855e6daf..041a780e52 100644
---
a/src/main/java/org/apache/sysds/runtime/frame/data/columns/BooleanArray.java
+++
b/src/main/java/org/apache/sysds/runtime/frame/data/columns/BooleanArray.java
@@ -36,7 +36,7 @@ import org.apache.sysds.utils.MemoryEstimates;
public class BooleanArray extends ABooleanArray {
protected boolean[] _data;
- private BooleanArray(int nRow){
+ private BooleanArray(int nRow) {
this(new boolean[nRow]);
}
diff --git
a/src/main/java/org/apache/sysds/runtime/frame/data/columns/RaggedArray.java
b/src/main/java/org/apache/sysds/runtime/frame/data/columns/RaggedArray.java
index 69266538b4..04a1a2ee5e 100644
--- a/src/main/java/org/apache/sysds/runtime/frame/data/columns/RaggedArray.java
+++ b/src/main/java/org/apache/sysds/runtime/frame/data/columns/RaggedArray.java
@@ -267,11 +267,6 @@ public class RaggedArray<T> extends Array<T> {
return _a.changeTypeBoolean(retA, l, u);
}
- // @Override
- // protected Array<Double> changeTypeDouble() {
- // return _a.changeTypeDouble();
- // }
-
@Override
protected Array<Double> changeTypeDouble(Array<Double> retA, int l, int
u) {
return _a.changeTypeDouble(retA, l, u);
diff --git
a/src/main/java/org/apache/sysds/runtime/frame/data/columns/StringArray.java
b/src/main/java/org/apache/sysds/runtime/frame/data/columns/StringArray.java
index 3bc61155b4..3fb0a4e1da 100644
--- a/src/main/java/org/apache/sysds/runtime/frame/data/columns/StringArray.java
+++ b/src/main/java/org/apache/sysds/runtime/frame/data/columns/StringArray.java
@@ -496,13 +496,11 @@ public class StringArray extends Array<String> {
}
protected void changeTypeIntegerNormal(Array<Integer> ret, int l, int
u) {
-
- for(int i = l; i < u; i++) {
- final String s = _data[i];
- if(s != null)
- ret.set(i, parseInt(s));
- }
-
+ for(int i = l; i < u; i++) {
+ final String s = _data[i];
+ if(s != null)
+ ret.set(i, parseInt(s));
+ }
}
protected int parseInt(String s) {
diff --git
a/src/main/java/org/apache/sysds/runtime/transform/encode/EncoderFactory.java
b/src/main/java/org/apache/sysds/runtime/transform/encode/EncoderFactory.java
index 1c2478d711..1294d0e7e7 100644
---
a/src/main/java/org/apache/sysds/runtime/transform/encode/EncoderFactory.java
+++
b/src/main/java/org/apache/sysds/runtime/transform/encode/EncoderFactory.java
@@ -126,8 +126,8 @@ public interface EncoderFactory {
rcIDs = unionDistinct(rcIDs, except(except(dcIDs,
binIDs), haIDs));
// Error out if the first level encoders have overlaps
if (intersect(rcIDs, binIDs, haIDs, weIDs, bowIDs))
- throw new DMLRuntimeException("More than one
encoders (recode, binning, hashing, word_embedding, bag_of_words) on one column
is not allowed");
-
+ throw new DMLRuntimeException("More than one
encoders (recode, binning, hashing, word_embedding, bag_of_words) on one column
is not allowed:\n" + spec);
+
List<Integer> ptIDs =
except(UtilFunctions.getSeqList(1, clen, 1), naryUnionDistinct(rcIDs, haIDs,
binIDs, weIDs, bowIDs));
List<Integer> oIDs = new
ArrayList<>(Arrays.asList(ArrayUtils
.toObject(TfMetaUtils.parseJsonIDList(jSpec,
colnames, TfMethod.OMIT.toString(), minCol, maxCol))));
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/part1/BuiltinAdasynRealDataTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/part1/BuiltinAdasynRealDataTest.java
index 0646c2f5d1..b816a5dcb8 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/part1/BuiltinAdasynRealDataTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/part1/BuiltinAdasynRealDataTest.java
@@ -86,7 +86,8 @@ public class BuiltinAdasynRealDataTest extends
AutomatedTestBase {
runTest(true, false, null, -1);
double acc = readDMLMatrixFromOutputDir("R").get(new
CellIndex(1,1));
- Assert.assertTrue(acc >= minAcc);
+
+ Assert.assertTrue("Accuracy should be greater than min:
" + acc + " min: " + minAcc, acc >= minAcc);
Assert.assertEquals(0,
Statistics.getNoOfExecutedSPInst());
}
finally {
diff --git
a/src/test/java/org/apache/sysds/test/functions/federated/paramserv/EncryptedFederatedParamservTest.java
b/src/test/java/org/apache/sysds/test/functions/federated/paramserv/EncryptedFederatedParamservTest.java
index 0998bea582..2663b0e762 100644
---
a/src/test/java/org/apache/sysds/test/functions/federated/paramserv/EncryptedFederatedParamservTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/federated/paramserv/EncryptedFederatedParamservTest.java
@@ -160,7 +160,6 @@ public class EncryptedFederatedParamservTest extends
AutomatedTestBase {
threads.add(startLocalFedWorkerThread(port,
i==(_numFederatedWorkers-1) ?
FED_WORKER_WAIT : FED_WORKER_WAIT_S));
ports.add(port);
- System.out.println("Worker with port " + port +
" started!");
if ( threads.get(i).isInterrupted() ||
!threads.get(i).isAlive() )
throw new
DMLRuntimeException("Federated worker thread dead or interrupted! Port " +
port);
@@ -215,7 +214,7 @@ public class EncryptedFederatedParamservTest extends
AutomatedTestBase {
programArgs = programArgsList.toArray(new String[0]);
String log = runTest(null).toString();
- System.out.println(log);
+
if (!heavyHittersContainsAllString("paramserv"))
fail("The following expected heavy hitters are
missing: "
+
Arrays.toString(missingHeavyHitters("paramserv")));
diff --git
a/src/test/java/org/apache/sysds/test/functions/federated/paramserv/FederatedParamservTest.java
b/src/test/java/org/apache/sysds/test/functions/federated/paramserv/FederatedParamservTest.java
index 0bcc117f76..b9877b3f16 100644
---
a/src/test/java/org/apache/sysds/test/functions/federated/paramserv/FederatedParamservTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/federated/paramserv/FederatedParamservTest.java
@@ -154,7 +154,6 @@ public class FederatedParamservTest extends
AutomatedTestBase {
int port = getRandomAvailablePort();
threads.add(startLocalFedWorkerThread(port,
FED_WORKER_WAIT_S));
ports.add(port);
- System.out.println("Worker with port " + port +
" started!");
if ( threads.get(i).isInterrupted() ||
!threads.get(i).isAlive() )
throw new
DMLRuntimeException("Federated worker thread dead or interrupted! Port " +
port);
diff --git
a/src/test/java/org/apache/sysds/test/functions/transform/TransformFrameEncodeBagOfWords.java
b/src/test/java/org/apache/sysds/test/functions/transform/TransformFrameEncodeBagOfWords.java
index 1965d743f7..b8ff0a9b7f 100644
---
a/src/test/java/org/apache/sysds/test/functions/transform/TransformFrameEncodeBagOfWords.java
+++
b/src/test/java/org/apache/sysds/test/functions/transform/TransformFrameEncodeBagOfWords.java
@@ -306,7 +306,6 @@ public class TransformFrameEncodeBagOfWords extends
AutomatedTestBase
String[] tuple = dict.getString(j,
frameCol).split("\u00b7");
indices[i].put(tuple[0],
Integer.parseInt(tuple[1]) - 1);
}
- System.out.println("Bow dict size: " +
indices[i].size());
frameCol++;
if(recodeColumn != null){
for (int j = 0; j < dict.getNumRows(); j++) {
@@ -318,7 +317,6 @@ public class TransformFrameEncodeBagOfWords extends
AutomatedTestBase
}
frameCol++;
}
- System.out.println("Rec dict size: " +
rcdMaps[i].size());
}
// only check the first 100 rows
