Remove TF_NEED_KAFKA from configure.py as it is not needed anymore. (#17565)

* Remove TF_NEED_KAFKA from configure.py as it is not needed anymore.

With the new update in kafka dataset support, it looks like
TF_NEED_KAFKA is not needed any more as we are loading .so
dynamically. For that I think it makes sense to remove TF_NEED_KAFKA
option from configure.py.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* Remove with_kafka_support from tensorflow/BUILD

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* Disable kafka module if with_kafka_support is false

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* Add flag of with_kafka_support_windows_override

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* Remove duplication of kafka in bazel BUILD

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
Yong Tang 2018-03-24 01:29:22 +08:00 committed by Gunhan Gulsoy
parent 1897cea180
commit 319f20ad87
3 changed files with 29 additions and 7 deletions

View File

@ -1414,7 +1414,7 @@ def main():
set_build_var(environ_cp, 'TF_NEED_S3', 'Amazon S3 File System', set_build_var(environ_cp, 'TF_NEED_S3', 'Amazon S3 File System',
'with_s3_support', True, 's3') 'with_s3_support', True, 's3')
set_build_var(environ_cp, 'TF_NEED_KAFKA', 'Apache Kafka Platform', set_build_var(environ_cp, 'TF_NEED_KAFKA', 'Apache Kafka Platform',
'with_kafka_support', False, 'kafka') 'with_kafka_support', True, 'kafka')
set_build_var(environ_cp, 'TF_ENABLE_XLA', 'XLA JIT', 'with_xla_support', set_build_var(environ_cp, 'TF_ENABLE_XLA', 'XLA JIT', 'with_xla_support',
False, 'xla') False, 'xla')
set_build_var(environ_cp, 'TF_NEED_GDR', 'GDR', 'with_gdr_support', set_build_var(environ_cp, 'TF_NEED_GDR', 'GDR', 'with_gdr_support',

View File

@ -240,6 +240,13 @@ config_setting(
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
) )
config_setting(
name = "with_kafka_support_windows_override",
define_values = {"with_kafka_support": "true"},
values = {"cpu": "x64_windows"},
visibility = ["//visibility:public"],
)
config_setting( config_setting(
name = "with_gcp_support_android_override", name = "with_gcp_support_android_override",
define_values = {"with_gcp_support": "true"}, define_values = {"with_gcp_support": "true"},

View File

@ -51,7 +51,6 @@ py_library(
"//tensorflow/contrib/image:single_image_random_dot_stereograms_py", "//tensorflow/contrib/image:single_image_random_dot_stereograms_py",
"//tensorflow/contrib/input_pipeline:input_pipeline_py", "//tensorflow/contrib/input_pipeline:input_pipeline_py",
"//tensorflow/contrib/integrate:integrate_py", "//tensorflow/contrib/integrate:integrate_py",
"//tensorflow/contrib/kafka",
"//tensorflow/contrib/keras", "//tensorflow/contrib/keras",
"//tensorflow/contrib/kernel_methods", "//tensorflow/contrib/kernel_methods",
"//tensorflow/contrib/kfac", "//tensorflow/contrib/kfac",
@ -110,7 +109,13 @@ py_library(
"//tensorflow/python:util", "//tensorflow/python:util",
] + if_mpi(["//tensorflow/contrib/mpi_collectives:mpi_collectives_py"]) + if_tensorrt([ ] + if_mpi(["//tensorflow/contrib/mpi_collectives:mpi_collectives_py"]) + if_tensorrt([
"//tensorflow/contrib/tensorrt:init_py", "//tensorflow/contrib/tensorrt:init_py",
]), ]) + select({
"//tensorflow:with_kafka_support_windows_override": [],
"//tensorflow:with_kafka_support": [
"//tensorflow/contrib/kafka",
],
"//conditions:default": [],
}),
) )
cc_library( cc_library(
@ -120,7 +125,6 @@ cc_library(
"//tensorflow/contrib/boosted_trees:boosted_trees_kernels", "//tensorflow/contrib/boosted_trees:boosted_trees_kernels",
"//tensorflow/contrib/coder:all_kernels", "//tensorflow/contrib/coder:all_kernels",
"//tensorflow/contrib/data/kernels:dataset_kernels", "//tensorflow/contrib/data/kernels:dataset_kernels",
"//tensorflow/contrib/kafka:dataset_kernels",
"//tensorflow/contrib/factorization/kernels:all_kernels", "//tensorflow/contrib/factorization/kernels:all_kernels",
"//tensorflow/contrib/input_pipeline:input_pipeline_ops_kernels", "//tensorflow/contrib/input_pipeline:input_pipeline_ops_kernels",
"//tensorflow/contrib/layers:sparse_feature_cross_op_kernel", "//tensorflow/contrib/layers:sparse_feature_cross_op_kernel",
@ -133,7 +137,13 @@ cc_library(
"//tensorflow/contrib/text:all_kernels", "//tensorflow/contrib/text:all_kernels",
] + if_mpi(["//tensorflow/contrib/mpi_collectives:mpi_collectives_py"]) + if_cuda([ ] + if_mpi(["//tensorflow/contrib/mpi_collectives:mpi_collectives_py"]) + if_cuda([
"//tensorflow/contrib/nccl:nccl_kernels", "//tensorflow/contrib/nccl:nccl_kernels",
]), ]) + select({
"//tensorflow:with_kafka_support_windows_override": [],
"//tensorflow:with_kafka_support": [
"//tensorflow/contrib/kafka:dataset_kernels",
],
"//conditions:default": [],
}),
) )
cc_library( cc_library(
@ -146,7 +156,6 @@ cc_library(
"//tensorflow/contrib/factorization:all_ops", "//tensorflow/contrib/factorization:all_ops",
"//tensorflow/contrib/framework:all_ops", "//tensorflow/contrib/framework:all_ops",
"//tensorflow/contrib/input_pipeline:input_pipeline_ops_op_lib", "//tensorflow/contrib/input_pipeline:input_pipeline_ops_op_lib",
"//tensorflow/contrib/kafka:dataset_ops_op_lib",
"//tensorflow/contrib/layers:sparse_feature_cross_op_op_lib", "//tensorflow/contrib/layers:sparse_feature_cross_op_op_lib",
"//tensorflow/contrib/nccl:nccl_ops_op_lib", "//tensorflow/contrib/nccl:nccl_ops_op_lib",
"//tensorflow/contrib/nearest_neighbor:nearest_neighbor_ops_op_lib", "//tensorflow/contrib/nearest_neighbor:nearest_neighbor_ops_op_lib",
@ -157,7 +166,13 @@ cc_library(
"//tensorflow/contrib/tensor_forest:tensor_forest_ops_op_lib", "//tensorflow/contrib/tensor_forest:tensor_forest_ops_op_lib",
"//tensorflow/contrib/text:all_ops", "//tensorflow/contrib/text:all_ops",
"//tensorflow/contrib/tpu:all_ops", "//tensorflow/contrib/tpu:all_ops",
], ] + select({
"//tensorflow:with_kafka_support_windows_override": [],
"//tensorflow:with_kafka_support": [
"//tensorflow/contrib/kafka:dataset_ops_op_lib",
],
"//conditions:default": [],
}),
) )
filegroup( filegroup(