diff --git a/src/main/java/org/apache/sysds/runtime/util/DependencyTask.java b/src/main/java/org/apache/sysds/runtime/util/DependencyTask.java index 943b344502a..e66b90d62c2 100644 --- a/src/main/java/org/apache/sysds/runtime/util/DependencyTask.java +++ b/src/main/java/org/apache/sysds/runtime/util/DependencyTask.java @@ -30,12 +30,12 @@ import org.apache.sysds.runtime.DMLRuntimeException; public class DependencyTask implements Comparable>, Callable { - public static final boolean ENABLE_DEBUG_DATA = false; // explain task graph protected static final Log LOG = LogFactory.getLog(DependencyTask.class.getName()); + /** debugging dependency tasks only used if LOG.isDebugEnabled */ + public List> _dependencyTasks = null; private final Callable _task; protected final List> _dependantTasks; - public List> _dependencyTasks = null; // only for debugging private CompletableFuture> _future; private int _rdy = 0; private Integer _priority = 0; diff --git a/src/main/java/org/apache/sysds/runtime/util/DependencyThreadPool.java b/src/main/java/org/apache/sysds/runtime/util/DependencyThreadPool.java index 1e8f99b655b..699e1eed114 100644 --- a/src/main/java/org/apache/sysds/runtime/util/DependencyThreadPool.java +++ b/src/main/java/org/apache/sysds/runtime/util/DependencyThreadPool.java @@ -92,7 +92,7 @@ public List>> submitAll(List> tasks, public List submitAllAndWait(List> dtasks) throws ExecutionException, InterruptedException { List res = new ArrayList<>(); - if(DependencyTask.ENABLE_DEBUG_DATA) { + if(LOG.isDebugEnabled()) { if (dtasks != null && dtasks.size() > 0) explainTaskGraph(dtasks); } @@ -172,7 +172,7 @@ public static List> createDependencyTasks(List t = ret.get(i); for(Callable dep : deps) { DependencyTask dt = map.get(dep); - if(DependencyTask.ENABLE_DEBUG_DATA) { + if(LOG.isDebugEnabled()) { t._dependencyTasks = t._dependencyTasks == null ? new ArrayList<>() : t._dependencyTasks; t._dependencyTasks.add(dt); } @@ -226,10 +226,12 @@ public static void explainTaskGraph(List> tasks) { sbs[level].append(offsets[level]); sbs[level].append(entry.getKey().toString()+"\n"); } - System.out.println("EXPlAIN (TASK-GRAPH):"); + StringBuilder sb = new StringBuilder("\n"); + sb.append("EXPlAIN (TASK-GRAPH):"); for (int i=0; i log = LoggingUtils.reinsert(appender); + + boolean containsMessage = false; + for(LoggingEvent l : log) { + containsMessage |= l.getMessage().toString().contains("EXPlAIN (TASK-GRAPH):"); + } + + assertTrue(containsMessage); + + } + catch(Exception e) { + e.printStackTrace(); + fail(e.getMessage()); + } + finally { + LoggingUtils.reinsert(appender); + } + + } + +}