Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
56 changes: 27 additions & 29 deletions struct2tensor/benchmarks/BUILD
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,3 +181,15 @@ def s2t_proto_library_py(name, proto_library, srcs = [], deps = [], oss_deps = [
visibility = visibility,
testonly = testonly,
)

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
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ syntax = "proto3";

package struct2tensor.test;

import "google/protobuf/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
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Fix Bazel build errors for OSS environment by czgdp1807 · Pull Request #50 · google/struct2tensor · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
56 changes: 27 additions & 29 deletions struct2tensor/benchmarks/BUILD
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,3 +181,15 @@ def s2t_proto_library_py(name, proto_library, srcs = [], deps = [], oss_deps = [
visibility = visibility,
testonly = testonly,
)

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
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ syntax = "proto3";

package struct2tensor.test;

import "google/protobuf/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
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix Bazel build errors for OSS environment by czgdp1807 · Pull Request #50 · google/struct2tensor · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
56 changes: 27 additions & 29 deletions struct2tensor/benchmarks/BUILD
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,3 +181,15 @@ def s2t_proto_library_py(name, proto_library, srcs = [], deps = [], oss_deps = [
visibility = visibility,
testonly = testonly,
)

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
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ syntax = "proto3";

package struct2tensor.test;

import "google/protobuf/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
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix Bazel build errors for OSS environment by czgdp1807 · Pull Request #50 · google/struct2tensor · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
56 changes: 27 additions & 29 deletions struct2tensor/benchmarks/BUILD
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,3 +181,15 @@ def s2t_proto_library_py(name, proto_library, srcs = [], deps = [], oss_deps = [
visibility = visibility,
testonly = testonly,
)

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
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ syntax = "proto3";

package struct2tensor.test;

import "google/protobuf/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
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Fix Bazel build errors for OSS environment by czgdp1807 · Pull Request #50 · google/struct2tensor · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
56 changes: 27 additions & 29 deletions struct2tensor/benchmarks/BUILD
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,3 +181,15 @@ def s2t_proto_library_py(name, proto_library, srcs = [], deps = [], oss_deps = [
visibility = visibility,
testonly = testonly,
)

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
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ syntax = "proto3";

package struct2tensor.test;

import "google/protobuf/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
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix Bazel build errors for OSS environment by czgdp1807 · Pull Request #50 · google/struct2tensor · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
56 changes: 27 additions & 29 deletions struct2tensor/benchmarks/BUILD
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,3 +181,15 @@ def s2t_proto_library_py(name, proto_library, srcs = [], deps = [], oss_deps = [
visibility = visibility,
testonly = testonly,
)

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
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ syntax = "proto3";

package struct2tensor.test;

import "google/protobuf/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
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Fix Bazel build errors for OSS environment by czgdp1807 · Pull Request #50 · google/struct2tensor · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
56 changes: 27 additions & 29 deletions struct2tensor/benchmarks/BUILD
Original file line numberDiff line numberDiff 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 DownExpand 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
Original file line numberDiff line numberDiff 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,3 +181,15 @@ def s2t_proto_library_py(name, proto_library, srcs = [], deps = [], oss_deps = [
visibility = visibility,
testonly = testonly,
)

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
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ syntax = "proto3";

package struct2tensor.test;

import "google/protobuf/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
Original file line numberDiff line numberDiff 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