Skip to content
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.

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

Change default FE to Angular TB #3779

Merged
merged 3 commits into from
Jul 7, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
27 changes: 7 additions & 20 deletions tensorboard/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -276,12 +276,6 @@ py_test(
],
)

config_setting(
name = "dev_build",
# consider changing this to fastbuild
values = {"compilation_mode": "dbg"},
)

tensorboard_zip_file(
name = "webfiles",
deps = [":assets"],
Expand All @@ -296,23 +290,16 @@ monaco_imports = [
tf_web_library(
stephanwlee marked this conversation as resolved.
Show resolved Hide resolved
name = "assets",
srcs = [
"//tensorboard/components:index.html",
"//tensorboard/components:index.js",
] + select({
"//tensorboard:dev_build": [
"//tensorboard/webapp:ng_index.html",
"//tensorboard/webapp:ng_index.js",
"//tensorboard/webapp:svg_bundle",
],
"//conditions:default": [],
}),
"//tensorboard/components:legacy.html",
"//tensorboard/components:legacy.js",
"//tensorboard/webapp:index.html",
"//tensorboard/webapp:index.js",
"//tensorboard/webapp:svg_bundle",
],
path = "/",
deps = [
"@com_google_fonts_roboto",
] + select({
"//tensorboard:dev_build": monaco_imports,
"//conditions:default": [],
}),
] + monaco_imports,
stephanwlee marked this conversation as resolved.
Show resolved Hide resolved
)

# This is a dummy rule used as a numpy dependency in open-source.
Expand Down
6 changes: 3 additions & 3 deletions tensorboard/components/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ tf_web_library(
)

tensorboard_html_binary(
name = "index",
name = "legacy",
compile = False,
input_path = "/tensorboard.html",
js_path = "/index.js",
output_path = "/index.html",
js_path = "/legacy.js",
output_path = "/legacy.html",
deps = [":tensorboard"],
)

Expand Down
2 changes: 1 addition & 1 deletion tensorboard/pip_package/test_pip_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ smoke() (
tensorboard --port=0 --logdir=smokedir 2>pipe &
perl -ne 'print STDERR;/http:.*:(\d+)/ and print $1.v10 and exit 0' <pipe >port
curl -fs "http://localhost:$(cat port)" >index.html
grep '<tf-tensorboard' index.html
grep '<tb-webapp' index.html
curl -fs "http://localhost:$(cat port)/data/logdir" >logdir.json
grep 'smokedir' logdir.json
curl -fs "http://localhost:$(cat port)/data/plugin/projector/runs" >projector_runs.json
Expand Down
12 changes: 6 additions & 6 deletions tensorboard/webapp/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ tf_web_library(
tf_web_library(
name = "tensorboard-webapp",
srcs = [
"index.html",
"index.inlined.html",
":styles.css",
],
path = "/",
Expand All @@ -118,17 +118,17 @@ tf_web_library(
genrule(
name = "gen_index.html",
srcs = ["index.uninlined.html"],
outs = ["index.html"],
outs = ["index.inlined.html"],
cmd = "$(execpath //tensorboard/logo:inline_favicon) $< >$@",
tools = ["//tensorboard/logo:inline_favicon"],
)

# A Vulcanized html binary for the complete app (both Angular and Polymer parts)
tensorboard_html_binary(
name = "ng_index",
input_path = "/index.html",
js_path = "/ng_index.js",
output_path = "/ng_index.html",
name = "index",
input_path = "/index.inlined.html",
js_path = "/index.js",
output_path = "/index.html",
deps = [":tensorboard-webapp"],
)

Expand Down