Skip to content

Add extra import check for profile plugin #2136

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
nfelt merged 2 commits into from
Apr 30, 2019
Merged

Add extra import check for profile plugin #2136

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
15833a1
Add extra import check for profile plugin
orionr Apr 22, 2019
03db59a
Display minimum version for profile plugin
orionr Apr 29, 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
17 changes: 12 additions & 5 deletions tensorboard/components/tf_tensorboard/plugin-dialog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,20 @@ <h2 id='dialog-title'>[[_title]]</h2>
},
},
openNoTensorFlowDialog() {
this.set(
'_title',
'This plugin is disabled without TensorFlow');
this.set(
'_customMessage',
this.openDialog(
'This plugin is disabled without TensorFlow',
'To enable this plugin in TensorBoard, install TensorFlow with '
+ '"pip install tensorflow" or equivalent.');
},
openOldTensorFlowDialog(version) {
this.openDialog(
'This plugin is disabled without TensorFlow ' + version,
'To enable this plugin in TensorBoard, install TensorFlow '
+ version + ' or greater with "pip install tensorflow" or equivalent.');
},
openDialog(title, message) {
this.set('_title', title);
this.set('_customMessage', message);
this.$.dialog.open();
},
closeDialog() {
Expand Down
3 changes: 3 additions & 0 deletions tensorboard/plugins/profile/profile_plugin_loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ def load(self, context):
try:
# pylint: disable=g-import-not-at-top,unused-import
import tensorflow
# Available in TensorFlow 1.14 or later, so do import check
# pylint: disable=g-import-not-at-top,unused-import
from tensorflow.python.eager import profiler_client
except ImportError:
return
# pylint: disable=g-import-not-at-top
Expand Down
5 changes: 3 additions & 2 deletions tensorboard/plugins/profile/tf_profile_dashboard/tf-profile-dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,9 @@ <h3>No profile data was found.</h3>
.request(tf_backend.getRouter().pluginsListing())
.then(plugins => {
if (!(PLUGIN_NAME in plugins)) {
// The plugin was not created
this.$.initialDialog.openNoTensorFlowDialog();
// The plugin was not created and so either didn't have
// TensorFlow or had an old version
this.$.initialDialog.openOldTensorFlowDialog('1.14');
this.set('_isAvailable', false);
} else {
// The plugin was created
Expand Down