Skip to content

Make TensorBoard work with latest Bazel #590

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
merged 1 commit into from
Sep 30, 2017
Merged

Make TensorBoard work with latest Bazel #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ branches:
- /^\d+\.\d+(\.\d+)?(-\S*)?$/

env:
- BAZEL=0.5.1 TF=NIGHTLY
- BAZEL=0.5.4 TF=NIGHTLY

cache:
directories:
Expand Down
41 changes: 25 additions & 16 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,48 @@ workspace(name = "org_tensorflow_tensorboard")

http_archive(
name = "io_bazel_rules_closure",
sha256 = "e9e2538b1f7f27de73fa2914b7d2cb1ce2ac01d1abe8390cfe51fb2558ef8b27",
strip_prefix = "rules_closure-4c559574447f90751f05155faba4f3344668f666",
sha256 = "110fe68753413777944b473c25eed6368c4a0487cee23a7bac1b13cc49d3e257",
strip_prefix = "rules_closure-4af89ef1db659eb41f110df189b67d4cf14073e1",
urls = [
"http://mirror.bazel.build/github.com/bazelbuild/rules_closure/archive/4c559574447f90751f05155faba4f3344668f666.tar.gz",
"https://github.com/bazelbuild/rules_closure/archive/4c559574447f90751f05155faba4f3344668f666.tar.gz", # 2017-06-21
"http://mirror.bazel.build/github.com/bazelbuild/rules_closure/archive/4af89ef1db659eb41f110df189b67d4cf14073e1.tar.gz",
"https://github.com/bazelbuild/rules_closure/archive/4af89ef1db659eb41f110df189b67d4cf14073e1.tar.gz", # 2017-08-28
],
)

load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories")

closure_repositories()
http_archive(
name = "io_bazel_rules_go",
sha256 = "8c333df68fb0096221e2127eda2807384e00cc211ee7e7ea4ed08d212e6a69c1",
strip_prefix = "rules_go-0.5.4",
urls = [
"http://mirror.bazel.build/github.com/bazelbuild/rules_go/archive/0.5.4.tar.gz",
"https://github.com/bazelbuild/rules_go/archive/0.5.4.tar.gz",
],
)

http_archive(
name = "io_bazel_rules_go",
sha256 = "f7e42a4c1f9f31abff9b2bdee6fe4db18bc373287b7e07a5b844446e561e67e2",
strip_prefix = "rules_go-4c9a52aba0b59511c5646af88d2f93a9c0193647",
sha256 = "4781af250cd34ca10369124c82dc0b8d48633db709997cfb965dc779a205eaee",
strip_prefix = "rules_go-aa9a9cfed3d23e2821807d90b288fecd9f68124c",
urls = [
"http://mirror.bazel.build/github.com/bazelbuild/rules_go/archive/4c9a52aba0b59511c5646af88d2f93a9c0193647.tar.gz", # 2017-05-05
"https://github.com/bazelbuild/rules_go/archive/4c9a52aba0b59511c5646af88d2f93a9c0193647.tar.gz",
"http://mirror.bazel.build/github.com/bazelbuild/rules_go/archive/aa9a9cfed3d23e2821807d90b288fecd9f68124c.tar.gz", # 2017-09-29
"https://github.com/bazelbuild/rules_go/archive/aa9a9cfed3d23e2821807d90b288fecd9f68124c.tar.gz",
],
)

http_archive(
name = "io_bazel_rules_webtesting",
sha256 = "bb278df2afe88ed01490e4b25e2c048d453a518cb77d4795f6232a10fbae6c1f",
strip_prefix = "rules_webtesting-dc0530015f201c2707085deba93ad210e89e6d18",
sha256 = "4a34918cdb57b7c0976c1d6a9a7af1d657266b239c9c1066c87d6f9a4058bc7d",
strip_prefix = "rules_webtesting-a9f624ac542d2be75f6f0bdd255f108f2795924a",
urls = [
"http://mirror.bazel.build/github.com/bazelbuild/rules_webtesting/archive/dc0530015f201c2707085deba93ad210e89e6d18.tar.gz", # 2017-05-10
"https://github.com/bazelbuild/rules_webtesting/archive/dc0530015f201c2707085deba93ad210e89e6d18.tar.gz",
"http://mirror.bazel.build/github.com/bazelbuild/rules_webtesting/archive/a9f624ac542d2be75f6f0bdd255f108f2795924a.tar.gz", # 2017-09-11
"https://github.com/bazelbuild/rules_webtesting/archive/a9f624ac542d2be75f6f0bdd255f108f2795924a.tar.gz",
],
)

load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories")

closure_repositories()

load("@io_bazel_rules_go//go:def.bzl", "go_repositories")

go_repositories()
Expand All @@ -53,4 +63,3 @@ load("//third_party:workspace.bzl", "tensorboard_workspace")

# Please add all new dependencies in workspace.bzl.
tensorboard_workspace()

2 changes: 1 addition & 1 deletion tensorboard/plugins/text/summary_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ def test_non_string_value_in_op(self):
with six.assertRaisesRegex(
self,
Exception,
r'Const:0 must be of type <dtype: \'string\'>'):
r'must be of type <dtype: \'string\'>'):
with tf.Session() as sess:
sess.run(summary.op('so', tf.constant(5)))

Expand Down
19 changes: 10 additions & 9 deletions third_party/workspace.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,16 @@ def tensorboard_workspace():
# We need to import the protobuf library under the names com_google_protobuf
# and com_google_protobuf_cc to enable proto_library support in bazel.
# Unfortunately there is no way to alias http_archives at the moment.
native.http_archive(
name = "com_google_protobuf",
urls = [
"http://mirror.bazel.build/github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
"https://github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
],
sha256 = "e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
strip_prefix = "protobuf-2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a",
)
if "com_google_protobuf" not in native.existing_rules():
Copy link
Member

@chihuahua chihuahua Sep 29, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the new guard here?

Copy link
Contributor Author

@jart jart Sep 29, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm honestly not sure. Something appears to be defining that and even as I grep through everything, I can't quite find out where it's coming from. It could be rules_go, which is doing strange things with their workspace definitions.

This is a simple way to punt the problem until I have time to take a closer look.

Copy link
Member

@chihuahua chihuahua Sep 29, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SG! Just curious.

native.http_archive(
name = "com_google_protobuf",
urls = [
"http://mirror.bazel.build/github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
"https://github.com/google/protobuf/archive/2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a.tar.gz",
],
sha256 = "e5d3d4e227a0f7afb8745df049bbd4d55474b158ca5aaa2a0e31099af24be1d0",
strip_prefix = "protobuf-2b7430d96aeff2bb624c8d52182ff5e4b9f7f18a",
)

# Protobuf's BUILD file depends on //external:six.
native.bind(
Expand Down