Adding cross platform net and subprocess targets to tensorflow/core/platform/BUILD.
PiperOrigin-RevId: 268537920
diff --git a/tensorflow/core/platform/BUILD b/tensorflow/core/platform/BUILD
index 431b5d9..55e72d8 100644
--- a/tensorflow/core/platform/BUILD
+++ b/tensorflow/core/platform/BUILD
@@ -59,10 +59,12 @@
"env_time",
"human_readable_json",
"mutex",
+ "net",
"notification",
"platform_port",
"rocm_rocdl_path",
"strong_hash",
+ "subprocess",
])
cc_library(
@@ -247,6 +249,12 @@
)
cc_library(
+ name = "net",
+ textual_hdrs = ["net.h"],
+ deps = tf_platform_helper_deps("net_impl"),
+)
+
+cc_library(
name = "notification",
hdrs = ["notification.h"],
deps = [
@@ -459,6 +467,14 @@
)
cc_library(
+ name = "subprocess",
+ textual_hdrs = [
+ "subprocess.h",
+ ],
+ deps = tf_platform_helper_deps("subprocess_impl"),
+)
+
+cc_library(
name = "thread_annotations",
hdrs = ["thread_annotations.h"],
)
diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl
index 4fe05ea..79ea852 100644
--- a/tensorflow/core/platform/default/build_config.bzl
+++ b/tensorflow/core/platform/default/build_config.bzl
@@ -489,7 +489,9 @@
"default/*.h",
"windows/*.h",
"posix/error.h",
- ], exclude = exclude)
+ ], exclude = exclude + [
+ "default/subprocess.h",
+ ])
return select({
"//tensorflow:windows": windows_hdrs,
"//conditions:default": native.glob([
@@ -503,7 +505,12 @@
"default/*.cc",
"windows/*.cc",
"posix/error.cc",
- ], exclude = exclude + ["default/port.cc"])
+ ], exclude = exclude + [
+ "default/env_time.cc",
+ "default/net.cc",
+ "default/port.cc",
+ "default/subprocess.cc",
+ ])
return select({
"//tensorflow:windows": windows_srcs,
"//conditions:default": native.glob([
diff --git a/tensorflow/core/platform/default/build_refactor.bzl b/tensorflow/core/platform/default/build_refactor.bzl
index a1238a8..4a92cbe 100644
--- a/tensorflow/core/platform/default/build_refactor.bzl
+++ b/tensorflow/core/platform/default/build_refactor.bzl
@@ -111,6 +111,21 @@
"visibility": ["//visibility:private"],
"tags": ["no_oss", "manual"],
},
+ "net": {
+ "name": "net_impl",
+ "hdrs": [
+ "//tensorflow/core/platform:net.h",
+ ],
+ "srcs": [
+ "//tensorflow/core/platform:default/net.cc",
+ ],
+ "deps": [
+ "//tensorflow/core/lib/strings:string_utils",
+ "//tensorflow/core/platform:logging",
+ ],
+ "visibility": ["//visibility:private"],
+ "tags": ["no_oss", "manual"],
+ },
"notification": {
"name": "notification_impl",
"hdrs": [
@@ -150,6 +165,27 @@
"visibility": ["//visibility:private"],
"tags": ["no_oss", "manual"],
},
+ "subprocess": {
+ "name": "subprocess_impl",
+ "textual_hdrs": [
+ "//tensorflow/core/platform:default/subprocess.h",
+ ],
+ "hdrs": [
+ "//tensorflow/core/platform:subprocess.h",
+ ],
+ "srcs": [
+ "//tensorflow/core/platform:default/subprocess.cc",
+ ],
+ "deps": [
+ "//tensorflow/core/platform",
+ "//tensorflow/core/platform:logging",
+ "//tensorflow/core/platform:macros",
+ "//tensorflow/core/platform:mutex",
+ "//tensorflow/core/platform:types",
+ ],
+ "tags": ["no_oss", "manual"],
+ "visibility": ["//visibility:private"],
+ },
}
TF_WINDOWS_PLATFORM_LIBRARIES = {
@@ -167,6 +203,38 @@
"visibility": ["//visibility:private"],
"tags": ["no_oss", "manual"],
},
+ "net": {
+ "name": "windows_net_impl",
+ "hdrs": [
+ "//tensorflow/core/platform:net.h",
+ ],
+ "srcs": [
+ "//tensorflow/core/platform:windows/net.cc",
+ ],
+ "deps": [
+ "//tensorflow/core/platform:error",
+ "//tensorflow/core/platform:logging",
+ ],
+ "visibility": ["//visibility:private"],
+ "tags": ["no_oss", "manual"],
+ },
+ "subprocess": {
+ "name": "windows_subprocess_impl",
+ "textual_hdrs": [
+ "//tensorflow/core/platform:windows/subprocess.h",
+ ],
+ "hdrs": [
+ "//tensorflow/core/platform:subprocess.h",
+ ],
+ "deps": [
+ "//tensorflow/core/platform",
+ "//tensorflow/core/platform:logging",
+ "//tensorflow/core/platform:macros",
+ "//tensorflow/core/platform:types",
+ ],
+ "tags": ["no_oss", "manual"],
+ "visibility": ["//visibility:private"],
+ },
}
def tf_instantiate_platform_libraries(names = []):
diff --git a/tensorflow/core/platform/posix/net.cc b/tensorflow/core/platform/default/net.cc
similarity index 100%
rename from tensorflow/core/platform/posix/net.cc
rename to tensorflow/core/platform/default/net.cc
diff --git a/tensorflow/core/platform/posix/subprocess.cc b/tensorflow/core/platform/default/subprocess.cc
similarity index 100%
rename from tensorflow/core/platform/posix/subprocess.cc
rename to tensorflow/core/platform/default/subprocess.cc
diff --git a/tensorflow/core/platform/posix/subprocess.h b/tensorflow/core/platform/default/subprocess.h
similarity index 100%
rename from tensorflow/core/platform/posix/subprocess.h
rename to tensorflow/core/platform/default/subprocess.h
diff --git a/tensorflow/core/platform/subprocess.h b/tensorflow/core/platform/subprocess.h
index 7c11e62..d18b69a 100644
--- a/tensorflow/core/platform/subprocess.h
+++ b/tensorflow/core/platform/subprocess.h
@@ -19,6 +19,8 @@
#include <memory>
#include <vector>
+#include "tensorflow/core/platform/types.h"
+
namespace tensorflow {
// Channel identifiers.
@@ -60,7 +62,7 @@
#include "tensorflow/core/platform/google/subprocess.h"
#elif defined(PLATFORM_POSIX) || defined(PLATFORM_POSIX_ANDROID) || \
defined(PLATFORM_GOOGLE_ANDROID)
-#include "tensorflow/core/platform/posix/subprocess.h"
+#include "tensorflow/core/platform/default/subprocess.h"
#elif defined(PLATFORM_WINDOWS)
#include "tensorflow/core/platform/windows/subprocess.h"
#else