Automated rollback of commit 72f193b5c9f306d258b289afd7a7977af7b8f5f7
PiperOrigin-RevId: 222910206
diff --git a/configure.py b/configure.py
index 0b16fe1..dfb8755 100644
--- a/configure.py
+++ b/configure.py
@@ -1694,6 +1694,7 @@
config_info_line('nohdfs', 'Disable HDFS support.')
config_info_line('noignite', 'Disable Apacha Ignite support.')
config_info_line('nokafka', 'Disable Apache Kafka support.')
+ config_info_line('nonccl', 'Disable NVIDIA NCCL support.')
if __name__ == '__main__':
diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index 17577af..fd4b942 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -246,6 +246,12 @@
visibility = ["//visibility:public"],
)
+config_setting(
+ name = "no_nccl_support",
+ define_values = {"no_nccl_support": "true"},
+ visibility = ["//visibility:public"],
+)
+
# Crosses between platforms and file system libraries not supported on those
# platforms due to limitations in nested select() statements.
config_setting(
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 781ada7..bd5bbaa 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -95,7 +95,7 @@
load("//tensorflow:tensorflow.bzl", "tf_cc_tests_gpu")
load("//tensorflow:tensorflow.bzl", "tf_cuda_cc_test")
load("//tensorflow:tensorflow.bzl", "tf_version_info_genrule")
-load("//tensorflow:tensorflow.bzl", "if_not_tx2_llvm_or_windows_cuda")
+load("//tensorflow:tensorflow.bzl", "if_nccl")
load("//tensorflow:tensorflow.bzl", "tf_cuda_only_cc_test")
# For platform specific build config
@@ -1416,9 +1416,7 @@
"//tensorflow/core/kernels:summary_kernels",
"//tensorflow/core/kernels:training_ops",
"//tensorflow/core/kernels:word2vec_kernels",
- ] + tf_additional_cloud_kernel_deps() + if_not_tx2_llvm_or_windows_cuda([
- "//tensorflow/core/kernels:nccl_kernels",
- ]) + if_not_windows([
+ ] + tf_additional_cloud_kernel_deps() + if_not_windows([
"//tensorflow/core/kernels:fact_op",
"//tensorflow/core/kernels:array_not_windows",
"//tensorflow/core/kernels:math_not_windows",
@@ -1443,6 +1441,8 @@
]) + if_cuda([
"//tensorflow/core/grappler/optimizers:gpu_swapping_kernels",
"//tensorflow/core/grappler/optimizers:gpu_swapping_ops",
+ ]) + if_nccl([
+ "//tensorflow/core/kernels:nccl_kernels",
]),
)
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index 2d67d1f..4bc6844 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -203,8 +203,12 @@
"//conditions:default": [],
})
-def if_not_tx2_llvm_or_windows_cuda(a):
- return if_not_windows_cuda(a)
+def if_nccl(a):
+ return select({
+ "//tensorflow:no_nccl_support": [],
+ "//tensorflow:windows": [],
+ "//conditions:default": a,
+ })
def get_win_copts(is_external = False):
WINDOWS_COPTS = [
diff --git a/tools/bazel.rc b/tools/bazel.rc
index 8c2052e..1fdf51f 100644
--- a/tools/bazel.rc
+++ b/tools/bazel.rc
@@ -72,6 +72,7 @@
build:nohdfs --define=no_hdfs_support=true
build:nokafka --define=no_kafka_support=true
build:noignite --define=no_ignite_support=true
+build:nonccl --define=no_nccl_support=true
build --define=use_fast_cpp_protos=true
build --define=allow_oversize_protos=true