108a0c99f1
* TensorFlow: Clean up/simplify the installation, make sure the headers are installed so that horovod can find them successfully. Fix the 2.0.* builds. * Backport of 837c8b6b upstream "Remove contrib cloud bigtable and storage ops/kernels." Allows 2.0.* releases to build with '--config=nogcp' * comment regarding tensorflow issue #31187 Co-authored-by: Andrew W Elble <aweits@skl-a-00.rc.rit.edu>
77 lines
2.7 KiB
Diff
77 lines
2.7 KiB
Diff
--- a/tensorflow/core/BUILD.orig 2020-01-22 18:43:57.000000000 -0500
|
|
+++ b/tensorflow/core/BUILD 2020-03-26 16:33:17.318229701 -0400
|
|
@@ -107,8 +107,6 @@
|
|
load(
|
|
"//tensorflow/core/platform:default/build_config.bzl",
|
|
"tf_additional_all_protos",
|
|
- "tf_additional_cloud_kernel_deps",
|
|
- "tf_additional_cloud_op_deps",
|
|
"tf_additional_core_deps",
|
|
"tf_additional_cupti_wrapper_deps",
|
|
"tf_additional_device_tracer_cuda_deps",
|
|
@@ -1427,7 +1425,7 @@
|
|
]) + if_tensorrt([
|
|
"//tensorflow/compiler/tf2tensorrt:trt_engine_resource_ops_op_lib",
|
|
"//tensorflow/compiler/tf2tensorrt:trt_op_libs",
|
|
- ]) + tf_additional_cloud_op_deps(),
|
|
+ ]),
|
|
alwayslink = 1,
|
|
)
|
|
|
|
@@ -1590,7 +1588,7 @@
|
|
"//tensorflow/core/kernels:summary_kernels",
|
|
"//tensorflow/core/kernels:training_ops",
|
|
"//tensorflow/core/kernels:word2vec_kernels",
|
|
- ] + tf_additional_cloud_kernel_deps() + if_not_windows([
|
|
+ ] + if_not_windows([
|
|
"//tensorflow/core/kernels:fact_op",
|
|
"//tensorflow/core/kernels:array_not_windows",
|
|
"//tensorflow/core/kernels:math_not_windows",
|
|
|
|
diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl
|
|
index b822effa14e5..61a19bdf128f 100644
|
|
--- a/tensorflow/core/platform/default/build_config.bzl
|
|
+++ b/tensorflow/core/platform/default/build_config.bzl
|
|
@@ -682,38 +682,6 @@ def tf_additional_core_deps():
|
|
],
|
|
})
|
|
|
|
-# TODO(jart, jhseu): Delete when GCP is default on.
|
|
-def tf_additional_cloud_op_deps():
|
|
- return select({
|
|
- "//tensorflow:android": [],
|
|
- "//tensorflow:ios": [],
|
|
- "//tensorflow:linux_s390x": [],
|
|
- "//tensorflow:windows": [],
|
|
- "//tensorflow:api_version_2": [],
|
|
- "//tensorflow:windows_and_api_version_2": [],
|
|
- "//tensorflow:no_gcp_support": [],
|
|
- "//conditions:default": [
|
|
- "//tensorflow/contrib/cloud:bigquery_reader_ops_op_lib",
|
|
- "//tensorflow/contrib/cloud:gcs_config_ops_op_lib",
|
|
- ],
|
|
- })
|
|
-
|
|
-# TODO(jhseu): Delete when GCP is default on.
|
|
-def tf_additional_cloud_kernel_deps():
|
|
- return select({
|
|
- "//tensorflow:android": [],
|
|
- "//tensorflow:ios": [],
|
|
- "//tensorflow:linux_s390x": [],
|
|
- "//tensorflow:windows": [],
|
|
- "//tensorflow:api_version_2": [],
|
|
- "//tensorflow:windows_and_api_version_2": [],
|
|
- "//tensorflow:no_gcp_support": [],
|
|
- "//conditions:default": [
|
|
- "//tensorflow/contrib/cloud/kernels:bigquery_reader_ops",
|
|
- "//tensorflow/contrib/cloud/kernels:gcs_config_ops",
|
|
- ],
|
|
- })
|
|
-
|
|
def tf_lib_proto_parsing_deps():
|
|
return [
|
|
":protos_all_cc",
|
|
--
|
|
2.19.1
|
|
|