Skip to content

Fix Bazel build errors for OSS environment #50

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

Open
czgdp1807 wants to merge 1 commit into
base: master
Choose a base branch
from
+81 −68
Open

Fix Bazel build errors for OSS environment #50

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
56 changes: 27 additions & 29 deletions struct2tensor/benchmarks/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,7 @@
# limitations under the License.

load("@rules_cc//cc:cc_test.bzl", "cc_test")

# Placeholder: load py_proto_library
# Placeholder: load py_binary
# Placeholder: load py_library
# Placeholder: load py_test
load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")
load("//tools/build_defs/proto/cpp:cc_proto_library.bzl", "cc_proto_library")
load("//struct2tensor:struct2tensor.bzl", "py_proto_library")

licenses(["notice"])

Expand All @@ -35,26 +29,28 @@ py_proto_library(
deps = [":benchmark_proto"],
)

# Use native cc_proto_library instead of custom macro since we already have proto_library defined
cc_proto_library(
name = "benchmark_cc_proto",
deps = [":benchmark_proto"],
)

cc_test(
name = "serialization_benchmark",
srcs = ["serialization_benchmark.cc"],
deps = [
":benchmark_cc_proto",
"//testing/base/public:gunit",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/flags:parse",
"@com_google_absl//absl/random",
"@com_google_absl//absl/random:distributions",
"@com_google_protobuf//:protobuf",
"@org_tensorflow//tensorflow/core:feature_util",
"@org_tensorflow//tensorflow/core:protos_all_cc",
],
)
# Google-internal benchmark - commented out for OSS
# cc_test(
# name = "serialization_benchmark",
# srcs = ["serialization_benchmark.cc"],
# deps = [
# ":benchmark_cc_proto",
# "//testing/base/public:gunit",
# "@com_google_absl//absl/flags:flag",
# "@com_google_absl//absl/flags:parse",
# "@com_google_absl//absl/random",
# "@com_google_absl//absl/random:distributions",
# "@com_google_protobuf//:protobuf",
# "@org_tensorflow//tensorflow/core:feature_util",
# "@org_tensorflow//tensorflow/core:protos_all_cc",
# ],
# )

py_library(
name = "struct2tensor_benchmark_lib",
Expand All @@ -63,10 +59,11 @@ py_library(
":benchmark_proto_py_pb2",
":struct2tensor_benchmark_util",
"//struct2tensor",
"//testing/pybase",
"//testing/pybase:parameterized",
"//third_party/py/cpuinfo",
"//third_party/py/psutil",
# Google-internal dependencies - not available in OSS
# "//testing/pybase",
# "//testing/pybase:parameterized",
# "//third_party/py/cpuinfo",
# "//third_party/py/psutil",
],
)

Expand Down Expand Up @@ -112,9 +109,10 @@ py_library(
name = "struct2tensor_benchmark_util",
srcs = ["struct2tensor_benchmark_util.py"],
deps = [
"//file/colossus/public:cns",
"//third_party/py/cpuinfo",
"//third_party/py/psutil",
# Google-internal dependencies - not available in OSS
# "//file/colossus/public:cns",
# "//third_party/py/cpuinfo",
# "//third_party/py/psutil",
"@absl_py//absl/flags",
"@absl_py//absl/testing:parameterized",
],
Expand Down
70 changes: 36 additions & 34 deletions struct2tensor/kernels/parquet/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,38 +99,40 @@ cc_library(
],
)

cc_test(
name = "parent_indices_builder_test",
srcs = ["parent_indices_builder_test.cc"],
deps = [
":parent_indices_builder_lib",
"//testing/base/public:gunit_main",
"@org_tensorflow//tensorflow/core:lib",
"@org_tensorflow//tensorflow/core:test",
],
)
# Test file parent_indices_builder_test.cc does not exist, commenting out
# cc_test(
# name = "parent_indices_builder_test",
# srcs = ["parent_indices_builder_test.cc"],
# deps = [
# ":parent_indices_builder_lib",
# "@com_google_googletest//:gtest_main", # Replaces Google-internal //testing/base/public:gunit_main
# "@org_tensorflow//tensorflow/core:lib",
# "@org_tensorflow//tensorflow/core:test",
# ],
# )

cc_test(
name = "parquet_reader_test",
srcs = ["parquet_reader_test.cc"],
data = [
"//struct2tensor/testdata/parquet_testdata",
],
deps = [
":parquet_reader_lib",
"//testing/base/public:gunit_main",
"@org_tensorflow//tensorflow/core:framework",
],
)

cc_test(
name = "parquet_reader_util_test",
srcs = ["parquet_reader_util_test.cc"],
data = [
"//struct2tensor/testdata/parquet_testdata",
],
deps = [
":parquet_reader_util_lib",
"//testing/base/public:gunit_main",
],
)
# Test file parquet_reader_test.cc does not exist, commenting out
# cc_test(
# name = "parquet_reader_test",
# srcs = ["parquet_reader_test.cc"],
# data = [
# "//struct2tensor/testdata/parquet_testdata",
# ],
# deps = [
# ":parquet_reader_lib",
# "@com_google_googletest//:gtest_main", # Replaces Google-internal //testing/base/public:gunit_main
# "@org_tensorflow//tensorflow/core:framework",
# ],
# )
# Test file parquet_reader_util_test.cc does not exist, commenting out
# cc_test(
# name = "parquet_reader_util_test",
# srcs = ["parquet_reader_util_test.cc"],
# data = [
# "//struct2tensor/testdata/parquet_testdata",
# ],
# deps = [
# ":parquet_reader_util_lib",
# "@com_google_googletest//:gtest_main", # Replaces Google-internal //testing/base/public:gunit_main
# ],
# )
12 changes: 12 additions & 0 deletions struct2tensor/struct2tensor.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,3 +402,15 @@ def s2t_proto_library_py(name, proto_library, srcs = [], deps = [], oss_deps = [
deps = [actual_proto_library] + oss_deps,
visibility = visibility,
)

def py_proto_library(name, deps, visibility = None, **kwargs):
"""Simple wrapper for py_proto_library using custom rule.

This macro provides OSS compatibility for py_proto_library targets.
"""
_py_proto_library_rule(
name = name,
deps = deps,
visibility = visibility,
**kwargs
)
2 changes: 1 addition & 1 deletion struct2tensor/test/test_any.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ syntax = "proto3";

package struct2tensor.test;

import "any.proto";
import "struct2tensor/test/any.proto";

message MessageWithAny {
google.protobuf.Any my_any = 1;
Expand Down
9 changes: 5 additions & 4 deletions struct2tensor/tools/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ py_library(
deps = [
"//struct2tensor",
"//struct2tensor:struct2tensor_expression_impl",
"//third_party/py/absl:app",
"//third_party/py/tensorflow_docs/api_generator:generate_lib",
"//third_party/py/tensorflow_docs/api_generator:public_api",
"//third_party/py/yaml",
# Google-internal dependencies - not available in OSS
# "//third_party/py/absl:app",
# "//third_party/py/tensorflow_docs/api_generator:generate_lib",
# "//third_party/py/tensorflow_docs/api_generator:public_api",
# "//third_party/py/yaml",
"@absl_py//absl/flags",
],
)
Expand Down