Buildify the world
Change-Id: I41c06a3f567bc45d401386cc32d9c40cb6ed95d8
diff --git a/y2020/vision/BUILD b/y2020/vision/BUILD
index 6850a27..60276c9 100644
--- a/y2020/vision/BUILD
+++ b/y2020/vision/BUILD
@@ -16,6 +16,7 @@
hdrs = [
"v4l2_reader.h",
],
+ visibility = ["//y2020:__subpackages__"],
deps = [
":vision_fbs",
"//aos/events:event_loop",
@@ -23,7 +24,6 @@
"@com_github_google_glog//:glog",
"@com_google_absl//absl/base",
],
- visibility = ["//y2020:__subpackages__"],
)
cc_binary(
@@ -35,6 +35,7 @@
"//tools:k8",
"//tools:armhf-debian",
],
+ visibility = ["//y2020:__subpackages__"],
deps = [
":v4l2_reader",
":vision_fbs",
@@ -43,12 +44,11 @@
"//aos/events:shm_event_loop",
"//aos/network:team_number",
"//third_party:opencv",
- "//y2020/vision/tools/python_code:sift_training_data",
"//y2020/vision/sift:sift971",
"//y2020/vision/sift:sift_fbs",
"//y2020/vision/sift:sift_training_fbs",
+ "//y2020/vision/tools/python_code:sift_training_data",
],
- visibility = ["//y2020:__subpackages__"],
)
flatbuffer_ts_library(
diff --git a/y2020/vision/sift/fast_gaussian.bzl b/y2020/vision/sift/fast_gaussian.bzl
index a1c3173..0905423 100644
--- a/y2020/vision/sift/fast_gaussian.bzl
+++ b/y2020/vision/sift/fast_gaussian.bzl
@@ -1,55 +1,55 @@
def fast_gaussian(sigmas, sizes):
- files = []
- for _, sigma_name, _ in sigmas:
+ files = []
+ for _, sigma_name, _ in sigmas:
+ for cols, rows in sizes:
+ files.append("fast_gaussian_%dx%d_%s" % (cols, rows, sigma_name))
+ for _, sigma_name, _ in sigmas:
+ for cols, rows in sizes:
+ files.append("fast_gaussian_subtract_%dx%d_%s" % (cols, rows, sigma_name))
for cols, rows in sizes:
- files.append("fast_gaussian_%dx%d_%s" % (cols, rows, sigma_name))
- for _, sigma_name, _ in sigmas:
- for cols, rows in sizes:
- files.append("fast_gaussian_subtract_%dx%d_%s" % (cols, rows, sigma_name))
- for cols, rows in sizes:
- files.append('fast_subtract_%dx%d' % (cols, rows))
+ files.append("fast_subtract_%dx%d" % (cols, rows))
- params = struct(
- sigmas = sigmas,
- sizes = sizes,
- )
+ params = struct(
+ sigmas = sigmas,
+ sizes = sizes,
+ )
- headers = [f + '.h' for f in files] + [
- 'fast_gaussian_all.h',
- ]
- objects = [f + '.o' for f in files] + [
- 'fast_gaussian_runtime.o',
- ]
- htmls = [f + '.html' for f in files]
+ headers = [f + ".h" for f in files] + [
+ "fast_gaussian_all.h",
+ ]
+ objects = [f + ".o" for f in files] + [
+ "fast_gaussian_runtime.o",
+ ]
+ htmls = [f + ".html" for f in files]
- native.genrule(
- name = "generate_fast_gaussian",
- tools = [
- ":fast_gaussian_runner",
- ],
- cmd = ' '.join([
- '$(location fast_gaussian_runner)',
- "'" + params.to_json() + "'",
- # TODO(Brian): This should be RULEDIR once we have support for that.
- '$(@D)',
- '$(TARGET_CPU)',
- ]),
- outs = headers + objects + htmls,
- restricted_to = [
- "//tools:k8",
- "//tools:armhf-debian",
- ],
- )
+ native.genrule(
+ name = "generate_fast_gaussian",
+ tools = [
+ ":fast_gaussian_runner",
+ ],
+ cmd = " ".join([
+ "$(location fast_gaussian_runner)",
+ "'" + params.to_json() + "'",
+ # TODO(Brian): This should be RULEDIR once we have support for that.
+ "$(@D)",
+ "$(TARGET_CPU)",
+ ]),
+ outs = headers + objects + htmls,
+ restricted_to = [
+ "//tools:k8",
+ "//tools:armhf-debian",
+ ],
+ )
- native.cc_library(
- name = 'fast_gaussian_all',
- hdrs = ['fast_gaussian_all.h'],
- srcs = headers + objects,
- deps = [
- '//third_party:halide_runtime',
- ],
- restricted_to = [
- "//tools:k8",
- "//tools:armhf-debian",
- ],
- )
+ native.cc_library(
+ name = "fast_gaussian_all",
+ hdrs = ["fast_gaussian_all.h"],
+ srcs = headers + objects,
+ deps = [
+ "//third_party:halide_runtime",
+ ],
+ restricted_to = [
+ "//tools:k8",
+ "//tools:armhf-debian",
+ ],
+ )
diff --git a/y2020/vision/tools/python_code/BUILD b/y2020/vision/tools/python_code/BUILD
index a130ed6..8bbb5c8 100644
--- a/y2020/vision/tools/python_code/BUILD
+++ b/y2020/vision/tools/python_code/BUILD
@@ -22,10 +22,10 @@
default_python_version = "PY3",
srcs_version = "PY2AND3",
deps = [
+ "//external:python-glog",
"//y2020/vision/sift:sift_fbs_python",
"@bazel_tools//tools/python/runfiles",
"@opencv_contrib_nonfree_amd64//:python_opencv",
- "//external:python-glog",
],
)
@@ -71,10 +71,10 @@
main = "load_sift_training.py",
srcs_version = "PY2AND3",
deps = [
+ "//external:python-glog",
"//y2020/vision/sift:sift_fbs_python",
"@bazel_tools//tools/python/runfiles",
"@opencv_contrib_nonfree_amd64//:python_opencv",
- "//external:python-glog",
],
)