experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the trace inputs functionality of the graph explorer.

Browse Source 
After migrating to d3 v4, the graph can no longer directly index into d3.Selections to obtain elements. Instead, we must use the nodes method of d3.Selection to generate an array of selected elements.

PiperOrigin-RevId: 157493509
This commit is contained in:
A. Unique TensorFlower 2017-05-30 12:03:50 -07:00 committed by TensorFlower Gardener
parent 5cf4845840
commit af2b9d8757
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tensorflow/tensorboard/components/tf_graph_common/node.ts
View File

@ -720,12 +720,12 @@ export function traceInputs(renderGraphInfo: tf.graph.render.RenderGraphInfo) {
// Extract currently selected node. Return if input tracing disabled or no
// node is selected.
let selectedNodeSelectorString = 'g.node.selected,g.op.selected';
let node = d3.select(selectedNodeSelectorString);
const selectedNodeSelectorString = 'g.node.selected,g.op.selected';
const nodeSelection = d3.select(selectedNodeSelectorString);
let currentNode = undefined;
if (renderGraphInfo && renderGraphInfo.traceInputs && node && node[0] &&
node[0][0]) {
currentNode = node[0][0] as Element;
if (renderGraphInfo && renderGraphInfo.traceInputs &&
nodeSelection.nodes().length) {
currentNode = nodeSelection.nodes()[0];
} else {
return;
}
@ -738,11 +738,11 @@ export function traceInputs(renderGraphInfo: tf.graph.render.RenderGraphInfo) {
});
d3.selectAll(selectedNodeSelectorString)
// Remove the input-highlight from the selected node.
.classed('input-highlight', false)
// Add input-highlight-selected class to selected node, which allows
// treating the selected not as a special case of an input node.
.classed('input-highlight-selected', true)
// Remove the input-highlight from the selected node.
.classed('input-highlight', false)
// Add input-highlight-selected class to selected node, which allows
// treating the selected not as a special case of an input node.
.classed('input-highlight-selected', true);
// Highlight all parent nodes of each OpNode as input parent to allow
// specific highlighting.
@ -1016,16 +1016,17 @@ function _markParentsOfNodes(visibleNodes: {[nodeName: string]: Node}) {
let currentNode = nodeInstance;
while (currentNode.name !== tf.graph.ROOT_NAME) {
let renderedElement = d3.select(`.node[data-name="${currentNode.name}"]`);
const renderedElementSelection =
d3.select(`.node[data-name="${currentNode.name}"]`);
// Only mark the element as a parent node to an input if it is not
// marked as input node itself.
if (renderedElement[0][0] &&
!renderedElement.classed('input-highlight') &&
!renderedElement.classed('selected') &&
if (renderedElementSelection.nodes().length &&
!renderedElementSelection.classed('input-highlight') &&
!renderedElementSelection.classed('selected') &&
// OpNode only parent if start node is embedded node, in which case
// the OpNode should be faded as well.
!renderedElement.classed('op')) {
renderedElement.classed('input-parent', true);
!renderedElementSelection.classed('op')) {
renderedElementSelection.classed('input-parent', true);
}
currentNode = currentNode.parentNode;
}