Skip to content

Fix graph plugin with data provider, and its test #3001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidsoergel merged 2 commits into from
Dec 9, 2019
Merged

Fix graph plugin with data provider, and its test #3001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a76a807
Fix graph plugin with data provider, and its test
davidsoergel Dec 5, 2019
5a944ce
Don't filter on empty string tag when tag=None
davidsoergel Dec 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tensorboard/plugins/graph/graphs_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def add_row_item(run, tag=None):
for (run_name, tag_to_time_series) in six.iteritems(mapping):
for tag in tag_to_time_series:
(run_item, tag_item) = add_row_item(run_name, tag)
run_item['op_graph'] = True
run_item['run_graph'] = True
if tag_item:
tag_item['op_graph'] = True
return result
Expand Down Expand Up @@ -249,7 +249,7 @@ def graph_route(self, request):
"""Given a single run, return the graph definition in protobuf format."""
experiment = plugin_util.experiment_id(request.environ)
run = request.args.get('run')
tag = request.args.get('tag', '')
tag = request.args.get('tag')
conceptual_arg = request.args.get('conceptual', False)
is_conceptual = True if conceptual_arg == 'true' else False

Expand Down
21 changes: 13 additions & 8 deletions tensorboard/plugins/graph/graphs_plugin_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,8 @@ def test_info(self, plugin):
'run': '_RUN_WITH_GRAPH_WITHOUT_METADATA',
'run_graph': True,
'tags': {},
}
}

if not plugin._data_provider:
# Hack, for now.
expected['_RUN_WITHOUT_GRAPH_WITH_METADATA'] = {
},
'_RUN_WITHOUT_GRAPH_WITH_METADATA': {
'run': '_RUN_WITHOUT_GRAPH_WITH_METADATA',
'run_graph': False,
'tags': {
Expand All @@ -189,9 +185,18 @@ def test_info(self, plugin):
'op_graph': False,
},
},
}
},
}

if plugin._data_provider:
# Hack, for now.
# Data providers don't yet pass RunMetadata, so this entry excludes it.
expected['_RUN_WITH_GRAPH_WITH_METADATA']['tags'] = {}
# Data providers don't yet pass RunMetadata, so this entry is completely omitted.
del expected['_RUN_WITHOUT_GRAPH_WITH_METADATA']

self.assertItemsEqual(expected, plugin.info_impl('eid'))
actual = plugin.info_impl('eid')
self.assertEqual(expected, actual)

@with_runs([_RUN_WITH_GRAPH_WITH_METADATA])
def test_graph_simple(self, plugin):
Expand Down