From ead06270dc8bd7a61622f4c687396ce1791f29b5 Mon Sep 17 00:00:00 2001 From: Brian Zhao Date: Tue, 10 Dec 2019 00:05:13 -0800 Subject: [PATCH] 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: https://github.com/tensorflow/community/pull/179 Subsequent changes will migrate targets from build_refactor.bzl into the new BUILD files. PiperOrigin-RevId: 284712709 Change-Id: I650eb200ba0ea87e95b15263bad53b0243732ef5 --- tensorflow/BUILD | 2 +- tensorflow/compiler/tf2xla/BUILD | 2 +- tensorflow/compiler/xla/service/BUILD | 2 +- tensorflow/compiler/xla/service/gpu/BUILD | 2 +- tensorflow/core/BUILD | 16 ++-- tensorflow/core/kernels/BUILD | 2 +- tensorflow/core/kernels/rnn/BUILD | 2 +- tensorflow/core/platform/BUILD | 73 +++++++-------- tensorflow/core/platform/build_config.bzl | 2 +- .../core/platform/build_config_root.bzl | 2 +- tensorflow/core/platform/default/BUILD | 46 ++++++++++ .../core/platform/default/build_config.bzl | 44 ++++----- .../core/platform/default/build_refactor.bzl | 90 +++++++++---------- tensorflow/core/platform/rules_cc.bzl | 2 +- tensorflow/core/platform/windows/BUILD | 13 +++ tensorflow/python/distribute/BUILD | 2 +- tensorflow/python/keras/distribute/BUILD | 2 +- tensorflow/stream_executor/cuda/BUILD | 2 +- tensorflow/stream_executor/gpu/BUILD | 2 +- tensorflow/tensorflow.bzl | 2 +- 20 files changed, 182 insertions(+), 128 deletions(-) create mode 100644 tensorflow/core/platform/default/BUILD create mode 100644 tensorflow/core/platform/windows/BUILD diff --git a/tensorflow/BUILD b/tensorflow/BUILD index 603c2a5c45c..081edb21ae1 100644 --- a/tensorflow/BUILD +++ b/tensorflow/BUILD @@ -478,7 +478,7 @@ bzl_library( visibility = ["//visibility:public"], deps = [ "//tensorflow/core/platform:build_config_root_bzl", - "//tensorflow/core/platform:cuda_build_defs_bzl", + "//tensorflow/core/platform/default:cuda_build_defs_bzl", "//third_party/mkl:build_defs_bzl", "//third_party/mkl_dnn:build_defs_bzl", "//third_party/ngraph:build_defs_bzl", diff --git a/tensorflow/compiler/tf2xla/BUILD b/tensorflow/compiler/tf2xla/BUILD index a2a0459bb4a..c509afbc33a 100644 --- a/tensorflow/compiler/tf2xla/BUILD +++ b/tensorflow/compiler/tf2xla/BUILD @@ -1,6 +1,6 @@ load("//tensorflow:tensorflow.bzl", "tf_cc_binary", "tf_cc_test", "tf_cuda_cc_test") load( - "//tensorflow/core/platform:default/cuda_build_defs.bzl", + "//tensorflow/core/platform/default:cuda_build_defs.bzl", "if_cuda_is_configured", ) load( diff --git a/tensorflow/compiler/xla/service/BUILD b/tensorflow/compiler/xla/service/BUILD index 14e6f66741e..b8dfc371cb7 100755 --- a/tensorflow/compiler/xla/service/BUILD +++ b/tensorflow/compiler/xla/service/BUILD @@ -9,7 +9,7 @@ load( ) load("//tensorflow:tensorflow.bzl", "tf_cc_test") load( - "//tensorflow/core/platform:default/cuda_build_defs.bzl", + "//tensorflow/core/platform/default:cuda_build_defs.bzl", "if_cuda_is_configured", ) load( diff --git a/tensorflow/compiler/xla/service/gpu/BUILD b/tensorflow/compiler/xla/service/gpu/BUILD index eb8b848fc3f..2c7359298d9 100755 --- a/tensorflow/compiler/xla/service/gpu/BUILD +++ b/tensorflow/compiler/xla/service/gpu/BUILD @@ -17,7 +17,7 @@ load( ) load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda") load( - "//tensorflow/core/platform:default/cuda_build_defs.bzl", + "//tensorflow/core/platform/default:cuda_build_defs.bzl", "if_cuda_is_configured", ) load( diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD index 0df849a77de..9af8e12d263 100644 --- a/tensorflow/core/BUILD +++ b/tensorflow/core/BUILD @@ -874,8 +874,6 @@ cc_library( "//tensorflow/core/lib/bfloat16:bfloat16.h", "//tensorflow/core/platform:byte_order.h", "//tensorflow/core/platform:cpu_info.h", - "//tensorflow/core/platform:default/integral_types.h", - "//tensorflow/core/platform:default/logging.h", "//tensorflow/core/platform:dynamic_annotations.h", "//tensorflow/core/platform:macros.h", "//tensorflow/core/platform:mutex.h", @@ -885,6 +883,8 @@ cc_library( "//tensorflow/core/platform:thread_annotations.h", "//tensorflow/core/platform:tstring.h", "//tensorflow/core/platform:types.h", + "//tensorflow/core/platform/default:integral_types.h", + "//tensorflow/core/platform/default:logging.h", ], visibility = ["//visibility:public"], deps = @@ -2379,13 +2379,13 @@ cc_library( name = "tflite_portable_logging", hdrs = [ "//tensorflow/core/lib/bfloat16:bfloat16.h", - "//tensorflow/core/platform:default/integral_types.h", - "//tensorflow/core/platform:default/logging.h", "//tensorflow/core/platform:logging.h", "//tensorflow/core/platform:macros.h", "//tensorflow/core/platform:platform.h", "//tensorflow/core/platform:tstring.h", "//tensorflow/core/platform:types.h", + "//tensorflow/core/platform/default:integral_types.h", + "//tensorflow/core/platform/default:logging.h", ], copts = tf_copts(), linkopts = ["-ldl"], @@ -2408,8 +2408,6 @@ cc_library( "lib/jpeg/jpeg_mem.h", "//tensorflow/core/lib/bfloat16:bfloat16.h", "//tensorflow/core/lib/core:legacy_lib_core_stringpiece_header", - "//tensorflow/core/platform:default/integral_types.h", - "//tensorflow/core/platform:default/logging.h", "//tensorflow/core/platform:dynamic_annotations.h", "//tensorflow/core/platform:logging.h", "//tensorflow/core/platform:macros.h", @@ -2418,6 +2416,8 @@ cc_library( "//tensorflow/core/platform:stringpiece.h", "//tensorflow/core/platform:tstring.h", "//tensorflow/core/platform:types.h", + "//tensorflow/core/platform/default:integral_types.h", + "//tensorflow/core/platform/default:logging.h", ], copts = tf_copts(), linkopts = ["-ldl"], @@ -2443,8 +2443,6 @@ cc_library( "//tensorflow/core/lib/bfloat16:bfloat16.h", "//tensorflow/core/lib/core:legacy_lib_core_stringpiece_header", "//tensorflow/core/lib/gtl:legacy_android_gif_internal_headers", - "//tensorflow/core/platform:default/integral_types.h", - "//tensorflow/core/platform:default/logging.h", "//tensorflow/core/platform:dynamic_annotations.h", "//tensorflow/core/platform:logging.h", "//tensorflow/core/platform:macros.h", @@ -2452,6 +2450,8 @@ cc_library( "//tensorflow/core/platform:platform.h", "//tensorflow/core/platform:tstring.h", "//tensorflow/core/platform:types.h", + "//tensorflow/core/platform/default:integral_types.h", + "//tensorflow/core/platform/default:logging.h", ], copts = tf_copts(), linkopts = ["-ldl"], diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD index 50283e79e69..596d7774918 100644 --- a/tensorflow/core/kernels/BUILD +++ b/tensorflow/core/kernels/BUILD @@ -21,7 +21,7 @@ load("//tensorflow:tensorflow.bzl", "if_nccl") load("//tensorflow:tensorflow.bzl", "tf_cuda_cc_test") load("//tensorflow:tensorflow.bzl", "tf_cuda_cc_tests") load( - "//tensorflow/core/platform:default/cuda_build_defs.bzl", + "//tensorflow/core/platform/default:cuda_build_defs.bzl", "if_cuda_is_configured", ) load( diff --git a/tensorflow/core/kernels/rnn/BUILD b/tensorflow/core/kernels/rnn/BUILD index 8096e2150d8..0f0e358d9ed 100644 --- a/tensorflow/core/kernels/rnn/BUILD +++ b/tensorflow/core/kernels/rnn/BUILD @@ -7,7 +7,7 @@ load( "tf_kernel_library", ) load( - "//tensorflow/core/platform:default/cuda_build_defs.bzl", + "//tensorflow/core/platform/default:cuda_build_defs.bzl", "if_cuda_is_configured", ) load( diff --git a/tensorflow/core/platform/BUILD b/tensorflow/core/platform/BUILD index 94657280223..b5d5aa7e077 100644 --- a/tensorflow/core/platform/BUILD +++ b/tensorflow/core/platform/BUILD @@ -18,7 +18,7 @@ load( "tf_protobuf_deps", ) load( - "//tensorflow/core/platform:default/build_refactor.bzl", + "//tensorflow/core/platform/default:build_refactor.bzl", "tf_instantiate_platform_libraries", "tf_legacy_srcs_no_runtime_google", "tf_logging_deps", @@ -890,31 +890,31 @@ filegroup( name = "legacy_srcs_no_runtime", srcs = [ ":legacy_srcs_common", - "//tensorflow/core/platform:default/context.h", - "//tensorflow/core/platform:default/cord.h", - "//tensorflow/core/platform:default/dynamic_annotations.h", - "//tensorflow/core/platform:default/env.cc", - "//tensorflow/core/platform:default/human_readable_json.cc", - "//tensorflow/core/platform:default/integral_types.h", - "//tensorflow/core/platform:default/load_library.cc", - "//tensorflow/core/platform:default/logging.h", - "//tensorflow/core/platform:default/monitoring.cc", - "//tensorflow/core/platform:default/mutex.h", - "//tensorflow/core/platform:default/mutex_data.h", - "//tensorflow/core/platform:default/net.cc", - "//tensorflow/core/platform:default/notification.h", - "//tensorflow/core/platform:default/port.cc", - "//tensorflow/core/platform:default/posix_file_system.cc", - "//tensorflow/core/platform:default/posix_file_system.h", - "//tensorflow/core/platform:default/stacktrace.h", - "//tensorflow/core/platform:default/stacktrace_handler.cc", - "//tensorflow/core/platform:default/strong_hash.h", - "//tensorflow/core/platform:default/subprocess.cc", - "//tensorflow/core/platform:default/subprocess.h", - "//tensorflow/core/platform:default/tracing.cc", - "//tensorflow/core/platform:default/tracing_impl.h", - "//tensorflow/core/platform:default/unbounded_work_queue.cc", - "//tensorflow/core/platform:default/unbounded_work_queue.h", + "//tensorflow/core/platform/default:context.h", + "//tensorflow/core/platform/default:cord.h", + "//tensorflow/core/platform/default:dynamic_annotations.h", + "//tensorflow/core/platform/default:env.cc", + "//tensorflow/core/platform/default:human_readable_json.cc", + "//tensorflow/core/platform/default:integral_types.h", + "//tensorflow/core/platform/default:load_library.cc", + "//tensorflow/core/platform/default:logging.h", + "//tensorflow/core/platform/default:monitoring.cc", + "//tensorflow/core/platform/default:mutex.h", + "//tensorflow/core/platform/default:mutex_data.h", + "//tensorflow/core/platform/default:net.cc", + "//tensorflow/core/platform/default:notification.h", + "//tensorflow/core/platform/default:port.cc", + "//tensorflow/core/platform/default:posix_file_system.cc", + "//tensorflow/core/platform/default:posix_file_system.h", + "//tensorflow/core/platform/default:stacktrace.h", + "//tensorflow/core/platform/default:stacktrace_handler.cc", + "//tensorflow/core/platform/default:strong_hash.h", + "//tensorflow/core/platform/default:subprocess.cc", + "//tensorflow/core/platform/default:subprocess.h", + "//tensorflow/core/platform/default:tracing.cc", + "//tensorflow/core/platform/default:tracing_impl.h", + "//tensorflow/core/platform/default:unbounded_work_queue.cc", + "//tensorflow/core/platform/default:unbounded_work_queue.h", ], visibility = ["//tensorflow/core:__pkg__"], ) @@ -967,6 +967,14 @@ filegroup( visibility = ["//tensorflow/core:__pkg__"], ) +bzl_library( + name = "build_config_root_bzl", + srcs = [ + "build_config_root.bzl", + "//tensorflow/core/platform/default:build_config_root.bzl", + ], +) + # TODO(gunan): Remove the following once references in core/BUILD is removed. exports_files( glob( @@ -988,19 +996,6 @@ exports_files( ), ) -bzl_library( - name = "build_config_root_bzl", - srcs = [ - "build_config_root.bzl", - "default/build_config_root.bzl", - ], -) - -bzl_library( - name = "cuda_build_defs_bzl", - srcs = ["default/cuda_build_defs.bzl"], -) - exports_files( [ "stacktrace.h", diff --git a/tensorflow/core/platform/build_config.bzl b/tensorflow/core/platform/build_config.bzl index cdd810aeacb..f0fa740f5d5 100644 --- a/tensorflow/core/platform/build_config.bzl +++ b/tensorflow/core/platform/build_config.bzl @@ -1,7 +1,7 @@ """Provides a redirection point for platform specific implementations of starlark utilities.""" load( - "//tensorflow/core/platform:default/build_config.bzl", + "//tensorflow/core/platform/default:build_config.bzl", _pyx_library = "pyx_library", _tf_additional_all_protos = "tf_additional_all_protos", _tf_additional_binary_deps = "tf_additional_binary_deps", diff --git a/tensorflow/core/platform/build_config_root.bzl b/tensorflow/core/platform/build_config_root.bzl index 6a09333e4c5..05b38bbeca2 100644 --- a/tensorflow/core/platform/build_config_root.bzl +++ b/tensorflow/core/platform/build_config_root.bzl @@ -1,7 +1,7 @@ """Provides a redirection point for platform specific implementations of starlark utilities.""" load( - "//tensorflow/core/platform:default/build_config_root.bzl", + "//tensorflow/core/platform/default:build_config_root.bzl", _if_dynamic_kernels = "if_dynamic_kernels", _if_static = "if_static", _if_static_and_not_mobile = "if_static_and_not_mobile", diff --git a/tensorflow/core/platform/default/BUILD b/tensorflow/core/platform/default/BUILD new file mode 100644 index 00000000000..8547c5a7d15 --- /dev/null +++ b/tensorflow/core/platform/default/BUILD @@ -0,0 +1,46 @@ +# Tensorflow default + linux implementations of tensorflow/core/platform libraries. +load("@bazel_skylib//:bzl_library.bzl", "bzl_library") + +package( + default_visibility = [ + "//tensorflow/core/platform:__pkg__", + ], + licenses = ["notice"], # Apache 2.0 +) + +bzl_library( + name = "cuda_build_defs_bzl", + srcs = ["cuda_build_defs.bzl"], + visibility = ["//tensorflow:__subpackages__"], +) + +package_group( + name = "core_and_platform_packages", + packages = [ + "//tensorflow/core", + "//tensorflow/core/platform", + ], +) + +exports_files( + srcs = glob( + ["*"], + exclude = [ + "integral_types.h", + "logging.h", + "test.cc", + "test_benchmark.cc", + ], + ), + visibility = ["//tensorflow/core/platform:__pkg__"], +) + +exports_files( + srcs = [ + "integral_types.h", + "logging.h", + "test.cc", + "test_benchmark.cc", + ], + visibility = [":core_and_platform_packages"], +) diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl index a94114507d2..0a318d798a2 100644 --- a/tensorflow/core/platform/default/build_config.bzl +++ b/tensorflow/core/platform/default/build_config.bzl @@ -554,30 +554,30 @@ def tf_platform_srcs(files): def tf_additional_lib_hdrs(): return [ - "//tensorflow/core/platform:default/context.h", - "//tensorflow/core/platform:default/cord.h", - "//tensorflow/core/platform:default/dynamic_annotations.h", - "//tensorflow/core/platform:default/integral_types.h", - "//tensorflow/core/platform:default/logging.h", - "//tensorflow/core/platform:default/mutex.h", - "//tensorflow/core/platform:default/mutex_data.h", - "//tensorflow/core/platform:default/notification.h", - "//tensorflow/core/platform:default/stacktrace.h", - "//tensorflow/core/platform:default/strong_hash.h", - "//tensorflow/core/platform:default/test_benchmark.h", - "//tensorflow/core/platform:default/tracing_impl.h", - "//tensorflow/core/platform:default/unbounded_work_queue.h", + "//tensorflow/core/platform/default:context.h", + "//tensorflow/core/platform/default:cord.h", + "//tensorflow/core/platform/default:dynamic_annotations.h", + "//tensorflow/core/platform/default:integral_types.h", + "//tensorflow/core/platform/default:logging.h", + "//tensorflow/core/platform/default:mutex.h", + "//tensorflow/core/platform/default:mutex_data.h", + "//tensorflow/core/platform/default:notification.h", + "//tensorflow/core/platform/default:stacktrace.h", + "//tensorflow/core/platform/default:strong_hash.h", + "//tensorflow/core/platform/default:test_benchmark.h", + "//tensorflow/core/platform/default:tracing_impl.h", + "//tensorflow/core/platform/default:unbounded_work_queue.h", ] + select({ "//tensorflow:windows": [ - "//tensorflow/core/platform:windows/intrinsics_port.h", - "//tensorflow/core/platform:windows/stacktrace.h", - "//tensorflow/core/platform:windows/subprocess.h", - "//tensorflow/core/platform:windows/wide_char.h", - "//tensorflow/core/platform:windows/windows_file_system.h", + "//tensorflow/core/platform/windows:intrinsics_port.h", + "//tensorflow/core/platform/windows:stacktrace.h", + "//tensorflow/core/platform/windows:subprocess.h", + "//tensorflow/core/platform/windows:wide_char.h", + "//tensorflow/core/platform/windows:windows_file_system.h", ], "//conditions:default": [ - "//tensorflow/core/platform:default/posix_file_system.h", - "//tensorflow/core/platform:default/subprocess.h", + "//tensorflow/core/platform/default:posix_file_system.h", + "//tensorflow/core/platform/default:subprocess.h", ], }) @@ -629,8 +629,8 @@ def tf_additional_test_deps(): def tf_additional_test_srcs(): return [ - "default/test.cc", - "default/test_benchmark.cc", + "//tensorflow/core/platform/default:test.cc", + "//tensorflow/core/platform/default:test_benchmark.cc", ] def tf_kernel_tests_linkstatic(): diff --git a/tensorflow/core/platform/default/build_refactor.bzl b/tensorflow/core/platform/default/build_refactor.bzl index 76033a880ae..8dda322b5ae 100644 --- a/tensorflow/core/platform/default/build_refactor.bzl +++ b/tensorflow/core/platform/default/build_refactor.bzl @@ -16,7 +16,7 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "context": { "name": "context_impl", "hdrs": ["//tensorflow/core/platform:context.h"], - "textual_hdrs": ["//tensorflow/core/platform:default/context.h"], + "textual_hdrs": ["//tensorflow/core/platform/default:context.h"], "deps": [ "//tensorflow/core/platform", ], @@ -25,7 +25,7 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { }, "cord": { "name": "cord_impl", - "hdrs": ["//tensorflow/core/platform:default/cord.h"], + "hdrs": ["//tensorflow/core/platform/default:cord.h"], "visibility": ["//visibility:private"], "tags": ["no_oss", "manual"], }, @@ -35,7 +35,7 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "//tensorflow/core/platform:cuda_libdevice_path.h", ], "srcs": [ - "//tensorflow/core/platform:default/cuda_libdevice_path.cc", + "//tensorflow/core/platform/default:cuda_libdevice_path.cc", ], "deps": [ "@local_config_cuda//cuda:cuda_headers", @@ -49,7 +49,7 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "dynamic_annotations": { "name": "dynamic_annotations_impl", "hdrs": [ - "//tensorflow/core/platform:default/dynamic_annotations.h", + "//tensorflow/core/platform/default:dynamic_annotations.h", ], "visibility": ["//visibility:private"], "tags": ["no_oss", "manual"], @@ -67,9 +67,9 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "//tensorflow/core/platform:file_system.cc", "//tensorflow/core/platform:file_system_helper.cc", "//tensorflow/core/platform:threadpool.cc", - "//tensorflow/core/platform:default/env.cc", - "//tensorflow/core/platform:default/posix_file_system.h", - "//tensorflow/core/platform:default/posix_file_system.cc", + "//tensorflow/core/platform/default:env.cc", + "//tensorflow/core/platform/default:posix_file_system.h", + "//tensorflow/core/platform/default:posix_file_system.cc", ], "deps": [ "@com_google_absl//absl/time", @@ -112,7 +112,7 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "//tensorflow/core/platform:env_time.h", ], "srcs": [ - "//tensorflow/core/platform:default/env_time.cc", + "//tensorflow/core/platform/default:env_time.cc", ], "deps": [ "//tensorflow/core/platform:types", @@ -126,7 +126,7 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "//tensorflow/core/platform:human_readable_json.h", ], "srcs": [ - "//tensorflow/core/platform:default/human_readable_json.cc", + "//tensorflow/core/platform/default:human_readable_json.cc", ], "deps": [ "//tensorflow/core/platform:errors", @@ -143,7 +143,7 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "//tensorflow/core/platform:load_library.h", ], "srcs": [ - "//tensorflow/core/platform:default/load_library.cc", + "//tensorflow/core/platform/default:load_library.cc", ], "deps": [ "//tensorflow/core/platform:errors", @@ -158,10 +158,10 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "//tensorflow/core/platform:logging.h", ], "textual_hdrs": [ - "//tensorflow/core/platform:default/logging.h", + "//tensorflow/core/platform/default:logging.h", ], "srcs": [ - "//tensorflow/core/platform:default/logging.cc", + "//tensorflow/core/platform/default:logging.cc", ], "deps": [ "@com_google_absl//absl/base", @@ -180,7 +180,7 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "//tensorflow/core/platform:monitoring.h", ], "srcs": [ - "//tensorflow/core/platform:default/monitoring.cc", + "//tensorflow/core/platform/default:monitoring.cc", ], "visibility": ["//visibility:private"], "tags": ["no_oss", "manual"], @@ -191,11 +191,11 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "//tensorflow/core/platform:mutex.h", ], "textual_hdrs": [ - "//tensorflow/core/platform:default/mutex.h", + "//tensorflow/core/platform/default:mutex.h", ], "srcs": [ - "//tensorflow/core/platform:default/mutex.cc", - "//tensorflow/core/platform:default/mutex_data.h", + "//tensorflow/core/platform/default:mutex.cc", + "//tensorflow/core/platform/default:mutex_data.h", ], "deps": [ "@nsync//:nsync_cpp", @@ -213,7 +213,7 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "//tensorflow/core/platform:net.h", ], "srcs": [ - "//tensorflow/core/platform:default/net.cc", + "//tensorflow/core/platform/default:net.cc", ], "deps": [ "//tensorflow/core/platform:strcat", @@ -226,7 +226,7 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "notification": { "name": "notification_impl", "hdrs": [ - "//tensorflow/core/platform:default/notification.h", + "//tensorflow/core/platform/default:notification.h", ], "deps": [ "//tensorflow/core/platform:mutex", @@ -241,7 +241,7 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "//tensorflow/core/platform:rocm_rocdl_path.h", ], "srcs": [ - "//tensorflow/core/platform:default/rocm_rocdl_path.cc", + "//tensorflow/core/platform/default:rocm_rocdl_path.cc", ], "deps": [ "@local_config_rocm//rocm:rocm_headers", @@ -255,7 +255,7 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "stacktrace": { "name": "stacktrace_impl", "hdrs": [ - "//tensorflow/core/platform:default/stacktrace.h", + "//tensorflow/core/platform/default:stacktrace.h", ], "deps": [ "//tensorflow/core/platform:abi", @@ -270,7 +270,7 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "//tensorflow/core/platform:stacktrace_handler.h", ], "srcs": [ - "//tensorflow/core/platform:default/stacktrace_handler.cc", + "//tensorflow/core/platform/default:stacktrace_handler.cc", ], "deps": [ "//tensorflow/core/platform", @@ -282,7 +282,7 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "strong_hash": { "name": "strong_hash_impl", "textual_hdrs": [ - "//tensorflow/core/platform:default/strong_hash.h", + "//tensorflow/core/platform/default:strong_hash.h", ], "deps": [ "@highwayhash//:sip_hash", @@ -293,13 +293,13 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "subprocess": { "name": "subprocess_impl", "textual_hdrs": [ - "//tensorflow/core/platform:default/subprocess.h", + "//tensorflow/core/platform/default:subprocess.h", ], "hdrs": [ "//tensorflow/core/platform:subprocess.h", ], "srcs": [ - "//tensorflow/core/platform:default/subprocess.cc", + "//tensorflow/core/platform/default:subprocess.cc", ], "deps": [ "//tensorflow/core/platform", @@ -316,7 +316,7 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "name": "test_impl", "testonly": True, "srcs": [ - "//tensorflow/core/platform:default/test.cc", + "//tensorflow/core/platform/default:test.cc", ], "hdrs": [ "//tensorflow/core/platform:test.h", @@ -337,10 +337,10 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "name": "test_benchmark_impl", "testonly": True, "srcs": [ - "//tensorflow/core/platform:default/test_benchmark.cc", + "//tensorflow/core/platform/default:test_benchmark.cc", ], "hdrs": [ - "//tensorflow/core/platform:default/test_benchmark.h", + "//tensorflow/core/platform/default:test_benchmark.h", ], "deps": [ "//tensorflow/core/platform", @@ -355,13 +355,13 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "tracing": { "name": "tracing_impl", "textual_hdrs": [ - "//tensorflow/core/platform:default/tracing_impl.h", + "//tensorflow/core/platform/default:tracing_impl.h", ], "hdrs": [ "//tensorflow/core/platform:tracing.h", ], "srcs": [ - "//tensorflow/core/platform:default/tracing.cc", + "//tensorflow/core/platform/default:tracing.cc", "//tensorflow/core/platform:tracing.cc", ], "deps": [ @@ -382,7 +382,7 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "types": { "name": "types_impl", "textual_hdrs": [ - "//tensorflow/core/platform:default/integral_types.h", + "//tensorflow/core/platform/default:integral_types.h", ], "tags": ["no_oss", "manual"], "visibility": ["//visibility:private"], @@ -390,10 +390,10 @@ TF_DEFAULT_PLATFORM_LIBRARIES = { "unbounded_work_queue": { "name": "unbounded_work_queue_impl", "hdrs": [ - "//tensorflow/core/platform:default/unbounded_work_queue.h", + "//tensorflow/core/platform/default:unbounded_work_queue.h", ], "srcs": [ - "//tensorflow/core/platform:default/unbounded_work_queue.cc", + "//tensorflow/core/platform/default:unbounded_work_queue.cc", ], "deps": [ "@com_google_absl//absl/memory", @@ -420,9 +420,9 @@ TF_WINDOWS_PLATFORM_LIBRARIES = { "//tensorflow/core/platform:file_system.cc", "//tensorflow/core/platform:file_system_helper.cc", "//tensorflow/core/platform:threadpool.cc", - "//tensorflow/core/platform:windows/env.cc", - "//tensorflow/core/platform:windows/windows_file_system.h", - "//tensorflow/core/platform:windows/windows_file_system.cc", + "//tensorflow/core/platform/windows:env.cc", + "//tensorflow/core/platform/windows:windows_file_system.h", + "//tensorflow/core/platform/windows:windows_file_system.cc", ], "deps": [ "@com_google_absl//absl/time", @@ -466,7 +466,7 @@ TF_WINDOWS_PLATFORM_LIBRARIES = { "//tensorflow/core/platform:env_time.h", ], "srcs": [ - "//tensorflow/core/platform:windows/env_time.cc", + "//tensorflow/core/platform/windows:env_time.cc", ], "deps": [ "//tensorflow/core/platform:types", @@ -480,7 +480,7 @@ TF_WINDOWS_PLATFORM_LIBRARIES = { "//tensorflow/core/platform:load_library.h", ], "srcs": [ - "//tensorflow/core/platform:windows/load_library.cc", + "//tensorflow/core/platform/windows:load_library.cc", ], "deps": [ "//tensorflow/core/platform:errors", @@ -496,7 +496,7 @@ TF_WINDOWS_PLATFORM_LIBRARIES = { "//tensorflow/core/platform:net.h", ], "srcs": [ - "//tensorflow/core/platform:windows/net.cc", + "//tensorflow/core/platform/windows:net.cc", ], "deps": [ "//tensorflow/core/platform:error", @@ -508,10 +508,10 @@ TF_WINDOWS_PLATFORM_LIBRARIES = { "stacktrace": { "name": "windows_stacktrace_impl", "hdrs": [ - "//tensorflow/core/platform:windows/stacktrace.h", + "//tensorflow/core/platform/windows:stacktrace.h", ], "srcs": [ - "//tensorflow/core/platform:windows/stacktrace.cc", + "//tensorflow/core/platform/windows:stacktrace.cc", ], "deps": [ "//tensorflow/core/platform:mutex", @@ -525,7 +525,7 @@ TF_WINDOWS_PLATFORM_LIBRARIES = { "//tensorflow/core/platform:stacktrace_handler.h", ], "srcs": [ - "//tensorflow/core/platform:windows/stacktrace_handler.cc", + "//tensorflow/core/platform/windows:stacktrace_handler.cc", ], "deps": [ "//tensorflow/core/platform:mutex", @@ -538,7 +538,7 @@ TF_WINDOWS_PLATFORM_LIBRARIES = { "subprocess": { "name": "windows_subprocess_impl", "textual_hdrs": [ - "//tensorflow/core/platform:windows/subprocess.h", + "//tensorflow/core/platform/windows:subprocess.h", ], "hdrs": [ "//tensorflow/core/platform:subprocess.h", @@ -555,7 +555,7 @@ TF_WINDOWS_PLATFORM_LIBRARIES = { "wide_char": { "name": "windows_wide_char_impl", "hdrs": [ - "//tensorflow/core/platform:windows/wide_char.h", + "//tensorflow/core/platform/windows:wide_char.h", ], "tags": ["no_oss", "manual", "nobuilder"], "visibility": ["//visibility:private"], @@ -571,7 +571,7 @@ def tf_instantiate_platform_libraries(names = []): name = "platform_port_impl", srcs = [ "//tensorflow/core/platform:cpu_info.cc", - "//tensorflow/core/platform:default/port.cc", + "//tensorflow/core/platform/default:port.cc", ], hdrs = [ "//tensorflow/core/platform:cpu_info.h", @@ -612,7 +612,7 @@ def tf_instantiate_platform_libraries(names = []): name = "windows_platform_port_impl", srcs = [ "//tensorflow/core/platform:cpu_info.cc", - "//tensorflow/core/platform:windows/port.cc", + "//tensorflow/core/platform/windows:port.cc", ], hdrs = [ "//tensorflow/core/platform:cpu_info.h", diff --git a/tensorflow/core/platform/rules_cc.bzl b/tensorflow/core/platform/rules_cc.bzl index e664512aa4c..7342d5ea545 100644 --- a/tensorflow/core/platform/rules_cc.bzl +++ b/tensorflow/core/platform/rules_cc.bzl @@ -1,7 +1,7 @@ """Provides an indirection layer to bazel cc_rules""" load( - "//tensorflow/core/platform:default/rules_cc.bzl", + "//tensorflow/core/platform/default:rules_cc.bzl", _cc_binary = "cc_binary", _cc_import = "cc_import", _cc_library = "cc_library", diff --git a/tensorflow/core/platform/windows/BUILD b/tensorflow/core/platform/windows/BUILD new file mode 100644 index 00000000000..a42646f356c --- /dev/null +++ b/tensorflow/core/platform/windows/BUILD @@ -0,0 +1,13 @@ +# Tensorflow windows-specific implementations of tensorflow/core/platform libraries. + +package( + default_visibility = [ + "//tensorflow/core/platform:__pkg__", + ], + licenses = ["notice"], # Apache 2.0 +) + +exports_files( + srcs = glob(["*"]), + visibility = ["//tensorflow/core/platform:__pkg__"], +) diff --git a/tensorflow/python/distribute/BUILD b/tensorflow/python/distribute/BUILD index a04e0b2b3ea..a6883a4cf5e 100644 --- a/tensorflow/python/distribute/BUILD +++ b/tensorflow/python/distribute/BUILD @@ -1,6 +1,6 @@ load("//tensorflow:tensorflow.bzl", "py_test", "tf_py_test") load("//tensorflow:tensorflow.bzl", "cuda_py_test") -load("//tensorflow/core/platform:default/distribute.bzl", "distribute_py_test") +load("//tensorflow/core/platform/default:distribute.bzl", "distribute_py_test") package( default_visibility = ["//tensorflow:internal"], diff --git a/tensorflow/python/keras/distribute/BUILD b/tensorflow/python/keras/distribute/BUILD index ff58dd11fc2..486704ff4e4 100644 --- a/tensorflow/python/keras/distribute/BUILD +++ b/tensorflow/python/keras/distribute/BUILD @@ -2,7 +2,7 @@ # keras/distribute package is intended to serve as the centralized place for things # related to dist-strat used by Keras.. -load("//tensorflow/core/platform:default/distribute.bzl", "distribute_py_test") +load("//tensorflow/core/platform/default:distribute.bzl", "distribute_py_test") load("//tensorflow:tensorflow.bzl", "cuda_py_test") package( diff --git a/tensorflow/stream_executor/cuda/BUILD b/tensorflow/stream_executor/cuda/BUILD index e3f55720048..08c6686a3c0 100644 --- a/tensorflow/stream_executor/cuda/BUILD +++ b/tensorflow/stream_executor/cuda/BUILD @@ -11,7 +11,7 @@ load( ) load("//tensorflow:tensorflow.bzl", "tf_copts") load( - "//tensorflow/core/platform:default/cuda_build_defs.bzl", + "//tensorflow/core/platform/default:cuda_build_defs.bzl", "if_cuda_is_configured", ) load( diff --git a/tensorflow/stream_executor/gpu/BUILD b/tensorflow/stream_executor/gpu/BUILD index d2a79579fb2..70ebfd14bb5 100644 --- a/tensorflow/stream_executor/gpu/BUILD +++ b/tensorflow/stream_executor/gpu/BUILD @@ -6,7 +6,7 @@ load( "if_gpu_is_configured", ) load( - "//tensorflow/core/platform:default/cuda_build_defs.bzl", + "//tensorflow/core/platform/default:cuda_build_defs.bzl", "if_cuda_is_configured", ) load("//tensorflow:tensorflow.bzl", "tf_copts") diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl index 3adf5fe9a4e..b68970c1aca 100644 --- a/tensorflow/tensorflow.bzl +++ b/tensorflow/tensorflow.bzl @@ -16,7 +16,7 @@ load( "if_tensorrt", ) load( - "//tensorflow/core/platform:default/cuda_build_defs.bzl", + "//tensorflow/core/platform/default:cuda_build_defs.bzl", "if_cuda_is_configured", ) load(