This is an automated email from the ASF dual-hosted git repository.
mboehm7 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git
The following commit(s) were added to refs/heads/master by this push:
new 9eb0885 [MINOR] Fix parfor optimizer debug output (opt-log parameter)
9eb0885 is described below
commit 9eb0885b56dc65e41a58d4508d309889c574a3f7
Author: Matthias Boehm <[email protected]>
AuthorDate: Mon Jun 14 23:08:02 2021 +0200
[MINOR] Fix parfor optimizer debug output (opt-log parameter)
Parfor loops allow at a loop-instance level (via parfor(i in 1:n,
log=DEBUG)) to set the log level to focus debugging for parallel plans
on specific instances. The rework of logging, corrupted this
functionality rendering this option mute. This patch re-enables this
existing and documented functionality.
---
.../sysds/runtime/compress/colgroup/ColGroupFactory.java | 1 -
.../sysds/runtime/controlprogram/ParForProgramBlock.java | 2 +-
.../runtime/controlprogram/parfor/opt/OptimizationWrapper.java | 10 ++++++----
.../sysds/runtime/instructions/cp/VariableCPInstruction.java | 2 ++
src/main/java/org/apache/sysds/runtime/io/hdf5/H5BTree.java | 1 +
.../org/apache/sysds/runtime/io/hdf5/H5ContiguousDataset.java | 1 +
.../org/apache/sysds/runtime/io/hdf5/H5RuntimeException.java | 2 ++
.../sysds/test/component/compress/mapping/StandAloneTests.java | 2 +-
8 files changed, 14 insertions(+), 7 deletions(-)
diff --git
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupFactory.java
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupFactory.java
index acd59ad..8e916e2 100644
---
a/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupFactory.java
+++
b/src/main/java/org/apache/sysds/runtime/compress/colgroup/ColGroupFactory.java
@@ -34,7 +34,6 @@ import org.apache.commons.logging.LogFactory;
import org.apache.sysds.runtime.DMLCompressionException;
import org.apache.sysds.runtime.DMLRuntimeException;
import org.apache.sysds.runtime.compress.CompressionSettings;
-import
org.apache.sysds.runtime.compress.cocode.PlanningCoCoder.PartitionerType;
import org.apache.sysds.runtime.compress.colgroup.AColGroup.CompressionType;
import org.apache.sysds.runtime.compress.colgroup.dictionary.ADictionary;
import org.apache.sysds.runtime.compress.colgroup.dictionary.Dictionary;
diff --git
a/src/main/java/org/apache/sysds/runtime/controlprogram/ParForProgramBlock.java
b/src/main/java/org/apache/sysds/runtime/controlprogram/ParForProgramBlock.java
index 088f0e9..25d49bb 100644
---
a/src/main/java/org/apache/sysds/runtime/controlprogram/ParForProgramBlock.java
+++
b/src/main/java/org/apache/sysds/runtime/controlprogram/ParForProgramBlock.java
@@ -585,7 +585,7 @@ public class ParForProgramBlock extends ForProgramBlock
//OPTIMIZATION of ParFOR body (incl all child parfor PBs)
///////
if( _optMode != POptMode.NONE ) {
- // OptimizationWrapper.setLogLevel(_optLogLevel); //set
optimizer log level
+ OptimizationWrapper.setLogLevel(_optLogLevel); //set
optimizer log level
OptimizationWrapper.optimize(_optMode, sb, this, ec,
_monitor); //core optimize
}
diff --git
a/src/main/java/org/apache/sysds/runtime/controlprogram/parfor/opt/OptimizationWrapper.java
b/src/main/java/org/apache/sysds/runtime/controlprogram/parfor/opt/OptimizationWrapper.java
index 62f7e41..7b41353 100644
---
a/src/main/java/org/apache/sysds/runtime/controlprogram/parfor/opt/OptimizationWrapper.java
+++
b/src/main/java/org/apache/sysds/runtime/controlprogram/parfor/opt/OptimizationWrapper.java
@@ -25,6 +25,8 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
import org.apache.sysds.api.DMLScript;
import org.apache.sysds.conf.ConfigurationManager;
import org.apache.sysds.hops.OptimizerUtils;
@@ -110,10 +112,10 @@ public class OptimizationWrapper
StatisticMonitor.putPFStat( pb.getID() , Stat.OPT_T,
timeVal);
}
- // public static void setLogLevel( Level optLogLevel ) {
- //
Logger.getLogger("org.apache.sysds.runtime.controlprogram.parfor.opt")
- // .setLevel( optLogLevel );
- // }
+ public static void setLogLevel( Level optLogLevel ) {
+
Logger.getLogger("org.apache.sysds.runtime.controlprogram.parfor.opt")
+ .setLevel( optLogLevel );
+ }
@SuppressWarnings("unused")
private static void optimize( POptMode otype, int ck, double cm,
ParForStatementBlock sb, ParForProgramBlock pb, ExecutionContext ec, boolean
monitor )
diff --git
a/src/main/java/org/apache/sysds/runtime/instructions/cp/VariableCPInstruction.java
b/src/main/java/org/apache/sysds/runtime/instructions/cp/VariableCPInstruction.java
index 586567b..b5cffd1 100644
---
a/src/main/java/org/apache/sysds/runtime/instructions/cp/VariableCPInstruction.java
+++
b/src/main/java/org/apache/sysds/runtime/instructions/cp/VariableCPInstruction.java
@@ -1146,6 +1146,8 @@ public class VariableCPInstruction extends CPInstruction
implements LineageTrace
FileFormat fmt = ((MetaDataFormat)
mo.getMetaData()).getFileFormat();
DataCharacteristics dc =
(mo.getMetaData()).getDataCharacteristics();
if(fmt == FileFormat.HDF5 &&
!getInput1().getName().startsWith(org.apache.sysds.lops.Data.PREAD_PREFIX)) {
+ //FIXME why is this writer never used?
+ @SuppressWarnings("unused")
WriterHDF5 writer = new
WriterHDF5((FileFormatPropertiesHDF5) _formatProperties);
}
else {
diff --git a/src/main/java/org/apache/sysds/runtime/io/hdf5/H5BTree.java
b/src/main/java/org/apache/sysds/runtime/io/hdf5/H5BTree.java
index 7fc1f32..b111840 100644
--- a/src/main/java/org/apache/sysds/runtime/io/hdf5/H5BTree.java
+++ b/src/main/java/org/apache/sysds/runtime/io/hdf5/H5BTree.java
@@ -30,6 +30,7 @@ public class H5BTree {
private static final byte[] BTREE_NODE_SIGNATURE =
"TREE".getBytes(StandardCharsets.US_ASCII);
private static final int HEADER_BYTES = 6;
+ @SuppressWarnings("unused")
private final long address;
protected final int entriesUsed;
private final long leftSiblingAddress;
diff --git
a/src/main/java/org/apache/sysds/runtime/io/hdf5/H5ContiguousDataset.java
b/src/main/java/org/apache/sysds/runtime/io/hdf5/H5ContiguousDataset.java
index 33441f6..3ae6761 100644
--- a/src/main/java/org/apache/sysds/runtime/io/hdf5/H5ContiguousDataset.java
+++ b/src/main/java/org/apache/sysds/runtime/io/hdf5/H5ContiguousDataset.java
@@ -33,6 +33,7 @@ public class H5ContiguousDataset {
private final H5RootObject rootObject;
private final H5DataLayoutMessage dataLayoutMessage;
private final H5DataTypeMessage dataTypeMessage;
+ @SuppressWarnings("unused")
private final H5DataSpaceMessage dataSpaceMessage;
public H5ContiguousDataset(H5RootObject rootObject, H5ObjectHeader
objectHeader) {
diff --git
a/src/main/java/org/apache/sysds/runtime/io/hdf5/H5RuntimeException.java
b/src/main/java/org/apache/sysds/runtime/io/hdf5/H5RuntimeException.java
index 0edb10c..1244d94 100644
--- a/src/main/java/org/apache/sysds/runtime/io/hdf5/H5RuntimeException.java
+++ b/src/main/java/org/apache/sysds/runtime/io/hdf5/H5RuntimeException.java
@@ -22,6 +22,8 @@ package org.apache.sysds.runtime.io.hdf5;
import org.apache.sysds.runtime.DMLRuntimeException;
public class H5RuntimeException extends DMLRuntimeException {
+ private static final long serialVersionUID = -3551978964353888835L;
+
public H5RuntimeException(String string) {
super(string);
}
diff --git
a/src/test/java/org/apache/sysds/test/component/compress/mapping/StandAloneTests.java
b/src/test/java/org/apache/sysds/test/component/compress/mapping/StandAloneTests.java
index 6916732..9ea31a8 100644
---
a/src/test/java/org/apache/sysds/test/component/compress/mapping/StandAloneTests.java
+++
b/src/test/java/org/apache/sysds/test/component/compress/mapping/StandAloneTests.java
@@ -119,7 +119,7 @@ public class StandAloneTests {
// compare(c, new int[] {0, 1, 1, 1, 1, 0, 0, 0, 0, 0});
}
- private void compare(AMapToData res, int[] expected) {
+ private static void compare(AMapToData res, int[] expected) {
StringBuilder sb = new StringBuilder();
sb.append("\nExpected:\n");
sb.append(Arrays.toString(expected));
