Skip to content

Commit ead0627

Browse files
bmzhaotensorflower-gardener
authored andcommittedDec 10, 2019
Adding tensorflow/core/platform/default/BUILD and tensorflow/core/platform/windows/BUILD.
This is part of the refactoring described in the Tensorflow Build Improvements RFC: tensorflow/community#179 Subsequent changes will migrate targets from build_refactor.bzl into the new BUILD files. PiperOrigin-RevId: 284712709 Change-Id: I650eb200ba0ea87e95b15263bad53b0243732ef5
1 parent f1527c0 commit ead0627

File tree

20 files changed

+182
-128
lines changed

20 files changed

+182
-128
lines changed
 

‎tensorflow/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ bzl_library(
478478
visibility = ["//visibility:public"],
479479
deps = [
480480
"//tensorflow/core/platform:build_config_root_bzl",
481-
"//tensorflow/core/platform:cuda_build_defs_bzl",
481+
"//tensorflow/core/platform/default:cuda_build_defs_bzl",
482482
"//third_party/mkl:build_defs_bzl",
483483
"//third_party/mkl_dnn:build_defs_bzl",
484484
"//third_party/ngraph:build_defs_bzl",

‎tensorflow/compiler/tf2xla/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
load("//tensorflow:tensorflow.bzl", "tf_cc_binary", "tf_cc_test", "tf_cuda_cc_test")
22
load(
3-
"//tensorflow/core/platform:default/cuda_build_defs.bzl",
3+
"//tensorflow/core/platform/default:cuda_build_defs.bzl",
44
"if_cuda_is_configured",
55
)
66
load(

‎tensorflow/compiler/xla/service/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ load(
99
)
1010
load("//tensorflow:tensorflow.bzl", "tf_cc_test")
1111
load(
12-
"//tensorflow/core/platform:default/cuda_build_defs.bzl",
12+
"//tensorflow/core/platform/default:cuda_build_defs.bzl",
1313
"if_cuda_is_configured",
1414
)
1515
load(

‎tensorflow/compiler/xla/service/gpu/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ load(
1717
)
1818
load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda")
1919
load(
20-
"//tensorflow/core/platform:default/cuda_build_defs.bzl",
20+
"//tensorflow/core/platform/default:cuda_build_defs.bzl",
2121
"if_cuda_is_configured",
2222
)
2323
load(

‎tensorflow/core/BUILD

+8-8
Original file line numberDiff line numberDiff line change
@@ -874,8 +874,6 @@ cc_library(
874874
"//tensorflow/core/lib/bfloat16:bfloat16.h",
875875
"//tensorflow/core/platform:byte_order.h",
876876
"//tensorflow/core/platform:cpu_info.h",
877-
"//tensorflow/core/platform:default/integral_types.h",
878-
"//tensorflow/core/platform:default/logging.h",
879877
"//tensorflow/core/platform:dynamic_annotations.h",
880878
"//tensorflow/core/platform:macros.h",
881879
"//tensorflow/core/platform:mutex.h",
@@ -885,6 +883,8 @@ cc_library(
885883
"//tensorflow/core/platform:thread_annotations.h",
886884
"//tensorflow/core/platform:tstring.h",
887885
"//tensorflow/core/platform:types.h",
886+
"//tensorflow/core/platform/default:integral_types.h",
887+
"//tensorflow/core/platform/default:logging.h",
888888
],
889889
visibility = ["//visibility:public"],
890890
deps =
@@ -2379,13 +2379,13 @@ cc_library(
23792379
name = "tflite_portable_logging",
23802380
hdrs = [
23812381
"//tensorflow/core/lib/bfloat16:bfloat16.h",
2382-
"//tensorflow/core/platform:default/integral_types.h",
2383-
"//tensorflow/core/platform:default/logging.h",
23842382
"//tensorflow/core/platform:logging.h",
23852383
"//tensorflow/core/platform:macros.h",
23862384
"//tensorflow/core/platform:platform.h",
23872385
"//tensorflow/core/platform:tstring.h",
23882386
"//tensorflow/core/platform:types.h",
2387+
"//tensorflow/core/platform/default:integral_types.h",
2388+
"//tensorflow/core/platform/default:logging.h",
23892389
],
23902390
copts = tf_copts(),
23912391
linkopts = ["-ldl"],
@@ -2408,8 +2408,6 @@ cc_library(
24082408
"lib/jpeg/jpeg_mem.h",
24092409
"//tensorflow/core/lib/bfloat16:bfloat16.h",
24102410
"//tensorflow/core/lib/core:legacy_lib_core_stringpiece_header",
2411-
"//tensorflow/core/platform:default/integral_types.h",
2412-
"//tensorflow/core/platform:default/logging.h",
24132411
"//tensorflow/core/platform:dynamic_annotations.h",
24142412
"//tensorflow/core/platform:logging.h",
24152413
"//tensorflow/core/platform:macros.h",
@@ -2418,6 +2416,8 @@ cc_library(
24182416
"//tensorflow/core/platform:stringpiece.h",
24192417
"//tensorflow/core/platform:tstring.h",
24202418
"//tensorflow/core/platform:types.h",
2419+
"//tensorflow/core/platform/default:integral_types.h",
2420+
"//tensorflow/core/platform/default:logging.h",
24212421
],
24222422
copts = tf_copts(),
24232423
linkopts = ["-ldl"],
@@ -2443,15 +2443,15 @@ cc_library(
24432443
"//tensorflow/core/lib/bfloat16:bfloat16.h",
24442444
"//tensorflow/core/lib/core:legacy_lib_core_stringpiece_header",
24452445
"//tensorflow/core/lib/gtl:legacy_android_gif_internal_headers",
2446-
"//tensorflow/core/platform:default/integral_types.h",
2447-
"//tensorflow/core/platform:default/logging.h",
24482446
"//tensorflow/core/platform:dynamic_annotations.h",
24492447
"//tensorflow/core/platform:logging.h",
24502448
"//tensorflow/core/platform:macros.h",
24512449
"//tensorflow/core/platform:mem.h",
24522450
"//tensorflow/core/platform:platform.h",
24532451
"//tensorflow/core/platform:tstring.h",
24542452
"//tensorflow/core/platform:types.h",
2453+
"//tensorflow/core/platform/default:integral_types.h",
2454+
"//tensorflow/core/platform/default:logging.h",
24552455
],
24562456
copts = tf_copts(),
24572457
linkopts = ["-ldl"],

‎tensorflow/core/kernels/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ load("//tensorflow:tensorflow.bzl", "if_nccl")
2121
load("//tensorflow:tensorflow.bzl", "tf_cuda_cc_test")
2222
load("//tensorflow:tensorflow.bzl", "tf_cuda_cc_tests")
2323
load(
24-
"//tensorflow/core/platform:default/cuda_build_defs.bzl",
24+
"//tensorflow/core/platform/default:cuda_build_defs.bzl",
2525
"if_cuda_is_configured",
2626
)
2727
load(

‎tensorflow/core/kernels/rnn/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ load(
77
"tf_kernel_library",
88
)
99
load(
10-
"//tensorflow/core/platform:default/cuda_build_defs.bzl",
10+
"//tensorflow/core/platform/default:cuda_build_defs.bzl",
1111
"if_cuda_is_configured",
1212
)
1313
load(

‎tensorflow/core/platform/BUILD

+34-39
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ load(
1818
"tf_protobuf_deps",
1919
)
2020
load(
21-
"//tensorflow/core/platform:default/build_refactor.bzl",
21+
"//tensorflow/core/platform/default:build_refactor.bzl",
2222
"tf_instantiate_platform_libraries",
2323
"tf_legacy_srcs_no_runtime_google",
2424
"tf_logging_deps",
@@ -890,31 +890,31 @@ filegroup(
890890
name = "legacy_srcs_no_runtime",
891891
srcs = [
892892
":legacy_srcs_common",
893-
"//tensorflow/core/platform:default/context.h",
894-
"//tensorflow/core/platform:default/cord.h",
895-
"//tensorflow/core/platform:default/dynamic_annotations.h",
896-
"//tensorflow/core/platform:default/env.cc",
897-
"//tensorflow/core/platform:default/human_readable_json.cc",
898-
"//tensorflow/core/platform:default/integral_types.h",
899-
"//tensorflow/core/platform:default/load_library.cc",
900-
"//tensorflow/core/platform:default/logging.h",
901-
"//tensorflow/core/platform:default/monitoring.cc",
902-
"//tensorflow/core/platform:default/mutex.h",
903-
"//tensorflow/core/platform:default/mutex_data.h",
904-
"//tensorflow/core/platform:default/net.cc",
905-
"//tensorflow/core/platform:default/notification.h",
906-
"//tensorflow/core/platform:default/port.cc",
907-
"//tensorflow/core/platform:default/posix_file_system.cc",
908-
"//tensorflow/core/platform:default/posix_file_system.h",
909-
"//tensorflow/core/platform:default/stacktrace.h",
910-
"//tensorflow/core/platform:default/stacktrace_handler.cc",
911-
"//tensorflow/core/platform:default/strong_hash.h",
912-
"//tensorflow/core/platform:default/subprocess.cc",
913-
"//tensorflow/core/platform:default/subprocess.h",
914-
"//tensorflow/core/platform:default/tracing.cc",
915-
"//tensorflow/core/platform:default/tracing_impl.h",
916-
"//tensorflow/core/platform:default/unbounded_work_queue.cc",
917-
"//tensorflow/core/platform:default/unbounded_work_queue.h",
893+
"//tensorflow/core/platform/default:context.h",
894+
"//tensorflow/core/platform/default:cord.h",
895+
"//tensorflow/core/platform/default:dynamic_annotations.h",
896+
"//tensorflow/core/platform/default:env.cc",
897+
"//tensorflow/core/platform/default:human_readable_json.cc",
898+
"//tensorflow/core/platform/default:integral_types.h",
899+
"//tensorflow/core/platform/default:load_library.cc",
900+
"//tensorflow/core/platform/default:logging.h",
901+
"//tensorflow/core/platform/default:monitoring.cc",
902+
"//tensorflow/core/platform/default:mutex.h",
903+
"//tensorflow/core/platform/default:mutex_data.h",
904+
"//tensorflow/core/platform/default:net.cc",
905+
"//tensorflow/core/platform/default:notification.h",
906+
"//tensorflow/core/platform/default:port.cc",
907+
"//tensorflow/core/platform/default:posix_file_system.cc",
908+
"//tensorflow/core/platform/default:posix_file_system.h",
909+
"//tensorflow/core/platform/default:stacktrace.h",
910+
"//tensorflow/core/platform/default:stacktrace_handler.cc",
911+
"//tensorflow/core/platform/default:strong_hash.h",
912+
"//tensorflow/core/platform/default:subprocess.cc",
913+
"//tensorflow/core/platform/default:subprocess.h",
914+
"//tensorflow/core/platform/default:tracing.cc",
915+
"//tensorflow/core/platform/default:tracing_impl.h",
916+
"//tensorflow/core/platform/default:unbounded_work_queue.cc",
917+
"//tensorflow/core/platform/default:unbounded_work_queue.h",
918918
],
919919
visibility = ["//tensorflow/core:__pkg__"],
920920
)
@@ -967,6 +967,14 @@ filegroup(
967967
visibility = ["//tensorflow/core:__pkg__"],
968968
)
969969

970+
bzl_library(
971+
name = "build_config_root_bzl",
972+
srcs = [
973+
"build_config_root.bzl",
974+
"//tensorflow/core/platform/default:build_config_root.bzl",
975+
],
976+
)
977+
970978
# TODO(gunan): Remove the following once references in core/BUILD is removed.
971979
exports_files(
972980
glob(
@@ -988,19 +996,6 @@ exports_files(
988996
),
989997
)
990998

991-
bzl_library(
992-
name = "build_config_root_bzl",
993-
srcs = [
994-
"build_config_root.bzl",
995-
"default/build_config_root.bzl",
996-
],
997-
)
998-
999-
bzl_library(
1000-
name = "cuda_build_defs_bzl",
1001-
srcs = ["default/cuda_build_defs.bzl"],
1002-
)
1003-
1004999
exports_files(
10051000
[
10061001
"stacktrace.h",

‎tensorflow/core/platform/build_config.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Provides a redirection point for platform specific implementations of starlark utilities."""
22

33
load(
4-
"//tensorflow/core/platform:default/build_config.bzl",
4+
"//tensorflow/core/platform/default:build_config.bzl",
55
_pyx_library = "pyx_library",
66
_tf_additional_all_protos = "tf_additional_all_protos",
77
_tf_additional_binary_deps = "tf_additional_binary_deps",

‎tensorflow/core/platform/build_config_root.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Provides a redirection point for platform specific implementations of starlark utilities."""
22

33
load(
4-
"//tensorflow/core/platform:default/build_config_root.bzl",
4+
"//tensorflow/core/platform/default:build_config_root.bzl",
55
_if_dynamic_kernels = "if_dynamic_kernels",
66
_if_static = "if_static",
77
_if_static_and_not_mobile = "if_static_and_not_mobile",
+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Tensorflow default + linux implementations of tensorflow/core/platform libraries.
2+
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
3+
4+
package(
5+
default_visibility = [
6+
"//tensorflow/core/platform:__pkg__",
7+
],
8+
licenses = ["notice"], # Apache 2.0
9+
)
10+
11+
bzl_library(
12+
name = "cuda_build_defs_bzl",
13+
srcs = ["cuda_build_defs.bzl"],
14+
visibility = ["//tensorflow:__subpackages__"],
15+
)
16+
17+
package_group(
18+
name = "core_and_platform_packages",
19+
packages = [
20+
"//tensorflow/core",
21+
"//tensorflow/core/platform",
22+
],
23+
)
24+
25+
exports_files(
26+
srcs = glob(
27+
["*"],
28+
exclude = [
29+
"integral_types.h",
30+
"logging.h",
31+
"test.cc",
32+
"test_benchmark.cc",
33+
],
34+
),
35+
visibility = ["//tensorflow/core/platform:__pkg__"],
36+
)
37+
38+
exports_files(
39+
srcs = [
40+
"integral_types.h",
41+
"logging.h",
42+
"test.cc",
43+
"test_benchmark.cc",
44+
],
45+
visibility = [":core_and_platform_packages"],
46+
)

‎tensorflow/core/platform/default/build_config.bzl

+22-22
Original file line numberDiff line numberDiff line change
@@ -554,30 +554,30 @@ def tf_platform_srcs(files):
554554

555555
def tf_additional_lib_hdrs():
556556
return [
557-
"//tensorflow/core/platform:default/context.h",
558-
"//tensorflow/core/platform:default/cord.h",
559-
"//tensorflow/core/platform:default/dynamic_annotations.h",
560-
"//tensorflow/core/platform:default/integral_types.h",
561-
"//tensorflow/core/platform:default/logging.h",
562-
"//tensorflow/core/platform:default/mutex.h",
563-
"//tensorflow/core/platform:default/mutex_data.h",
564-
"//tensorflow/core/platform:default/notification.h",
565-
"//tensorflow/core/platform:default/stacktrace.h",
566-
"//tensorflow/core/platform:default/strong_hash.h",
567-
"//tensorflow/core/platform:default/test_benchmark.h",
568-
"//tensorflow/core/platform:default/tracing_impl.h",
569-
"//tensorflow/core/platform:default/unbounded_work_queue.h",
557+
"//tensorflow/core/platform/default:context.h",
558+
"//tensorflow/core/platform/default:cord.h",
559+
"//tensorflow/core/platform/default:dynamic_annotations.h",
560+
"//tensorflow/core/platform/default:integral_types.h",
561+
"//tensorflow/core/platform/default:logging.h",
562+
"//tensorflow/core/platform/default:mutex.h",
563+
"//tensorflow/core/platform/default:mutex_data.h",
564+
"//tensorflow/core/platform/default:notification.h",
565+
"//tensorflow/core/platform/default:stacktrace.h",
566+
"//tensorflow/core/platform/default:strong_hash.h",
567+
"//tensorflow/core/platform/default:test_benchmark.h",
568+
"//tensorflow/core/platform/default:tracing_impl.h",
569+
"//tensorflow/core/platform/default:unbounded_work_queue.h",
570570
] + select({
571571
"//tensorflow:windows": [
572-
"//tensorflow/core/platform:windows/intrinsics_port.h",
573-
"//tensorflow/core/platform:windows/stacktrace.h",
574-
"//tensorflow/core/platform:windows/subprocess.h",
575-
"//tensorflow/core/platform:windows/wide_char.h",
576-
"//tensorflow/core/platform:windows/windows_file_system.h",
572+
"//tensorflow/core/platform/windows:intrinsics_port.h",
573+
"//tensorflow/core/platform/windows:stacktrace.h",
574+
"//tensorflow/core/platform/windows:subprocess.h",
575+
"//tensorflow/core/platform/windows:wide_char.h",
576+
"//tensorflow/core/platform/windows:windows_file_system.h",
577577
],
578578
"//conditions:default": [
579-
"//tensorflow/core/platform:default/posix_file_system.h",
580-
"//tensorflow/core/platform:default/subprocess.h",
579+
"//tensorflow/core/platform/default:posix_file_system.h",
580+
"//tensorflow/core/platform/default:subprocess.h",
581581
],
582582
})
583583

@@ -629,8 +629,8 @@ def tf_additional_test_deps():
629629

630630
def tf_additional_test_srcs():
631631
return [
632-
"default/test.cc",
633-
"default/test_benchmark.cc",
632+
"//tensorflow/core/platform/default:test.cc",
633+
"//tensorflow/core/platform/default:test_benchmark.cc",
634634
]
635635

636636
def tf_kernel_tests_linkstatic():

0 commit comments

Comments
 (0)
Please sign in to comment.