diff --git a/tensorflow/BUILD b/tensorflow/BUILD index 85a8a98eff6..7eaf0ac79b8 100644 --- a/tensorflow/BUILD +++ b/tensorflow/BUILD @@ -1088,7 +1088,7 @@ gen_api_init_files( py_library( name = "tensorflow_py", - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = select({ "api_version_2": [], @@ -1110,7 +1110,7 @@ py_library( "//tensorflow/python/keras/api:keras_python_api_gen_compat_v1", "//tensorflow/python/keras/api:keras_python_api_gen_compat_v2", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = ["//tensorflow/python:no_contrib"], ) diff --git a/tensorflow/compiler/jit/ops/BUILD b/tensorflow/compiler/jit/ops/BUILD index 6ca8fd0e34a..4bbc8fba3c0 100644 --- a/tensorflow/compiler/jit/ops/BUILD +++ b/tensorflow/compiler/jit/ops/BUILD @@ -22,5 +22,6 @@ tf_gen_op_wrapper_py( py_library( name = "xla_ops_grad", srcs = ["xla_ops_grad.py"], + srcs_version = "PY3", deps = ["//tensorflow/python:framework_ops"], ) diff --git a/tensorflow/compiler/mlir/tensorflow/tests/tf_saved_model/BUILD b/tensorflow/compiler/mlir/tensorflow/tests/tf_saved_model/BUILD index 8ba18215ab5..63d6cdc5c48 100644 --- a/tensorflow/compiler/mlir/tensorflow/tests/tf_saved_model/BUILD +++ b/tensorflow/compiler/mlir/tensorflow/tests/tf_saved_model/BUILD @@ -8,7 +8,7 @@ package( py_library( name = "common", srcs = ["common.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow:tensorflow_py", ], @@ -17,7 +17,7 @@ py_library( py_library( name = "common_v1", srcs = ["common_v1.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow:tensorflow_py", ], diff --git a/tensorflow/compiler/mlir/tfr/examples/mnist/BUILD b/tensorflow/compiler/mlir/tfr/examples/mnist/BUILD index ae0ab76ed1a..920d1b2f21c 100644 --- a/tensorflow/compiler/mlir/tfr/examples/mnist/BUILD +++ b/tensorflow/compiler/mlir/tfr/examples/mnist/BUILD @@ -49,6 +49,7 @@ py_library( name = "mnist_train", srcs = ["mnist_train.py"], data = [":mnist_ops_mlir"], + srcs_version = "PY3", deps = [ ":mnist_ops", ":mnist_ops_py", diff --git a/tensorflow/compiler/tests/BUILD b/tensorflow/compiler/tests/BUILD index 0a7135f4868..07c52099140 100644 --- a/tensorflow/compiler/tests/BUILD +++ b/tensorflow/compiler/tests/BUILD @@ -41,7 +41,7 @@ py_library( name = "xla_test", testonly = 1, srcs = ["xla_test.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = [":friends"], deps = [ "//tensorflow/core:protos_all_py", @@ -65,7 +65,7 @@ py_library( "__init__.py", "test_utils.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//third_party/py/numpy", "@six_archive//:six", @@ -1729,7 +1729,7 @@ py_library( name = "lstm", testonly = 1, srcs = ["lstm.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:framework", diff --git a/tensorflow/compiler/xla/experimental/xla_sharding/BUILD b/tensorflow/compiler/xla/experimental/xla_sharding/BUILD index 8e14bc0f67c..ec794a26662 100644 --- a/tensorflow/compiler/xla/experimental/xla_sharding/BUILD +++ b/tensorflow/compiler/xla/experimental/xla_sharding/BUILD @@ -9,6 +9,7 @@ package( py_library( name = "xla_sharding", srcs = ["xla_sharding.py"], + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/compiler/tf2xla/python:xla", diff --git a/tensorflow/compiler/xla/python/tpu_driver/client/BUILD b/tensorflow/compiler/xla/python/tpu_driver/client/BUILD index 3296d29c8ff..ec05d933316 100644 --- a/tensorflow/compiler/xla/python/tpu_driver/client/BUILD +++ b/tensorflow/compiler/xla/python/tpu_driver/client/BUILD @@ -76,7 +76,7 @@ py_library( srcs = [ "tpu_client.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":tpu_client_extension", diff --git a/tensorflow/compiler/xla/python_api/BUILD b/tensorflow/compiler/xla/python_api/BUILD index 348a80abe2c..43b340c9895 100644 --- a/tensorflow/compiler/xla/python_api/BUILD +++ b/tensorflow/compiler/xla/python_api/BUILD @@ -9,6 +9,7 @@ package( py_library( name = "types", srcs = ["types.py"], + srcs_version = "PY3", deps = [ "//tensorflow/compiler/xla:xla_data_proto_py", "//tensorflow/python:dtypes", @@ -20,6 +21,7 @@ py_library( py_library( name = "xla_shape", srcs = ["xla_shape.py"], + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":types", @@ -30,6 +32,7 @@ py_library( py_library( name = "xla_literal", srcs = ["xla_literal.py"], + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":types", diff --git a/tensorflow/examples/adding_an_op/BUILD b/tensorflow/examples/adding_an_op/BUILD index f40a310728c..92a6d8a51a8 100644 --- a/tensorflow/examples/adding_an_op/BUILD +++ b/tensorflow/examples/adding_an_op/BUILD @@ -23,7 +23,7 @@ py_library( name = "zero_out_op_1", srcs = ["zero_out_op_1.py"], data = [":zero_out_op_kernel_1.so"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = ["//tensorflow:tensorflow_py"], ) @@ -36,7 +36,7 @@ py_library( name = "zero_out_op_2", srcs = ["zero_out_op_2.py"], data = [":zero_out_op_kernel_2.so"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = ["//tensorflow:tensorflow_py"], ) @@ -49,14 +49,14 @@ py_library( name = "zero_out_op_3", srcs = ["zero_out_op_3.py"], data = [":zero_out_op_kernel_3.so"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = ["//tensorflow:tensorflow_py"], ) py_library( name = "zero_out_grad_2", srcs = ["zero_out_grad_2.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:framework_for_generated_wrappers", @@ -123,7 +123,7 @@ py_library( name = "cuda_op", srcs = ["cuda_op.py"], data = [":cuda_op_kernel.so"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = ["//tensorflow:tensorflow_py"], ) diff --git a/tensorflow/examples/speech_commands/BUILD b/tensorflow/examples/speech_commands/BUILD index 8e41e36296f..e241a39996b 100644 --- a/tensorflow/examples/speech_commands/BUILD +++ b/tensorflow/examples/speech_commands/BUILD @@ -52,7 +52,7 @@ py_library( srcs = [ "models.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow:tensorflow_py", "//third_party/py/numpy", @@ -78,7 +78,7 @@ py_library( srcs = [ "input_data.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow:tensorflow_py", "//tensorflow/lite/experimental/microfrontend:audio_microfrontend_py", @@ -115,7 +115,7 @@ py_library( srcs = [ "train.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":input_data", ":models", @@ -150,7 +150,7 @@ py_binary( py_library( name = "freeze_main_lib", srcs = ["freeze.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [":freeze_lib"], ) @@ -159,7 +159,7 @@ py_library( srcs = [ "freeze.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", tags = [ "no_pip", # b/131330719 ], @@ -195,7 +195,7 @@ py_binary( py_library( name = "wav_to_features_main_lib", srcs = ["wav_to_features.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [":wav_to_features_lib"], ) @@ -204,7 +204,7 @@ py_library( srcs = [ "wav_to_features.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":input_data", ":models", @@ -237,7 +237,7 @@ py_binary( py_library( name = "generate_streaming_test_wav_main_lib", srcs = ["generate_streaming_test_wav.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [":generate_streaming_test_wav_lib"], ) @@ -246,7 +246,7 @@ py_library( srcs = [ "generate_streaming_test_wav.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":input_data", ":models", @@ -295,7 +295,7 @@ py_binary( py_library( name = "label_wav_main_lib", srcs = ["label_wav.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [":label_wav_lib"], ) @@ -304,7 +304,7 @@ py_library( srcs = [ "label_wav.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow:tensorflow_py", ], @@ -411,7 +411,7 @@ tf_cc_binary( py_library( name = "test_lib", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":freeze", ":generate_streaming_test_wav", diff --git a/tensorflow/lite/experimental/examples/lstm/BUILD b/tensorflow/lite/experimental/examples/lstm/BUILD index 019967b794c..d4d4dac3544 100644 --- a/tensorflow/lite/experimental/examples/lstm/BUILD +++ b/tensorflow/lite/experimental/examples/lstm/BUILD @@ -8,7 +8,7 @@ package( py_library( name = "input_data", srcs = ["input_data.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:private"], deps = [ "//tensorflow/python:framework", @@ -21,7 +21,7 @@ py_library( py_library( name = "rnn", srcs = ["rnn.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/lite/python:op_hint", @@ -36,7 +36,7 @@ py_library( py_library( name = "rnn_cell", srcs = ["rnn_cell.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/lite/python:op_hint", @@ -140,7 +140,7 @@ py_test( py_library( name = "tflite_lstm_ops", - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":rnn", diff --git a/tensorflow/lite/experimental/tensorboard/BUILD b/tensorflow/lite/experimental/tensorboard/BUILD index 25fe794c5ea..3eb16053888 100644 --- a/tensorflow/lite/experimental/tensorboard/BUILD +++ b/tensorflow/lite/experimental/tensorboard/BUILD @@ -8,7 +8,7 @@ package( py_library( name = "ops_util", srcs = ["ops_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/lite/python:wrap_toco", diff --git a/tensorflow/lite/micro/examples/person_detection/utils/BUILD b/tensorflow/lite/micro/examples/person_detection/utils/BUILD index 733040e2ca6..63dbd2f157c 100644 --- a/tensorflow/lite/micro/examples/person_detection/utils/BUILD +++ b/tensorflow/lite/micro/examples/person_detection/utils/BUILD @@ -16,7 +16,7 @@ py_binary( py_library( name = "raw_to_bitmap_lib", srcs = ["raw_to_bitmap.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//third_party/py/numpy", ], diff --git a/tensorflow/lite/python/BUILD b/tensorflow/lite/python/BUILD index 5007236cc00..d564f32d28c 100644 --- a/tensorflow/lite/python/BUILD +++ b/tensorflow/lite/python/BUILD @@ -19,7 +19,7 @@ py_library( "interpreter.py", ], compatible_with = get_compatible_with_portable(), - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/lite/python/interpreter_wrapper:_pywrap_tensorflow_interpreter_wrapper", @@ -71,7 +71,7 @@ py_binary( py_library( name = "tflite_convert_main_lib", srcs = ["tflite_convert.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":tflite_convert_lib", @@ -83,7 +83,7 @@ py_library( py_library( name = "tflite_convert_lib", srcs = ["tflite_convert.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":lite", @@ -98,7 +98,7 @@ py_library( name = "test_util", testonly = 1, srcs = ["test_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":lite", ":schema_util", @@ -166,7 +166,7 @@ py_test( py_library( name = "lite", srcs = ["lite.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":convert", @@ -236,7 +236,7 @@ py_library( name = "lite_v2_test_util", testonly = 1, srcs = ["lite_v2_test_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", tags = [ "no_windows", ], @@ -265,7 +265,7 @@ py_test( py_library( name = "util", srcs = ["util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = [ "//tensorflow/lite:__subpackages__", ], @@ -321,7 +321,7 @@ py_library( srcs = [ "tflite_keras_util.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", "//tensorflow/python/eager:def_function", @@ -333,7 +333,7 @@ py_library( srcs = [ "wrap_toco.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:_pywrap_toco_api", "//tensorflow/python:pywrap_tensorflow", @@ -344,7 +344,7 @@ py_library( py_library( name = "lite_constants", srcs = ["lite_constants.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/lite/toco:toco_flags_proto_py", "//tensorflow/python:dtypes", @@ -354,7 +354,7 @@ py_library( py_library( name = "convert", srcs = ["convert.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":lite_constants", @@ -372,7 +372,7 @@ py_library( py_library( name = "op_hint", srcs = ["op_hint.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/core:protos_all_py", @@ -402,7 +402,7 @@ py_test( py_library( name = "convert_saved_model", srcs = ["convert_saved_model.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = [ "//tensorflow/lite:__subpackages__", ], @@ -457,7 +457,7 @@ sh_test( py_library( name = "schema_util", srcs = ["schema_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow/lite/schema:utils_friends"], deps = [ "//tensorflow/python:util", diff --git a/tensorflow/lite/python/optimize/BUILD b/tensorflow/lite/python/optimize/BUILD index c1956cc5b2d..d67c518aebd 100644 --- a/tensorflow/lite/python/optimize/BUILD +++ b/tensorflow/lite/python/optimize/BUILD @@ -47,7 +47,7 @@ py_library( srcs = [ "calibrator.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":_pywrap_tensorflow_lite_calibration_wrapper", # buildcleaner: keep diff --git a/tensorflow/lite/schema/BUILD b/tensorflow/lite/schema/BUILD index 14f299a7d79..65a7d36b78b 100644 --- a/tensorflow/lite/schema/BUILD +++ b/tensorflow/lite/schema/BUILD @@ -42,6 +42,7 @@ py_library( "schema_v3.fbs", "@flatbuffers//:flatc", ], + srcs_version = "PY3", deps = [ "//tensorflow:tensorflow_py", "//tensorflow/python:platform", diff --git a/tensorflow/lite/testing/BUILD b/tensorflow/lite/testing/BUILD index 854729c9a4e..00764f4cc86 100644 --- a/tensorflow/lite/testing/BUILD +++ b/tensorflow/lite/testing/BUILD @@ -98,6 +98,7 @@ py_library( data = [ "//tensorflow/lite/toco", ], + srcs_version = "PY3", deps = [ ":zip_test_utils", "//tensorflow:tensorflow_py", @@ -108,7 +109,7 @@ py_library( py_library( name = "op_tests", srcs = glob(["op_tests/*.py"]), - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":zip_test_utils", "//tensorflow:tensorflow_py", @@ -119,7 +120,7 @@ py_library( py_library( name = "generate_examples_lib", srcs = ["generate_examples_lib.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":op_tests", ":zip_test_utils", @@ -130,7 +131,7 @@ py_library( py_library( name = "zip_test_utils", srcs = ["zip_test_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":_pywrap_string_util", ":generate_examples_report", @@ -156,7 +157,7 @@ py_binary( py_library( name = "generate_examples_report", srcs = ["generate_examples_report.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) cc_library( diff --git a/tensorflow/lite/toco/logging/BUILD b/tensorflow/lite/toco/logging/BUILD index 1f4127a5063..07b15c0e7ec 100644 --- a/tensorflow/lite/toco/logging/BUILD +++ b/tensorflow/lite/toco/logging/BUILD @@ -66,7 +66,7 @@ py_library( data = [ "html_template", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], ) diff --git a/tensorflow/lite/toco/python/BUILD b/tensorflow/lite/toco/python/BUILD index b71e2f7728f..a5fc101b6a8 100644 --- a/tensorflow/lite/toco/python/BUILD +++ b/tensorflow/lite/toco/python/BUILD @@ -75,6 +75,7 @@ cc_library( py_library( name = "tensorflow_wrap_toco", srcs = ["tensorflow_wrap_toco.py"], + srcs_version = "PY3", visibility = [ "//learning/expander/pod/deep_pod/utils:__subpackages__", "//research/handwriting/converters/tflite:__subpackages__", diff --git a/tensorflow/lite/tools/BUILD b/tensorflow/lite/tools/BUILD index 22ee36c3700..3e60a7ef9d7 100644 --- a/tensorflow/lite/tools/BUILD +++ b/tensorflow/lite/tools/BUILD @@ -111,7 +111,7 @@ py_binary( py_library( name = "flatbuffer_utils", srcs = ["flatbuffer_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/lite/python:schema_py", "//tensorflow/python/platform", @@ -138,7 +138,7 @@ py_test( py_library( name = "test_utils", srcs = ["test_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/lite/python:schema_py", "@flatbuffers//:runtime_py", diff --git a/tensorflow/lite/tools/signature/BUILD b/tensorflow/lite/tools/signature/BUILD index 3951c59ad15..fc6a875c9ae 100644 --- a/tensorflow/lite/tools/signature/BUILD +++ b/tensorflow/lite/tools/signature/BUILD @@ -71,7 +71,7 @@ pybind_extension( py_library( name = "signature_def_utils", srcs = ["signature_def_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":_pywrap_signature_def_util_wrapper", "//tensorflow/core:protos_all_py", diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD index 920c08067bf..0f921669346 100644 --- a/tensorflow/python/BUILD +++ b/tensorflow/python/BUILD @@ -70,7 +70,7 @@ package( py_library( name = "python", srcs = ["__init__.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = [ "//tensorflow:__pkg__", "//tensorflow/compiler/aot/tests:__pkg__", # TODO(b/34059704): remove when fixed @@ -88,7 +88,7 @@ py_library( py_library( name = "keras_lib", - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = [ "//tensorflow:__pkg__", "//tensorflow:internal", @@ -112,7 +112,7 @@ py_library( py_library( name = "no_contrib", srcs = ["__init__.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = [ "//tensorflow:__pkg__", "//tensorflow/python/estimator:__subpackages__", @@ -259,7 +259,7 @@ py_strict_library( py_library( name = "modules_with_exports", srcs = ["modules_with_exports.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = [ "//tensorflow:__pkg__", "//tensorflow/python/tools/api/generator:__pkg__", @@ -405,6 +405,7 @@ tf_python_pybind_extension( py_library( name = "pywrap_tf_session", srcs = ["client/pywrap_tf_session.py"], + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":_pywrap_tf_session", @@ -682,7 +683,7 @@ tf_cc_test( py_library( name = "framework_for_generated_wrappers", - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":constant_op", @@ -704,7 +705,7 @@ py_library( # circular dependencies, as "function" uses generated op wrappers. py_library( name = "framework_for_generated_wrappers_v2", - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":constant_op", @@ -727,7 +728,7 @@ py_library( py_library( name = "subscribe", srcs = ["framework/subscribe.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":framework_ops", @@ -745,7 +746,7 @@ py_library( "framework/load_library.py", "framework/meta_graph.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":_pywrap_debug_events_writer", ":_pywrap_events_writer", @@ -796,7 +797,7 @@ py_library( py_library( name = "c_api_util", srcs = ["framework/c_api_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":pywrap_tf_session", "//tensorflow/core:protos_all_py", @@ -806,7 +807,7 @@ py_library( py_library( name = "common_shapes", srcs = ["framework/common_shapes.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":tensor_shape", ], @@ -815,7 +816,7 @@ py_library( py_library( name = "constant_op", srcs = ["framework/constant_op.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":dtypes", ":framework_ops", @@ -829,7 +830,7 @@ py_library( py_library( name = "device_spec", srcs = ["framework/device_spec.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python/util", ], @@ -838,7 +839,7 @@ py_library( py_library( name = "device", srcs = ["framework/device.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) tf_python_pybind_extension( @@ -856,7 +857,7 @@ tf_python_pybind_extension( py_library( name = "dtypes", srcs = ["framework/dtypes.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":_dtypes", ":pywrap_tensorflow", @@ -871,7 +872,7 @@ py_library( "framework/errors.py", "framework/errors_impl.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":_pywrap_py_exception_registry", ":c_api_util", @@ -886,7 +887,7 @@ py_library( srcs = [ "framework/error_interpolation.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/core:protos_all_py", ], @@ -895,7 +896,7 @@ py_library( py_library( name = "function", srcs = ["framework/function.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":dtypes", @@ -913,7 +914,7 @@ py_library( py_library( name = "graph_to_function_def", srcs = ["framework/graph_to_function_def.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":op_def_registry", "//tensorflow/core:protos_all_py", @@ -923,7 +924,7 @@ py_library( py_library( name = "function_def_to_graph", srcs = ["framework/function_def_to_graph.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = visibility, deps = [ ":framework", @@ -962,7 +963,7 @@ py_library( "framework/graph_util.py", "framework/graph_util_impl.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":dtypes", ":framework_ops", @@ -977,7 +978,7 @@ py_library( srcs = [ "framework/convert_to_constants.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = visibility, deps = [ ":dtypes", @@ -994,7 +995,7 @@ py_library( srcs = [ "framework/kernels.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":pywrap_tf_session", "//tensorflow/core:protos_all_py", @@ -1005,7 +1006,7 @@ py_library( py_library( name = "op_def_library", srcs = ["framework/op_def_library.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":dtypes", ":framework_ops", @@ -1034,7 +1035,7 @@ tf_python_pybind_extension( py_library( name = "op_def_registry", srcs = ["framework/op_def_registry.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":_op_def_registry", "//tensorflow/core:protos_all_py", @@ -1403,7 +1404,7 @@ tf_py_test( py_library( name = "framework_ops", # "ops" is already the name of a deprecated target srcs = ["framework/ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":_op_def_util", ":c_api_util", @@ -1435,7 +1436,7 @@ py_library( py_library( name = "op_callbacks", srcs = ["framework/op_callbacks.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) cuda_py_test( @@ -1458,7 +1459,7 @@ cuda_py_test( py_library( name = "indexed_slices", srcs = ["framework/indexed_slices.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":composite_tensor", ":dtypes", @@ -1474,7 +1475,7 @@ py_library( py_library( name = "tensor_conversion_registry", srcs = ["framework/tensor_conversion_registry.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python/eager:context", ], @@ -1483,7 +1484,7 @@ py_library( py_library( name = "map_fn", srcs = ["ops/map_fn.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":constant_op", @@ -1501,7 +1502,7 @@ py_library( py_library( name = "func_graph", srcs = ["framework/func_graph.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":auto_control_deps", ":framework_ops", @@ -1517,7 +1518,7 @@ py_library( py_library( name = "auto_control_deps", srcs = ["framework/auto_control_deps.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":auto_control_deps_utils", ":control_flow_ops", @@ -1531,7 +1532,7 @@ py_library( py_library( name = "auto_control_deps_utils", srcs = ["framework/auto_control_deps_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":dtypes", ], @@ -1552,7 +1553,7 @@ tf_py_test( py_library( name = "config", srcs = ["framework/config.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":framework_ops", "//tensorflow/python/util", @@ -1578,7 +1579,7 @@ cuda_py_test( py_library( name = "random_seed", srcs = ["framework/random_seed.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":framework_ops", ], @@ -1587,7 +1588,7 @@ py_library( py_library( name = "registry", srcs = ["framework/registry.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":platform", "//tensorflow/python/util", @@ -1599,7 +1600,7 @@ py_library( py_library( name = "smart_cond", srcs = ["framework/smart_cond.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":control_flow_ops", ":pywrap_tf_session", @@ -1625,7 +1626,7 @@ tf_py_test( py_library( name = "sparse_tensor", srcs = ["framework/sparse_tensor.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":composite_tensor", ":dtypes", @@ -1639,7 +1640,7 @@ py_library( py_library( name = "composite_tensor", srcs = ["framework/composite_tensor.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = visibility, deps = [ ":dtypes", @@ -1666,7 +1667,7 @@ py_test( py_library( name = "tensor_shape", srcs = ["framework/tensor_shape.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":dtypes", ":tf2", @@ -1679,7 +1680,7 @@ py_library( py_library( name = "type_spec", srcs = ["framework/type_spec.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = visibility, deps = [ ":dtypes", @@ -1692,7 +1693,7 @@ py_library( py_library( name = "tensor_spec", srcs = ["framework/tensor_spec.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":common_shapes", ":dtypes", @@ -1706,7 +1707,7 @@ py_library( py_library( name = "tensor_util", srcs = ["framework/tensor_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":errors", ":tensor_shape", @@ -1719,7 +1720,7 @@ py_library( py_library( name = "traceable_stack", srcs = ["framework/traceable_stack.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/python/util", @@ -1729,7 +1730,7 @@ py_library( py_library( name = "versions", srcs = ["framework/versions.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":pywrap_tf_session", ], @@ -1737,7 +1738,7 @@ py_library( py_library( name = "extra_py_tests_deps", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":keras_lib", "//third_party/py/numpy", @@ -1748,13 +1749,14 @@ py_library( py_library( name = "gpu_util", srcs = ["framework/gpu_util.py"], + srcs_version = "PY3", deps = [], ) py_library( name = "framework_test_lib", srcs = ["framework/test_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = visibility + [ "//tensorflow_estimator/python/estimator:__subpackages__", ], @@ -1792,7 +1794,7 @@ py_library( py_library( name = "is_xla_test_true", srcs = ["framework/is_xla_test_true.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) # Including this as a dependency will result in tests using @@ -1800,7 +1802,7 @@ py_library( py_library( name = "is_mlir_bridge_test_true", srcs = ["framework/is_mlir_bridge_test_true.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = visibility, ) @@ -1809,7 +1811,7 @@ py_library( py_library( name = "is_mlir_bridge_test_false", srcs = ["framework/is_mlir_bridge_test_false.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = visibility, ) @@ -1819,25 +1821,25 @@ py_library( py_library( name = "is_tfrt_test_true", srcs = ["framework/is_tfrt_test_true.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) py_library( name = "tfrt_utils", srcs = ["framework/tfrt_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) py_library( name = "distributed_framework_test_lib", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [":framework_test_lib"], ) py_library( name = "framework_combinations", srcs = ["framework/combinations.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":framework_ops", ":framework_test_combinations_lib", @@ -1850,7 +1852,7 @@ py_library( py_library( name = "framework_test_combinations_lib", srcs = ["framework/test_combinations.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python/util", "@absl_py//absl/testing:parameterized", @@ -1874,7 +1876,7 @@ py_library( "framework/memory_checker.py", "framework/python_memory_checker.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":_python_memory_checker_helper", "//tensorflow/python/profiler:traceme", @@ -1979,7 +1981,7 @@ tf_gen_op_wrapper_private_py( py_library( name = "functional_ops", srcs = ["ops/functional_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":auto_control_deps_utils", @@ -2656,7 +2658,7 @@ py_library( srcs = [ "ops/batch_ops.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":batch_ops_gen", ], @@ -2869,7 +2871,7 @@ tf_gen_op_wrapper_private_py( py_library( name = "array_grad", srcs = ["ops/array_grad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":array_ops_gen", @@ -2887,7 +2889,7 @@ py_library( "ops/array_ops.py", "ops/inplace_ops.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = visibility, deps = [ ":array_ops_gen", @@ -2908,7 +2910,7 @@ py_library( py_library( name = "bitwise_ops", srcs = ["ops/bitwise_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":bitwise_ops_gen", ":framework", @@ -2919,7 +2921,7 @@ py_library( py_library( name = "boosted_trees_ops", srcs = ["ops/boosted_trees_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":boosted_trees_ops_gen", ":framework", @@ -2932,7 +2934,7 @@ py_library( py_library( name = "tensor_forest_ops", srcs = ["ops/tensor_forest_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":framework", ":ops", @@ -2945,7 +2947,7 @@ py_library( py_library( name = "optional_grad", srcs = ["ops/optional_grad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":framework_ops", ], @@ -2957,7 +2959,7 @@ py_library( "ops/sets.py", "ops/sets_impl.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":framework", ":framework_for_generated_wrappers", @@ -2969,7 +2971,7 @@ py_library( py_library( name = "candidate_sampling_ops", srcs = ["ops/candidate_sampling_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":candidate_sampling_ops_gen", @@ -2981,7 +2983,7 @@ py_library( py_library( name = "check_ops", srcs = ["ops/check_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":control_flow_ops", @@ -2997,7 +2999,7 @@ py_library( py_library( name = "clip_ops", srcs = ["ops/clip_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":framework_for_generated_wrappers", @@ -3024,7 +3026,7 @@ tf_py_test( py_library( name = "clustering_ops", srcs = ["ops/clustering_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":clustering_ops_gen", ":framework", @@ -3049,7 +3051,7 @@ tf_py_test( py_library( name = "collective_ops", srcs = ["ops/collective_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":collective_ops_gen", ":framework_for_generated_wrappers", @@ -3115,7 +3117,7 @@ py_library( name = "control_flow_grad", srcs = ["ops/control_flow_grad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":control_flow_ops", ":control_flow_ops_gen", @@ -3131,7 +3133,7 @@ py_library( py_library( name = "control_flow_ops", srcs = ["ops/control_flow_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":array_ops_gen", @@ -3157,7 +3159,7 @@ py_library( py_library( name = "control_flow_util", srcs = ["ops/control_flow_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":platform", ], @@ -3166,7 +3168,7 @@ py_library( py_library( name = "control_flow_util_v2", srcs = ["ops/control_flow_util_v2.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":control_flow_util", ":control_flow_v2_func_graphs", @@ -3182,7 +3184,7 @@ py_library( py_library( name = "control_flow_v2_func_graphs", srcs = ["ops/control_flow_v2_func_graphs.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":func_graph", ], @@ -3191,7 +3193,7 @@ py_library( py_library( name = "control_flow_v2_toggles", srcs = ["ops/control_flow_v2_toggles.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":control_flow_util", ":control_flow_util_v2", @@ -3252,7 +3254,7 @@ py_library( srcs = [ "ops/cond_v2.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":auto_control_deps_utils", @@ -3280,7 +3282,7 @@ py_library( "ops/while_v2.py", "ops/while_v2_indexed_slices_rewriter.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":auto_control_deps_utils", @@ -3307,7 +3309,7 @@ py_library( py_library( name = "bincount_ops", srcs = ["ops/bincount_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":count_ops_gen", ":framework", @@ -3330,7 +3332,7 @@ tf_py_test( py_library( name = "ctc_ops", srcs = ["ops/ctc_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":ctc_ops_gen", @@ -3343,7 +3345,7 @@ py_library( py_library( name = "cudnn_rnn_grad", srcs = ["ops/cudnn_rnn_grad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":cudnn_rnn_ops_gen", ":framework_for_generated_wrappers", @@ -3353,7 +3355,7 @@ py_library( py_library( name = "data_flow_grad", srcs = ["ops/data_flow_grad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":data_flow_ops", @@ -3365,7 +3367,7 @@ py_library( py_library( name = "data_flow_ops", srcs = ["ops/data_flow_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":control_flow_ops", @@ -3382,7 +3384,7 @@ py_library( py_library( name = "embedding_ops", srcs = ["ops/embedding_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":clip_ops", @@ -3404,7 +3406,7 @@ py_library( srcs = [ "ops/handle_data_util.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":dtypes", ":framework_ops", @@ -3420,7 +3422,7 @@ py_library( "ops/custom_gradient.py", "ops/gradients.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":gradients_impl", ":gradients_util", @@ -3438,7 +3440,7 @@ py_library( srcs = [ "ops/gradients_impl.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_grad", ":array_ops", @@ -3473,7 +3475,7 @@ py_library( srcs = [ "ops/gradients_util.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":control_flow_ops", @@ -3504,7 +3506,7 @@ py_library( srcs = [ "ops/default_gradient.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":dtypes", ":resource_variable_ops", @@ -3516,7 +3518,7 @@ py_library( srcs = [ "ops/control_flow_state.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":constant_op", @@ -3533,7 +3535,7 @@ py_library( py_library( name = "unconnected_gradients", srcs = ["ops/unconnected_gradients.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python/util", ], @@ -3542,7 +3544,7 @@ py_library( py_library( name = "histogram_ops", srcs = ["ops/histogram_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":clip_ops", @@ -3554,7 +3556,7 @@ py_library( py_library( name = "image_grad", srcs = ["ops/image_grad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":framework_for_generated_wrappers", @@ -3568,7 +3570,7 @@ py_library( "ops/image_ops.py", "ops/image_ops_impl.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":check_ops", @@ -3592,7 +3594,7 @@ py_library( py_library( name = "init_ops", srcs = ["ops/init_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":constant_op", @@ -3609,7 +3611,7 @@ py_library( py_library( name = "init_ops_v2", srcs = ["ops/init_ops_v2.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":constant_op", @@ -3627,7 +3629,7 @@ py_library( py_library( name = "initializers_ns", srcs = ["ops/initializers_ns.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":init_ops", ":variables", @@ -3637,7 +3639,7 @@ py_library( py_library( name = "io_ops", srcs = ["ops/io_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":framework_for_generated_wrappers", ":io_ops_gen", @@ -3648,7 +3650,7 @@ py_library( py_library( name = "linalg_grad", srcs = ["ops/linalg_grad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":control_flow_ops", @@ -3662,7 +3664,7 @@ py_library( py_library( name = "linalg_ops", srcs = ["ops/linalg_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":dtypes", @@ -3678,7 +3680,7 @@ py_library( py_library( name = "linalg_ops_impl", srcs = ["ops/linalg_ops_impl.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":dtypes", @@ -3691,7 +3693,7 @@ py_library( py_library( name = "manip_grad", srcs = ["ops/manip_grad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":control_flow_ops", ":framework_for_generated_wrappers", @@ -3702,7 +3704,7 @@ py_library( py_library( name = "manip_ops", srcs = ["ops/manip_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":dtypes", ":framework_ops", @@ -3714,7 +3716,7 @@ py_library( py_library( name = "logging_ops", srcs = ["ops/logging_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":framework_for_generated_wrappers", ":logging_ops_gen", @@ -3728,7 +3730,7 @@ py_library( py_library( name = "lookup_ops", srcs = ["ops/lookup_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":constant_op", @@ -3747,7 +3749,7 @@ py_library( py_library( name = "math_grad", srcs = ["ops/math_grad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":array_ops_gen", @@ -3764,14 +3766,14 @@ py_library( py_library( name = "op_selector", srcs = ["ops/op_selector.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [":framework_ops"], ) py_library( name = "math_ops", srcs = ["ops/math_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":bitwise_ops_gen", @@ -3799,7 +3801,7 @@ py_library( py_library( name = "resources", srcs = ["ops/resources.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":control_flow_ops", @@ -3812,7 +3814,7 @@ py_library( py_library( name = "resource_variable_ops", srcs = ["ops/resource_variable_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":array_ops_gen", @@ -3834,7 +3836,7 @@ py_library( py_library( name = "critical_section_ops", srcs = ["ops/critical_section_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":control_flow_ops", @@ -3850,7 +3852,7 @@ py_library( py_library( name = "list_ops", srcs = ["ops/list_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":handle_data_util", @@ -3862,7 +3864,7 @@ py_library( py_library( name = "map_ops", srcs = ["ops/map_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":map_ops_gen", @@ -3875,7 +3877,7 @@ py_library( "ops/nn.py", "ops/nn_impl.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":candidate_sampling_ops", @@ -3896,7 +3898,7 @@ py_library( py_library( name = "nn_grad", srcs = ["ops/nn_grad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":framework_for_generated_wrappers", @@ -3913,7 +3915,7 @@ py_library( py_library( name = "nn_ops", srcs = ["ops/nn_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":dtypes", @@ -3933,7 +3935,7 @@ py_library( py_library( name = "numerics", srcs = ["ops/numerics.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":control_flow_ops", @@ -3945,7 +3947,7 @@ py_library( py_library( name = "parsing_config", srcs = ["ops/parsing_config.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":framework", ], @@ -3954,7 +3956,7 @@ py_library( py_library( name = "parsing_ops", srcs = ["ops/parsing_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":control_flow_ops", @@ -3970,7 +3972,7 @@ py_library( py_library( name = "partitioned_variables", srcs = ["ops/partitioned_variables.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":framework_for_generated_wrappers", ":platform", @@ -3981,7 +3983,7 @@ py_library( py_library( name = "random_grad", srcs = ["ops/random_grad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":dtypes", @@ -3994,7 +3996,7 @@ py_library( py_library( name = "random_ops", srcs = ["ops/random_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":control_flow_ops", @@ -4010,7 +4012,7 @@ py_library( py_library( name = "stateful_random_ops", srcs = ["ops/stateful_random_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":dtypes", ":framework_ops", @@ -4043,7 +4045,7 @@ cuda_py_test( py_library( name = "stateless_random_ops", srcs = ["ops/stateless_random_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":dtypes", @@ -4057,7 +4059,7 @@ py_library( py_library( name = "rnn", srcs = ["ops/rnn.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":control_flow_ops", @@ -4080,7 +4082,7 @@ py_library( "ops/rnn_cell_impl.py", "ops/rnn_cell_wrapper_impl.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":clip_ops", @@ -4101,7 +4103,7 @@ py_library( py_library( name = "script_ops", srcs = ["ops/script_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":framework_for_generated_wrappers", @@ -4114,7 +4116,7 @@ py_library( py_library( name = "sdca_ops", srcs = ["ops/sdca_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":framework_for_generated_wrappers", ":sdca_ops_gen", @@ -4125,7 +4127,7 @@ py_library( py_library( name = "session_ops", srcs = ["ops/session_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":data_flow_ops_gen", @@ -4137,7 +4139,7 @@ py_library( py_library( name = "sparse_grad", srcs = ["ops/sparse_grad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":framework", @@ -4151,7 +4153,7 @@ py_library( py_library( name = "sparse_ops", srcs = ["ops/sparse_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":check_ops", @@ -4185,7 +4187,7 @@ tf_py_test( py_library( name = "sort_ops", srcs = ["ops/sort_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":framework", @@ -4212,7 +4214,7 @@ tf_py_test( py_library( name = "confusion_matrix", srcs = ["ops/confusion_matrix.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":check_ops", @@ -4229,7 +4231,7 @@ py_library( srcs = [ "ops/weights_broadcast_ops.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":control_flow_ops", @@ -4245,7 +4247,7 @@ py_library( "ops/metrics.py", "ops/metrics_impl.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":check_ops", @@ -4269,7 +4271,7 @@ py_library( py_library( name = "special_math_ops", srcs = ["ops/special_math_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":check_ops", @@ -4287,7 +4289,7 @@ py_library( py_library( name = "rnn_grad", srcs = ["ops/rnn_grad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":framework_for_generated_wrappers", ":rnn_ops_gen", @@ -4329,7 +4331,7 @@ py_test( py_library( name = "standard_ops", srcs = ["ops/standard_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_grad", ":array_ops", @@ -4392,14 +4394,14 @@ py_library( py_library( name = "state_grad", srcs = ["ops/state_grad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [":framework_for_generated_wrappers"], ) py_library( name = "state_ops", srcs = ["ops/state_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":framework_ops", @@ -4414,7 +4416,7 @@ py_library( py_library( name = "string_ops", srcs = ["ops/string_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":framework", ":framework_for_generated_wrappers", @@ -4426,7 +4428,7 @@ py_library( py_library( name = "summary_ops_v2", srcs = ["ops/summary_ops_v2.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ ":array_ops", @@ -4452,7 +4454,7 @@ py_library( py_library( name = "template", srcs = ["ops/template.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":framework_for_generated_wrappers", ":platform", @@ -4466,7 +4468,7 @@ py_library( py_library( name = "tensor_array_grad", srcs = ["ops/tensor_array_grad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":framework_for_generated_wrappers", ":tensor_array_ops", @@ -4476,7 +4478,7 @@ py_library( py_library( name = "tensor_array_ops", srcs = ["ops/tensor_array_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":constant_op", @@ -4498,7 +4500,7 @@ py_library( py_library( name = "variable_scope", srcs = ["ops/variable_scope.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":dtypes", @@ -4519,7 +4521,7 @@ py_library( py_library( name = "variables", srcs = ["ops/variables.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":control_flow_ops", @@ -4539,7 +4541,7 @@ py_library( py_library( name = "gradient_checker", srcs = ["ops/gradient_checker.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":framework_for_generated_wrappers", @@ -4552,7 +4554,7 @@ py_library( py_library( name = "gradient_checker_v2", srcs = ["ops/gradient_checker_v2.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":array_ops", ":framework_for_generated_wrappers", @@ -4566,7 +4568,7 @@ py_library( py_library( name = "ops", srcs = ["user_ops/user_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":user_ops_gen", "//tensorflow/python/util", @@ -4733,6 +4735,7 @@ cuda_py_test( py_library( name = "image_grad_test_base", srcs = ["ops/image_grad_test_base.py"], + srcs_version = "PY3", deps = [ ":client_testlib", ":framework_for_generated_wrappers", @@ -5027,7 +5030,7 @@ py_library( "client/device_lib.py", "client/timeline.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":_pywrap_device_lib", ":errors", @@ -5048,6 +5051,7 @@ py_library( py_library( name = "global_test_configuration", compatible_with = get_compatible_with_portable(), + srcs_version = "PY3", deps = if_mlir(["//tensorflow/compiler/mlir/tensorflow:mlir_roundtrip_pass_registration"]) + tf_enable_mlir_bridge(), ) @@ -5094,7 +5098,7 @@ tf_py_test( py_library( name = "device_lib", srcs = ["client/device_lib.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":_pywrap_device_lib", "//tensorflow/core:protos_all_py", @@ -5184,7 +5188,7 @@ py_library( # Import will fail, indicating no global dlopen flags otherwise = [], ), # b/153585257 - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [":pywrap_tensorflow_internal"], ) @@ -5448,7 +5452,7 @@ cc_import( py_library( name = "session", srcs = ["client/session.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":c_api_util", ":error_interpolation", @@ -5468,7 +5472,7 @@ py_library( py_library( name = "timeline", srcs = ["client/timeline.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":platform", @@ -5681,7 +5685,7 @@ tf_py_test( py_library( name = "summary_op_util", srcs = ["ops/summary_op_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":framework", @@ -5699,7 +5703,7 @@ py_library( "**/*test*", ], ), - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":client", @@ -5725,7 +5729,7 @@ py_library( name = "fake_summary_writer", testonly = 1, srcs = ["summary/writer/fake_summary_writer.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":framework_test_lib", @@ -5766,7 +5770,7 @@ py_library( "layers/__init__.py", "layers/base.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python/keras/legacy_tf_layers:layers_base", ], @@ -5777,7 +5781,7 @@ py_library( srcs = [ "layers/utils.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":control_flow_ops", ":smart_cond", @@ -5794,7 +5798,7 @@ py_library( "layers/normalization.py", "layers/pooling.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":layers_base", "//tensorflow/python/keras/legacy_tf_layers:convolutional", @@ -6040,6 +6044,7 @@ py_library( name = "matmul_benchmark_main_lib", testonly = True, srcs = ["ops/matmul_benchmark.py"], + srcs_version = "PY3", deps = [ ":client", ":client_testlib", @@ -6109,7 +6114,7 @@ py_library( srcs = [ "grappler/item.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":_pywrap_tf_item", @@ -6185,7 +6190,7 @@ py_library( srcs = [ "grappler/cluster.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":_pywrap_tf_cluster", @@ -6246,7 +6251,7 @@ py_library( srcs = [ "grappler/tf_optimizer.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":_pywrap_tf_optimizer", @@ -6409,7 +6414,7 @@ py_library( srcs = [ "grappler/cost_analyzer.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":_pywrap_cost_analyzer", ":tf_cluster", @@ -6466,7 +6471,7 @@ py_library( srcs = [ "grappler/model_analyzer.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [":_pywrap_model_analyzer"], ) @@ -6528,7 +6533,7 @@ tf_gen_op_wrapper_private_py( py_library( name = "nccl_ops", srcs = ["ops/nccl_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = visibility + [ "//learning/deepmind/tensorflow:__subpackages__", "//third_party/car/deep_nets/tensorflow:__subpackages__", @@ -6580,6 +6585,7 @@ tf_gen_op_wrapper_private_py( py_library( name = "proto_ops", srcs = ["ops/proto_ops.py"], + srcs_version = "PY3", deps = [ ":decode_proto_ops_gen", ":encode_proto_ops_gen", @@ -6590,6 +6596,7 @@ py_library( py_library( name = "pywrap_mlir", srcs = ["pywrap_mlir.py"], + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":_pywrap_mlir", @@ -6647,6 +6654,7 @@ cc_library( py_library( name = "pywrap_tfe", srcs = ["pywrap_tfe.py"], + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":_pywrap_tfe", @@ -6772,7 +6780,7 @@ pyx_library( py_library( name = "tf2", srcs = ["tf2.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python/platform:_pywrap_tf2", "//tensorflow/python/util:tf_export", @@ -6814,6 +6822,7 @@ alias( py_library( name = "platform_test", + srcs_version = "PY3", deps = ["//tensorflow/python/platform:test"], ) @@ -6987,6 +6996,6 @@ py_library( name = "learning_rate_decay", # This rule depends on a target that only python:__pkg__ has visibility for. srcs = ["//tensorflow/python/training:learning_rate_decay.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = ["//tensorflow/python/keras/optimizer_v2:legacy_learning_rate_decay"], ) diff --git a/tensorflow/python/compat/BUILD b/tensorflow/python/compat/BUILD index f7c282750be..7bfe34b53e5 100644 --- a/tensorflow/python/compat/BUILD +++ b/tensorflow/python/compat/BUILD @@ -7,7 +7,7 @@ package( py_library( name = "v2_compat", srcs = ["v2_compat.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ "//tensorflow/python:control_flow_v2_toggles", @@ -20,7 +20,7 @@ py_library( py_library( name = "compat", srcs = ["compat.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ "//tensorflow/python:util", diff --git a/tensorflow/python/compiler/BUILD b/tensorflow/python/compiler/BUILD index 4d536a5d982..fed30111919 100644 --- a/tensorflow/python/compiler/BUILD +++ b/tensorflow/python/compiler/BUILD @@ -13,7 +13,7 @@ exports_files(["LICENSE"]) py_library( name = "compiler", srcs = ["__init__.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = if_windows( ["//tensorflow/python/compiler/tensorrt:trt_convert_windows"], otherwise = ["//tensorflow/python/compiler/tensorrt:init_py"], diff --git a/tensorflow/python/compiler/mlir/BUILD b/tensorflow/python/compiler/mlir/BUILD index 1e4316dc2e8..948a45bc697 100644 --- a/tensorflow/python/compiler/mlir/BUILD +++ b/tensorflow/python/compiler/mlir/BUILD @@ -8,7 +8,7 @@ package( py_library( name = "mlir", srcs = ["mlir.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:pywrap_mlir", "//tensorflow/python/util:tf_export", diff --git a/tensorflow/python/compiler/tensorrt/BUILD b/tensorflow/python/compiler/tensorrt/BUILD index 5b1001e530d..0c296c5d219 100644 --- a/tensorflow/python/compiler/tensorrt/BUILD +++ b/tensorflow/python/compiler/tensorrt/BUILD @@ -27,7 +27,7 @@ exports_files(glob([ py_library( name = "init_py", srcs = ["__init__.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":tf_trt_integration_test_base", ":trt_convert_py", @@ -40,7 +40,7 @@ py_library( "trt_convert.py", "utils.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/compiler/tf2tensorrt:_pywrap_py_utils", "//tensorflow/compiler/tf2tensorrt:trt_engine_instance_proto_py", @@ -64,7 +64,7 @@ py_library( py_library( name = "trt_convert_windows", srcs = ["trt_convert_windows.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", ], @@ -73,6 +73,7 @@ py_library( py_library( name = "tf_trt_integration_test_base", srcs = ["test/tf_trt_integration_test_base.py"], + srcs_version = "PY3", deps = [ ":trt_convert_py", "//tensorflow/python:client_testlib", diff --git a/tensorflow/python/compiler/xla/BUILD b/tensorflow/python/compiler/xla/BUILD index a5014064cd8..0a4b609f688 100644 --- a/tensorflow/python/compiler/xla/BUILD +++ b/tensorflow/python/compiler/xla/BUILD @@ -11,7 +11,7 @@ py_library( "__init__.py", "jit.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":xla", "//tensorflow/core:protos_all_py", @@ -50,7 +50,7 @@ cuda_py_test( py_library( name = "xla", srcs = ["xla.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/compiler/jit:xla_ops_py", "//tensorflow/compiler/jit/ops:xla_ops_grad", diff --git a/tensorflow/python/data/BUILD b/tensorflow/python/data/BUILD index 882cc66b673..c49b6e7c91d 100644 --- a/tensorflow/python/data/BUILD +++ b/tensorflow/python/data/BUILD @@ -8,7 +8,7 @@ exports_files(["LICENSE"]) py_library( name = "data", srcs = ["__init__.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ "//tensorflow/python:util", diff --git a/tensorflow/python/data/benchmarks/BUILD b/tensorflow/python/data/benchmarks/BUILD index d90592c97c2..36221bdf1bc 100644 --- a/tensorflow/python/data/benchmarks/BUILD +++ b/tensorflow/python/data/benchmarks/BUILD @@ -10,7 +10,7 @@ exports_files(["LICENSE"]) py_library( name = "benchmark_base", srcs = ["benchmark_base.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:client_testlib", "//tensorflow/python:session", diff --git a/tensorflow/python/data/experimental/BUILD b/tensorflow/python/data/experimental/BUILD index a1e45ecd17e..8b68073bd5a 100644 --- a/tensorflow/python/data/experimental/BUILD +++ b/tensorflow/python/data/experimental/BUILD @@ -8,7 +8,7 @@ exports_files(["LICENSE"]) py_library( name = "experimental", srcs = ["__init__.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", "//tensorflow/python/data/experimental/ops:dataset_ops", diff --git a/tensorflow/python/data/experimental/kernel_tests/BUILD b/tensorflow/python/data/experimental/kernel_tests/BUILD index d57af548d43..be15d403cf6 100644 --- a/tensorflow/python/data/experimental/kernel_tests/BUILD +++ b/tensorflow/python/data/experimental/kernel_tests/BUILD @@ -621,7 +621,7 @@ py_library( srcs = [ "reader_dataset_ops_test_base.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/core:protos_all_py", "//tensorflow/python:array_ops", @@ -754,7 +754,7 @@ tf_py_test( py_library( name = "sql_dataset_test_base", srcs = ["sql_dataset_test_base.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = [ "//tensorflow/python/data/experimental/kernel_tests:__pkg__", "//tensorflow/python/data/experimental/kernel_tests/serialization:__pkg__", @@ -833,7 +833,7 @@ tf_py_test( py_library( name = "stats_dataset_test_base", srcs = ["stats_dataset_test_base.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/core:protos_all_py", "//tensorflow/python:client_testlib", diff --git a/tensorflow/python/data/experimental/kernel_tests/serialization/BUILD b/tensorflow/python/data/experimental/kernel_tests/serialization/BUILD index 9aa9f3f5447..22af87ff0b9 100644 --- a/tensorflow/python/data/experimental/kernel_tests/serialization/BUILD +++ b/tensorflow/python/data/experimental/kernel_tests/serialization/BUILD @@ -12,7 +12,7 @@ py_library( srcs = [ "dataset_serialization_test_base.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:client_testlib", "//tensorflow/python:dtypes", diff --git a/tensorflow/python/data/experimental/ops/BUILD b/tensorflow/python/data/experimental/ops/BUILD index a3c799c73cf..9e0df45b49e 100644 --- a/tensorflow/python/data/experimental/ops/BUILD +++ b/tensorflow/python/data/experimental/ops/BUILD @@ -8,7 +8,7 @@ exports_files(["LICENSE"]) py_library( name = "batching", srcs = ["batching.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:dtypes", "//tensorflow/python:experimental_dataset_ops_gen", @@ -26,7 +26,7 @@ py_library( py_library( name = "cardinality", srcs = ["cardinality.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:experimental_dataset_ops_gen", "//tensorflow/python:util", @@ -36,7 +36,7 @@ py_library( py_library( name = "compression_ops", srcs = ["compression_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:experimental_dataset_ops_gen", ], @@ -45,7 +45,7 @@ py_library( py_library( name = "counter", srcs = ["counter.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":scan_ops", "//tensorflow/python:dtypes", @@ -60,7 +60,7 @@ py_library( srcs = [ "data_service_ops.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:experimental_dataset_ops_gen", "//tensorflow/python:framework_ops", @@ -74,7 +74,7 @@ py_library( srcs = [ "distribute.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:experimental_dataset_ops_gen", "//tensorflow/python:framework_ops", @@ -86,7 +86,7 @@ py_library( py_library( name = "distribute_options", srcs = ["distribute_options.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", "//tensorflow/python/data/util:options", @@ -96,7 +96,7 @@ py_library( py_library( name = "enumerate_ops", srcs = ["enumerate_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:dtypes", "//tensorflow/python/data/ops:dataset_ops", @@ -106,7 +106,7 @@ py_library( py_library( name = "error_ops", srcs = ["error_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:experimental_dataset_ops_gen", "//tensorflow/python/data/ops:dataset_ops", @@ -118,7 +118,7 @@ py_library( py_library( name = "get_single_element", srcs = ["get_single_element.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:dataset_ops_gen", "//tensorflow/python/data/ops:dataset_ops", @@ -130,7 +130,7 @@ py_library( py_library( name = "grouping", srcs = ["grouping.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:check_ops", @@ -148,7 +148,7 @@ py_library( py_library( name = "interleave_ops", srcs = ["interleave_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":random_ops", "//tensorflow/python:array_ops", @@ -169,7 +169,7 @@ py_library( srcs = [ "io.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:experimental_dataset_ops_gen", "//tensorflow/python/data/ops:dataset_ops", @@ -181,7 +181,7 @@ py_library( srcs = [ "iterator_ops.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:basic_session_run_hooks", "//tensorflow/python:checkpoint_management", @@ -197,7 +197,7 @@ py_library( py_library( name = "map_defun", srcs = ["map_defun.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:dataset_ops_gen", "//tensorflow/python:framework_ops", @@ -208,7 +208,7 @@ py_library( py_library( name = "matching_files", srcs = ["matching_files.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:dataset_ops_gen", "//tensorflow/python:framework_ops", @@ -221,7 +221,7 @@ py_library( py_library( name = "optimization", srcs = ["optimization.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:dtypes", "//tensorflow/python:experimental_dataset_ops_gen", @@ -234,7 +234,7 @@ py_library( py_library( name = "optimization_options", srcs = ["optimization_options.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", "//tensorflow/python/data/util:options", @@ -244,7 +244,7 @@ py_library( py_library( name = "parsing_ops", srcs = ["parsing_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:dataset_ops_gen", "//tensorflow/python:dtypes", @@ -260,6 +260,7 @@ py_library( py_library( name = "prefetching_ops", srcs = ["prefetching_ops.py"], + srcs_version = "PY3", deps = [ "//tensorflow/python:experimental_dataset_ops_gen", "//tensorflow/python:framework_ops", @@ -277,7 +278,7 @@ py_library( srcs = [ "random_ops.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:constant_op", "//tensorflow/python:dtypes", @@ -295,7 +296,7 @@ py_library( srcs = [ "readers.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":batching", ":interleave_ops", @@ -323,7 +324,7 @@ py_library( py_library( name = "resampling", srcs = ["resampling.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":batching", ":interleave_ops", @@ -343,7 +344,7 @@ py_library( py_library( name = "scan_ops", srcs = ["scan_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:experimental_dataset_ops_gen", "//tensorflow/python:framework_ops", @@ -361,7 +362,7 @@ py_library( srcs = [ "shuffle_ops.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python/data/ops:dataset_ops", ], @@ -372,7 +373,7 @@ py_library( srcs = [ "snapshot.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ "//tensorflow/python:experimental_dataset_ops_gen", @@ -384,7 +385,7 @@ py_library( py_library( name = "stats_aggregator", srcs = ["stats_aggregator.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:dataset_ops_gen", "//tensorflow/python:util", @@ -394,7 +395,7 @@ py_library( py_library( name = "stats_ops", srcs = ["stats_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:dataset_ops_gen", "//tensorflow/python:dtypes", @@ -409,7 +410,7 @@ py_library( py_library( name = "stats_options", srcs = ["stats_options.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":stats_aggregator", "//tensorflow/python:util", @@ -420,7 +421,7 @@ py_library( py_library( name = "take_while_ops", srcs = ["take_while_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:dtypes", "//tensorflow/python:experimental_dataset_ops_gen", @@ -433,7 +434,7 @@ py_library( py_library( name = "testing", srcs = ["testing.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:experimental_dataset_ops_gen", "//tensorflow/python:framework_ops", @@ -444,7 +445,7 @@ py_library( py_library( name = "threading_options", srcs = ["threading_options.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", "//tensorflow/python/data/util:options", @@ -454,7 +455,7 @@ py_library( py_library( name = "threadpool", srcs = ["threadpool.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:experimental_dataset_ops_gen", "//tensorflow/python:resource_variable_ops", @@ -469,7 +470,7 @@ py_library( srcs = [ "unique.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:dtypes", "//tensorflow/python:experimental_dataset_ops_gen", @@ -484,7 +485,7 @@ py_library( srcs = [ "writers.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:dtypes", "//tensorflow/python/data/ops:dataset_ops", @@ -493,6 +494,7 @@ py_library( py_library( name = "dataset_ops", + srcs_version = "PY3", deps = [ ":batching", ":cardinality", diff --git a/tensorflow/python/data/experimental/service/BUILD b/tensorflow/python/data/experimental/service/BUILD index 020e5a91e29..128bbcfed05 100644 --- a/tensorflow/python/data/experimental/service/BUILD +++ b/tensorflow/python/data/experimental/service/BUILD @@ -25,6 +25,7 @@ tf_python_pybind_extension( py_library( name = "server_lib", srcs = ["server_lib.py"], + srcs_version = "PY3", visibility = [ "//visibility:public", ], @@ -48,7 +49,7 @@ tf_py_test( py_library( name = "service", srcs = ["__init__.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":server_lib", "//tensorflow/python/data/experimental/ops:data_service_ops", diff --git a/tensorflow/python/data/kernel_tests/BUILD b/tensorflow/python/data/kernel_tests/BUILD index c0b0b8e006b..48102446cf4 100644 --- a/tensorflow/python/data/kernel_tests/BUILD +++ b/tensorflow/python/data/kernel_tests/BUILD @@ -741,6 +741,7 @@ tf_py_test( py_library( name = "test_base", srcs = ["test_base.py"], + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:client_testlib", diff --git a/tensorflow/python/data/ops/BUILD b/tensorflow/python/data/ops/BUILD index fae8051ab65..5825ac98607 100644 --- a/tensorflow/python/data/ops/BUILD +++ b/tensorflow/python/data/ops/BUILD @@ -8,7 +8,7 @@ exports_files(["LICENSE"]) py_library( name = "dataset_ops", srcs = ["dataset_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":iterator_ops", "//tensorflow/python:constant_op", @@ -45,7 +45,7 @@ py_library( py_library( name = "readers", srcs = ["readers.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":dataset_ops", "//tensorflow/python:array_ops", @@ -65,7 +65,7 @@ py_library( py_library( name = "iterator_ops", srcs = ["iterator_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":optional_ops", "//tensorflow/python:dataset_ops_gen", @@ -86,7 +86,7 @@ py_library( py_library( name = "optional_ops", srcs = ["optional_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:dataset_ops_gen", "//tensorflow/python:dtypes", @@ -101,7 +101,7 @@ py_library( py_library( name = "multi_device_iterator_ops", srcs = ["multi_device_iterator_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":dataset_ops", ":iterator_ops", diff --git a/tensorflow/python/data/util/BUILD b/tensorflow/python/data/util/BUILD index b5dc355bf5f..2acec3aa816 100644 --- a/tensorflow/python/data/util/BUILD +++ b/tensorflow/python/data/util/BUILD @@ -10,7 +10,7 @@ exports_files(["LICENSE"]) py_library( name = "nest", srcs = ["nest.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", "@six_archive//:six", @@ -37,7 +37,7 @@ py_test( py_library( name = "sparse", srcs = ["sparse.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":nest", "//tensorflow/python:dtypes", @@ -69,7 +69,7 @@ py_test( py_library( name = "structure", srcs = ["structure.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":nest", "//tensorflow/python:dtypes", @@ -120,7 +120,7 @@ py_test( py_library( name = "options", srcs = ["options.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) py_test( @@ -138,7 +138,7 @@ py_test( py_library( name = "convert", srcs = ["convert.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:constant_op", "//tensorflow/python:dtypes", @@ -164,7 +164,7 @@ py_test( py_library( name = "random_seed", srcs = ["random_seed.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:constant_op", "//tensorflow/python:dtypes", @@ -189,7 +189,7 @@ py_test( py_library( name = "traverse", srcs = ["traverse.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ], ) diff --git a/tensorflow/python/debug/BUILD b/tensorflow/python/debug/BUILD index cbfffc1f32d..97205d93541 100644 --- a/tensorflow/python/debug/BUILD +++ b/tensorflow/python/debug/BUILD @@ -21,7 +21,7 @@ exports_files(["LICENSE"]) py_library( name = "debug_py", srcs = ["__init__.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":check_numerics_callback", @@ -47,6 +47,7 @@ py_library( py_library( name = "debug_pip", data = [":grpc_tensorflow_server"], + srcs_version = "PY3", deps = [ ":cli_test_utils", ":debug_py", @@ -64,13 +65,13 @@ py_library( py_library( name = "op_callbacks_common", srcs = ["lib/op_callbacks_common.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) py_library( name = "check_numerics_callback", srcs = ["lib/check_numerics_callback.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":op_callbacks_common", ":source_utils", @@ -84,7 +85,7 @@ py_library( py_library( name = "dumping_callback", srcs = ["lib/dumping_callback.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":debug_events_writer", ":op_callbacks_common", @@ -99,7 +100,7 @@ py_library( py_library( name = "dumping_callback_test_lib", srcs = ["lib/dumping_callback_test_lib.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":check_numerics_callback", ":debug_events_reader", @@ -111,13 +112,13 @@ py_library( py_library( name = "common", srcs = ["lib/common.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) py_library( name = "debug_events_reader", srcs = ["lib/debug_events_reader.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/core:protos_all_py", "//tensorflow/python:framework", @@ -129,7 +130,7 @@ py_library( py_library( name = "debug_events_monitors", srcs = ["lib/debug_events_monitors.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/core:protos_all_py", "//tensorflow/python:framework", @@ -141,7 +142,7 @@ py_library( py_library( name = "debug_events_writer", srcs = ["lib/debug_events_writer.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/core:protos_all_py", "//tensorflow/python:framework", @@ -151,7 +152,7 @@ py_library( py_library( name = "debug_graphs", srcs = ["lib/debug_graphs.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/core:protos_all_py", "//tensorflow/python:framework", @@ -165,7 +166,7 @@ py_library( py_library( name = "debug_data", srcs = ["lib/debug_data.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = [ "//tensorflow:internal", "//third_party/py/tf_slim:__subpackages__", @@ -185,7 +186,7 @@ py_library( py_library( name = "debug_gradients", srcs = ["lib/debug_gradients.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":debug_data", ":debug_graphs", @@ -199,7 +200,7 @@ py_library( py_library( name = "debug_utils", srcs = ["lib/debug_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) py_binary( @@ -215,7 +216,7 @@ py_library( srcs = [ "lib/grpc_tensorflow_server.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/core:protos_all_py", "//tensorflow/python:platform", @@ -226,7 +227,7 @@ py_library( py_library( name = "source_utils", srcs = ["lib/source_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":profiling", "//third_party/py/numpy", @@ -236,7 +237,7 @@ py_library( py_library( name = "source_remote", srcs = ["lib/source_remote.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":common", ":debug_service_pb2_grpc", @@ -248,7 +249,7 @@ py_library( py_library( name = "framework", srcs = ["wrappers/framework.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":debug_utils", "//tensorflow/core:protos_all_py", @@ -262,7 +263,7 @@ py_library( py_library( name = "debugger_cli_common", srcs = ["cli/debugger_cli_common.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:platform", "//tensorflow/python:pywrap_tf_session", @@ -274,20 +275,20 @@ py_library( py_library( name = "cli_config", srcs = ["cli/cli_config.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [":debugger_cli_common"], ) py_library( name = "command_parser", srcs = ["cli/command_parser.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) py_library( name = "tensor_format", srcs = ["cli/tensor_format.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":debug_data", ":debugger_cli_common", @@ -298,7 +299,7 @@ py_library( py_library( name = "cli_shared", srcs = ["cli/cli_shared.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":command_parser", ":common", @@ -315,7 +316,7 @@ py_library( py_library( name = "evaluator", srcs = ["cli/evaluator.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":debug_data", "//third_party/py/numpy", @@ -325,7 +326,7 @@ py_library( py_library( name = "analyzer_cli", srcs = ["cli/analyzer_cli.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":cli_config", ":cli_shared", @@ -342,13 +343,13 @@ py_library( py_library( name = "profiling", srcs = ["lib/profiling.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) py_library( name = "profile_analyzer_cli", srcs = ["cli/profile_analyzer_cli.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":cli_shared", ":command_parser", @@ -363,7 +364,7 @@ py_library( py_library( name = "base_ui", srcs = ["cli/base_ui.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":cli_config", ":command_parser", @@ -374,14 +375,14 @@ py_library( py_library( name = "curses_widgets", srcs = ["cli/curses_widgets.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [":debugger_cli_common"], ) py_library( name = "curses_ui", srcs = ["cli/curses_ui.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":base_ui", ":cli_shared", @@ -396,7 +397,7 @@ py_library( py_library( name = "readline_ui", srcs = ["cli/readline_ui.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":base_ui", ":debugger_cli_common", @@ -406,7 +407,7 @@ py_library( py_library( name = "ui_factory", srcs = ["cli/ui_factory.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":curses_ui", ":readline_ui", @@ -416,7 +417,7 @@ py_library( py_library( name = "dumping_wrapper", srcs = ["wrappers/dumping_wrapper.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = [ "//tensorflow:internal", "//third_party/py/tf_slim:__subpackages__", @@ -432,7 +433,7 @@ py_library( py_library( name = "grpc_wrapper", srcs = ["wrappers/grpc_wrapper.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":common", ":framework", @@ -443,7 +444,7 @@ py_library( py_library( name = "local_cli_wrapper", srcs = ["wrappers/local_cli_wrapper.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":analyzer_cli", ":cli_shared", @@ -461,7 +462,7 @@ py_library( py_library( name = "hooks", srcs = ["wrappers/hooks.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = [ "//tensorflow:internal", "//third_party/py/tf_slim:__subpackages__", @@ -488,7 +489,7 @@ py_binary( py_library( name = "offline_analyzer_lib", srcs = ["cli/offline_analyzer.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":analyzer_cli", ":debug_data", @@ -499,6 +500,7 @@ py_library( py_library( name = "debug_examples_v1", + srcs_version = "PY3", deps = [ ":debug_errors_lib", ":debug_fibonacci_lib", @@ -511,6 +513,7 @@ py_library( py_library( name = "debug_examples_v2", + srcs_version = "PY3", deps = [ ":debug_fibonacci_lib", ":debug_mnist_lib", @@ -539,7 +542,7 @@ py_library( "examples/v1/debug_fibonacci.py", "examples/v2/debug_fibonacci_v2.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":debug_py", "//tensorflow:tensorflow_py", @@ -559,7 +562,7 @@ py_binary( py_library( name = "debug_errors_lib", srcs = ["examples/v1/debug_errors.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":debug_py", "//tensorflow:tensorflow_py", @@ -598,7 +601,7 @@ py_library( "examples/v1/debug_mnist_v1.py", "examples/v2/debug_mnist_v2.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":debug_py", "//tensorflow:tensorflow_py", @@ -616,7 +619,7 @@ py_binary( py_library( name = "debug_tflearn_iris_lib", srcs = ["examples/v1/debug_tflearn_iris.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":debug_py", "//tensorflow:tensorflow_py", @@ -635,7 +638,7 @@ py_binary( py_library( name = "debug_keras_lib", srcs = ["examples/v1/debug_keras.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":debug_py", "//tensorflow:tensorflow_py", @@ -970,7 +973,7 @@ py_test( py_library( name = "session_debug_testlib", srcs = ["lib/session_debug_testlib.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":debug_data", ":debug_graphs", @@ -1001,7 +1004,7 @@ py_library( py_library( name = "debug_service_pb2_grpc", srcs = ["lib/debug_service_pb2_grpc.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/core/debug:debug_service_proto_py", ], @@ -1010,7 +1013,7 @@ py_library( py_library( name = "grpc_debug_server", srcs = ["lib/grpc_debug_server.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":debug_graphs", @@ -1023,7 +1026,7 @@ py_library( py_library( name = "grpc_debug_test_server", srcs = ["lib/grpc_debug_test_server.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":debug_data", ":debug_utils", @@ -1209,7 +1212,7 @@ py_test( py_library( name = "cli_test_utils", srcs = ["cli/cli_test_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) cuda_py_test( diff --git a/tensorflow/python/distribute/BUILD b/tensorflow/python/distribute/BUILD index 5ec0f8b9137..3e483168d7a 100644 --- a/tensorflow/python/distribute/BUILD +++ b/tensorflow/python/distribute/BUILD @@ -15,6 +15,7 @@ exports_files(["LICENSE"]) py_library( name = "distribute_test_lib_pip", + srcs_version = "PY3", deps = [ ":combinations", ":multi_worker_test_base", @@ -29,7 +30,7 @@ py_library( py_library( name = "cross_device_ops", srcs = ["cross_device_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":collective_util", ":cross_device_utils", @@ -61,7 +62,7 @@ py_library( py_library( name = "cross_device_utils", srcs = ["cross_device_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":values", "//tensorflow/python:array_ops", @@ -81,7 +82,7 @@ py_library( py_library( name = "device_util", srcs = ["device_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:device", "//tensorflow/python:framework_ops", @@ -111,7 +112,7 @@ cuda_py_test( py_library( name = "distribute", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":cross_device_ops", ":distribute_lib", @@ -132,7 +133,7 @@ py_library( "distribute_lib.py", "distribution_strategy_context.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":collective_util", ":device_util", @@ -184,6 +185,7 @@ py_library( srcs = [ "distribute_config.py", ], + srcs_version = "PY3", deps = [], ) @@ -192,7 +194,7 @@ py_library( srcs = [ "distribute_coordinator.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":distribute_coordinator_context", ":multi_worker_util", @@ -230,13 +232,14 @@ py_library( srcs = [ "distribute_coordinator_context.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [], ) py_library( name = "mirrored_run", srcs = ["mirrored_run.py"], + srcs_version = "PY3", deps = [ ":device_util", ":distribute_lib", @@ -267,6 +270,7 @@ py_library( py_library( name = "distribute_utils", srcs = ["distribute_utils.py"], + srcs_version = "PY3", deps = [ ":device_util", ":distribute_lib", @@ -299,6 +303,7 @@ py_library( py_library( name = "mirrored_strategy", srcs = ["mirrored_strategy.py"], + srcs_version = "PY3", deps = [ ":collective_util", ":cross_device_ops", @@ -327,6 +332,7 @@ py_library( py_library( name = "parameter_server_strategy", srcs = ["parameter_server_strategy.py"], + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ ":cross_device_ops", @@ -356,6 +362,7 @@ py_library( py_library( name = "central_storage_strategy", srcs = ["central_storage_strategy.py"], + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ ":device_util", @@ -368,6 +375,7 @@ py_library( py_library( name = "one_device_strategy", srcs = ["one_device_strategy.py"], + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ ":distribute_lib", @@ -387,6 +395,7 @@ py_library( py_library( name = "collective_all_reduce_strategy", srcs = ["collective_all_reduce_strategy.py"], + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ ":collective_util", @@ -420,7 +429,7 @@ py_library( srcs = [ "multi_worker_util.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/core:protos_all_py", "//tensorflow/python:training_server_lib", @@ -460,6 +469,7 @@ cuda_py_test( py_library( name = "numpy_dataset", srcs = ["numpy_dataset.py"], + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:dtypes", @@ -490,6 +500,7 @@ py_test( py_library( name = "input_lib", srcs = ["input_lib.py"], + srcs_version = "PY3", deps = [ ":device_util", ":distribute_lib", @@ -507,6 +518,7 @@ py_library( py_library( name = "input_ops", srcs = ["input_ops.py"], + srcs_version = "PY3", deps = [ "//tensorflow/python:framework_ops", "//tensorflow/python/data/util:nest", @@ -553,6 +565,7 @@ py_test( py_library( name = "tpu_strategy", srcs = ["tpu_strategy.py"], + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ ":cross_device_ops", @@ -642,7 +655,7 @@ py_library( srcs = [ "estimator_training.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":distribute_coordinator", ":distribute_coordinator_context", @@ -653,6 +666,7 @@ py_library( py_library( name = "reduce_util", srcs = ["reduce_util.py"], + srcs_version = "PY3", deps = [ "//tensorflow/python:util", "//tensorflow/python:variable_scope", @@ -662,7 +676,7 @@ py_library( py_library( name = "collective_util", srcs = ["collective_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", "//tensorflow/python:variable_scope", @@ -681,6 +695,7 @@ tf_py_test( py_library( name = "shared_variable_creator", srcs = ["shared_variable_creator.py"], + srcs_version = "PY3", ) py_test( @@ -699,6 +714,7 @@ py_test( py_library( name = "summary_op_util", srcs = ["summary_op_util.py"], + srcs_version = "PY3", deps = [ ":distribute_lib", "//tensorflow/python:framework_ops", @@ -709,6 +725,7 @@ py_library( py_library( name = "packed_distributed_variable", srcs = ["packed_distributed_variable.py"], + srcs_version = "PY3", deps = [ ":device_util", "//tensorflow/python:framework_ops", @@ -721,6 +738,7 @@ py_library( py_library( name = "values", srcs = ["values.py"], + srcs_version = "PY3", deps = [ ":device_util", ":distribute_lib", @@ -749,6 +767,7 @@ py_library( py_library( name = "ps_values", srcs = ["ps_values.py"], + srcs_version = "PY3", deps = [ ":distribute_lib", ":values", @@ -764,6 +783,7 @@ py_library( py_library( name = "values_util", srcs = ["values_util.py"], + srcs_version = "PY3", deps = [ ":distribute_lib", ":reduce_util", @@ -780,6 +800,7 @@ py_library( py_library( name = "tpu_values", srcs = ["tpu_values.py"], + srcs_version = "PY3", deps = [ ":packed_distributed_variable", ":values", @@ -796,7 +817,7 @@ py_library( py_library( name = "combinations", srcs = ["combinations.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = [ "//tensorflow:internal", "//tensorflow_models:__subpackages__", @@ -839,7 +860,7 @@ py_test( py_library( name = "strategy_combinations", srcs = ["strategy_combinations.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = [ "//tensorflow:internal", "//tensorflow_models:__subpackages__", @@ -895,7 +916,7 @@ distribute_py_test( py_library( name = "multi_worker_test_base", srcs = ["multi_worker_test_base.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":distribute_coordinator", ":multi_process_runner", @@ -1101,7 +1122,7 @@ cuda_py_test( py_library( name = "sharded_variable", srcs = ["sharded_variable.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:composite_tensor", @@ -1155,7 +1176,7 @@ tf_py_test( py_library( name = "strategy_test_lib", srcs = ["strategy_test_lib.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":distribute_lib", ":reduce_util", @@ -1392,6 +1413,7 @@ distribute_py_test( py_library( name = "single_loss_example", srcs = ["single_loss_example.py"], + srcs_version = "PY3", deps = [ ":step_fn", ":strategy_test_lib", @@ -1406,6 +1428,7 @@ py_library( py_library( name = "step_fn", srcs = ["step_fn.py"], + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ "//tensorflow/python:training", @@ -1653,6 +1676,7 @@ py_library( py_library( name = "multi_process_lib", srcs = ["multi_process_lib.py"], + srcs_version = "PY3", deps = [ "//tensorflow/python:client_testlib", "//tensorflow/python/eager:test", @@ -1838,7 +1862,7 @@ distribute_py_test( py_library( name = "parameter_server_strategy_v2", srcs = ["parameter_server_strategy_v2.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":distribute_lib", ":distribute_utils", diff --git a/tensorflow/python/distribute/cluster_resolver/BUILD b/tensorflow/python/distribute/cluster_resolver/BUILD index e925104ffa3..284ffa0a50b 100644 --- a/tensorflow/python/distribute/cluster_resolver/BUILD +++ b/tensorflow/python/distribute/cluster_resolver/BUILD @@ -14,7 +14,7 @@ py_library( srcs = [ "__init__.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":base_cluster_resolver_py", @@ -31,7 +31,7 @@ py_library( py_library( name = "base_cluster_resolver_py", srcs = ["cluster_resolver.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:training_server_lib", ], @@ -40,7 +40,7 @@ py_library( py_library( name = "gce_cluster_resolver_py", srcs = ["gce_cluster_resolver.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":base_cluster_resolver_py", "//tensorflow/python:training_server_lib", @@ -50,7 +50,7 @@ py_library( py_library( name = "tfconfig_cluster_resolver_py", srcs = ["tfconfig_cluster_resolver.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":base_cluster_resolver_py", "//tensorflow/python:training_server_lib", @@ -60,7 +60,7 @@ py_library( py_library( name = "sagemaker_cluster_resolver_py", srcs = ["sagemaker_cluster_resolver.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":base_cluster_resolver_py", "//tensorflow/python:training_server_lib", @@ -70,14 +70,14 @@ py_library( py_library( name = "tpu_cluster_resolver_py", srcs = ["tpu_cluster_resolver.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = ["//tensorflow/python/distribute/cluster_resolver/tpu:tpu_cluster_resolver_py"], ) py_library( name = "slurm_cluster_resolver_py", srcs = ["slurm_cluster_resolver.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":base_cluster_resolver_py", "//tensorflow/python:training_server_lib", @@ -87,7 +87,7 @@ py_library( py_library( name = "kubernetes_cluster_resolver_py", srcs = ["kubernetes_cluster_resolver.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":base_cluster_resolver_py", "//tensorflow/python:training_server_lib", diff --git a/tensorflow/python/distribute/cluster_resolver/tpu/BUILD b/tensorflow/python/distribute/cluster_resolver/tpu/BUILD index dff2b6937f7..7fecd3388ba 100644 --- a/tensorflow/python/distribute/cluster_resolver/tpu/BUILD +++ b/tensorflow/python/distribute/cluster_resolver/tpu/BUILD @@ -16,7 +16,7 @@ package( py_library( name = "tpu_cluster_resolver_py", srcs = ["tpu_cluster_resolver.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:training_server_lib", "//tensorflow/python/distribute/cluster_resolver:base_cluster_resolver_py", diff --git a/tensorflow/python/distribute/coordinator/BUILD b/tensorflow/python/distribute/coordinator/BUILD index 4ddd29aecf5..13dde6e56b3 100644 --- a/tensorflow/python/distribute/coordinator/BUILD +++ b/tensorflow/python/distribute/coordinator/BUILD @@ -10,7 +10,7 @@ exports_files(["LICENSE"]) py_library( name = "cluster_coordinator", srcs = ["cluster_coordinator.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":metric_utils", ":utils", @@ -126,7 +126,7 @@ tf_py_test( py_library( name = "metric_utils", srcs = ["metric_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python/eager:monitoring", ], @@ -150,7 +150,7 @@ tf_py_test( py_library( name = "utils", srcs = ["utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:training_server_lib", ], @@ -158,6 +158,6 @@ py_library( py_library( name = "remote_eager_lib", - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], ) diff --git a/tensorflow/python/distribute/experimental/BUILD b/tensorflow/python/distribute/experimental/BUILD index 581f18b815a..5c01ae3530b 100644 --- a/tensorflow/python/distribute/experimental/BUILD +++ b/tensorflow/python/distribute/experimental/BUILD @@ -10,7 +10,7 @@ py_library( srcs = [ "__init__.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python/distribute:central_storage_strategy", "//tensorflow/python/distribute:collective_all_reduce_strategy", diff --git a/tensorflow/python/distribute/parallel_device/BUILD b/tensorflow/python/distribute/parallel_device/BUILD index 331e0a3c3af..07c28c981cc 100644 --- a/tensorflow/python/distribute/parallel_device/BUILD +++ b/tensorflow/python/distribute/parallel_device/BUILD @@ -14,7 +14,7 @@ exports_files( py_library( name = "parallel_device", srcs = ["parallel_device.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":saving", "//tensorflow/python:_pywrap_parallel_device", @@ -26,7 +26,7 @@ py_library( py_library( name = "saving", srcs = ["saving.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = ["//tensorflow/python:framework_ops"], ) diff --git a/tensorflow/python/distribute/v1/BUILD b/tensorflow/python/distribute/v1/BUILD index 83d4b1e9d97..43b5f22e09f 100644 --- a/tensorflow/python/distribute/v1/BUILD +++ b/tensorflow/python/distribute/v1/BUILD @@ -46,7 +46,7 @@ py_library( srcs = [ "all_reduce.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:framework_ops", diff --git a/tensorflow/python/dlpack/BUILD b/tensorflow/python/dlpack/BUILD index aad35a67d57..020cac3d12a 100644 --- a/tensorflow/python/dlpack/BUILD +++ b/tensorflow/python/dlpack/BUILD @@ -8,7 +8,7 @@ package( py_library( name = "dlpack", srcs = ["dlpack.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:__subpackages__"], deps = [ "//tensorflow/python:pywrap_tensorflow", diff --git a/tensorflow/python/eager/BUILD b/tensorflow/python/eager/BUILD index 33753aad257..09d340db645 100644 --- a/tensorflow/python/eager/BUILD +++ b/tensorflow/python/eager/BUILD @@ -131,6 +131,7 @@ filegroup( # Transitive dependencies of this target will be included in the pip package. py_library( name = "eager_pip", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ ":backprop", @@ -159,7 +160,7 @@ py_library( py_library( name = "core", srcs = ["core.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ ":context", @@ -171,7 +172,7 @@ py_library( py_library( name = "cancellation", srcs = ["cancellation.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ "//tensorflow/python:pywrap_tfe", @@ -192,7 +193,7 @@ cuda_py_test( py_library( name = "executor", srcs = ["executor.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ "//tensorflow/python:pywrap_tfe", @@ -202,7 +203,7 @@ py_library( py_library( name = "context", srcs = ["context.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ ":executor", @@ -277,7 +278,7 @@ cuda_py_test( py_library( name = "monitoring", srcs = ["monitoring.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/python:c_api_util", @@ -300,7 +301,7 @@ cuda_py_test( py_library( name = "profiler", srcs = ["profiler.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ ":context", @@ -326,7 +327,7 @@ cuda_py_test( py_library( name = "profiler_client", srcs = ["profiler_client.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = [ "//tensorflow:internal", "//tensorflow/core/profiler:internal", @@ -355,7 +356,7 @@ py_test( py_library( name = "tape", srcs = ["tape.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], ) @@ -526,7 +527,7 @@ cuda_py_test( py_library( name = "test", srcs = ["test.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ ":core", @@ -538,7 +539,7 @@ py_library( py_library( name = "execute", srcs = ["execute.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ ":context", @@ -556,7 +557,7 @@ py_library( py_library( name = "graph_only_ops", srcs = ["graph_only_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ "//tensorflow/core:protos_all_py", @@ -582,7 +583,7 @@ cuda_py_test( py_library( name = "framework_for_generated_wrappers", - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":execute", @@ -595,7 +596,7 @@ py_library( py_library( name = "function", srcs = ["function.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ ":context", @@ -632,7 +633,7 @@ pybind_extension( py_library( name = "backprop", srcs = ["backprop.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ ":backprop_util", @@ -660,7 +661,7 @@ py_library( py_library( name = "backprop_util", srcs = ["backprop_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ "//tensorflow/python:dtypes", @@ -671,7 +672,7 @@ py_library( py_library( name = "forwardprop", srcs = ["forwardprop.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ ":forwardprop_util", @@ -686,7 +687,7 @@ py_library( py_library( name = "forwardprop_util", srcs = ["forwardprop_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ "//tensorflow/python:pywrap_tfe", @@ -696,7 +697,7 @@ py_library( py_library( name = "benchmarks_test_base", srcs = ["benchmarks_test_base.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [":test"], ) @@ -811,7 +812,7 @@ tf_py_test( py_library( name = "imperative_grad", srcs = ["imperative_grad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:pywrap_tfe", "//tensorflow/python:unconnected_gradients", @@ -822,7 +823,7 @@ py_library( py_library( name = "def_function", srcs = ["def_function.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ ":context", @@ -845,7 +846,7 @@ py_library( py_library( name = "lift_to_graph", srcs = ["lift_to_graph.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ "//tensorflow/python:framework_ops", @@ -957,7 +958,7 @@ tf_xla_py_test( py_library( name = "wrap_function", srcs = ["wrap_function.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ ":context", @@ -1005,7 +1006,7 @@ cuda_py_test( py_library( name = "remote", srcs = ["remote.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ ":context", diff --git a/tensorflow/python/eager/benchmarks/resnet50/BUILD b/tensorflow/python/eager/benchmarks/resnet50/BUILD index 6c63658e3c7..901d127512e 100644 --- a/tensorflow/python/eager/benchmarks/resnet50/BUILD +++ b/tensorflow/python/eager/benchmarks/resnet50/BUILD @@ -8,7 +8,7 @@ package( py_library( name = "resnet50", srcs = ["resnet50.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow:tensorflow_py_no_contrib", ], @@ -17,7 +17,7 @@ py_library( py_library( name = "resnet50_test_util", srcs = ["resnet50_test_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":resnet50", "//tensorflow:tensorflow_py_no_contrib", @@ -27,7 +27,7 @@ py_library( py_library( name = "resnet50_test_lib", srcs = ["resnet50_test.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":resnet50", ":resnet50_test_util", diff --git a/tensorflow/python/eager/memory_tests/BUILD b/tensorflow/python/eager/memory_tests/BUILD index 59735c41608..ba6fc10a1ca 100644 --- a/tensorflow/python/eager/memory_tests/BUILD +++ b/tensorflow/python/eager/memory_tests/BUILD @@ -11,6 +11,7 @@ package( py_library( name = "memory_test_util", srcs = ["memory_test_util.py"], + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = ["@six_archive//:six"], ) diff --git a/tensorflow/python/estimator/BUILD b/tensorflow/python/estimator/BUILD index 1c6b83740d6..0e0d043110a 100644 --- a/tensorflow/python/estimator/BUILD +++ b/tensorflow/python/estimator/BUILD @@ -8,7 +8,7 @@ py_library( srcs = [ "estimator_lib.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = [ "//tensorflow:__pkg__", "//tensorflow:internal", @@ -36,7 +36,7 @@ py_library( py_library( name = "exporter", srcs = ["exporter.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":expect_tensorflow_estimator_installed", ":gc", @@ -49,7 +49,7 @@ py_library( py_library( name = "gc", srcs = ["gc.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":expect_tensorflow_estimator_installed", "//tensorflow:tensorflow_py_no_contrib", @@ -59,7 +59,7 @@ py_library( py_library( name = "model_fn", srcs = ["model_fn.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":expect_tensorflow_estimator_installed", ":export_output", @@ -71,7 +71,7 @@ py_library( py_library( name = "training", srcs = ["training.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":estimator", ":expect_tensorflow_estimator_installed", @@ -85,7 +85,7 @@ py_library( py_library( name = "run_config", srcs = ["run_config.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":expect_tensorflow_estimator_installed", "//tensorflow:tensorflow_py_no_contrib", @@ -96,7 +96,7 @@ py_library( py_library( name = "baseline", srcs = ["canned/baseline.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":estimator", ":expect_tensorflow_estimator_installed", @@ -111,7 +111,7 @@ py_library( py_library( name = "boosted_trees", srcs = ["canned/boosted_trees.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":boosted_trees_utils", ":estimator", @@ -125,7 +125,7 @@ py_library( py_library( name = "boosted_trees_utils", srcs = ["canned/boosted_trees_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":estimator", ":expect_tensorflow_estimator_installed", @@ -138,7 +138,7 @@ py_library( py_library( name = "dnn", srcs = ["canned/dnn.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":estimator", ":expect_tensorflow_estimator_installed", @@ -154,7 +154,7 @@ py_library( name = "dnn_testing_utils", testonly = 1, srcs = ["canned/dnn_testing_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":estimator", ":expect_tensorflow_estimator_installed", @@ -173,7 +173,7 @@ py_library( py_library( name = "dnn_linear_combined", srcs = ["canned/dnn_linear_combined.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":dnn", ":estimator", @@ -192,7 +192,7 @@ py_library( srcs = [ "util.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":expect_tensorflow_estimator_installed", "//tensorflow:tensorflow_py_no_contrib", @@ -204,7 +204,7 @@ py_library( srcs = [ "estimator.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":expect_tensorflow_estimator_installed", ":export_export", @@ -222,7 +222,7 @@ py_library( srcs = [ "canned/parsing_utils.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":expect_tensorflow_estimator_installed", "//tensorflow:tensorflow_py_no_contrib", @@ -233,7 +233,7 @@ py_library( py_library( name = "export_output", srcs = ["export/export_output.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":expect_tensorflow_estimator_installed", "//tensorflow:tensorflow_py_no_contrib", @@ -246,7 +246,7 @@ py_library( srcs = [ "export/export_lib.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":expect_tensorflow_estimator_installed", ":export_export", @@ -260,7 +260,7 @@ py_library( srcs = [ "export/export.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":expect_tensorflow_estimator_installed", ":util", @@ -272,7 +272,7 @@ py_library( py_library( name = "head", srcs = ["canned/head.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":expect_tensorflow_estimator_installed", ":export_output", @@ -287,7 +287,7 @@ py_library( py_library( name = "inputs", srcs = ["inputs/inputs.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":expect_tensorflow_estimator_installed", ":numpy_io", @@ -299,7 +299,7 @@ py_library( py_library( name = "linear", srcs = ["canned/linear.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":estimator", ":expect_tensorflow_estimator_installed", @@ -314,7 +314,7 @@ py_library( name = "linear_testing_utils", testonly = 1, srcs = ["canned/linear_testing_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":estimator", ":expect_tensorflow_estimator_installed", @@ -332,7 +332,7 @@ py_library( py_library( name = "metric_keys", srcs = ["canned/metric_keys.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":expect_tensorflow_estimator_installed", ":model_fn", @@ -342,7 +342,7 @@ py_library( py_library( name = "numpy_io", srcs = ["inputs/numpy_io.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":expect_tensorflow_estimator_installed", ":inputs_queues", @@ -352,7 +352,7 @@ py_library( py_library( name = "optimizers", srcs = ["canned/optimizers.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":expect_tensorflow_estimator_installed", "//tensorflow:tensorflow_py_no_contrib", @@ -363,7 +363,7 @@ py_library( py_library( name = "pandas_io", srcs = ["inputs/pandas_io.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":expect_tensorflow_estimator_installed", ":inputs_queues", @@ -373,7 +373,7 @@ py_library( py_library( name = "prediction_keys", srcs = ["canned/prediction_keys.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":expect_tensorflow_estimator_installed", ], @@ -385,7 +385,7 @@ py_library( "inputs/queues/feeding_functions.py", "inputs/queues/feeding_queue_runner.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":expect_tensorflow_estimator_installed", "//tensorflow:tensorflow_py_no_contrib", @@ -396,7 +396,7 @@ py_library( py_library( name = "keras", srcs = ["keras.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":estimator", ":expect_tensorflow_estimator_installed", @@ -409,6 +409,7 @@ py_library( py_library( name = "expect_tensorflow_estimator_installed", + srcs_version = "PY3", # This is a dummy rule used as a dependency in open-source. # We expect tensorflow_estimator to already be installed. visibility = ["//visibility:public"], diff --git a/tensorflow/python/feature_column/BUILD b/tensorflow/python/feature_column/BUILD index e1293a6be23..7026297459f 100644 --- a/tensorflow/python/feature_column/BUILD +++ b/tensorflow/python/feature_column/BUILD @@ -8,7 +8,7 @@ package( py_library( name = "feature_column_py", srcs = ["feature_column_lib.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":feature_column", ":feature_column_v2", @@ -20,7 +20,7 @@ py_library( py_library( name = "feature_column", srcs = ["feature_column.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":utils", "@six_archive//:six", @@ -65,7 +65,7 @@ py_library( "sequence_feature_column.py", "serialization.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":feature_column", ":utils", @@ -127,6 +127,7 @@ py_library( name = "feature_column_test_main_lib", srcs = ["feature_column_test.py"], data = [":vocabulary_testdata"], + srcs_version = "PY3", deps = [ ":feature_column", ":feature_column_py", @@ -169,6 +170,7 @@ py_library( name = "feature_column_v2_test_main_lib", srcs = ["feature_column_v2_test.py"], data = [":vocabulary_testdata"], + srcs_version = "PY3", deps = [ ":feature_column_py", ":feature_column_v2", @@ -197,7 +199,7 @@ py_library( py_library( name = "utils", srcs = ["utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:dtypes", diff --git a/tensorflow/python/framework/experimental/BUILD b/tensorflow/python/framework/experimental/BUILD index 4f563d18a59..8bcb924d09e 100644 --- a/tensorflow/python/framework/experimental/BUILD +++ b/tensorflow/python/framework/experimental/BUILD @@ -80,12 +80,14 @@ tf_python_pybind_extension( py_library( name = "gradient_registry", srcs = ["gradient_registry.py"], + srcs_version = "PY3", deps = [":_tape"], ) py_library( name = "math_ops", srcs = ["math_ops.py"], + srcs_version = "PY3", deps = [ ":_math_ops", ":context_stack", @@ -95,6 +97,7 @@ py_library( py_library( name = "nn_ops", srcs = ["nn_ops.py"], + srcs_version = "PY3", deps = [ ":_nn_ops", ":context_stack", @@ -104,6 +107,7 @@ py_library( py_library( name = "tape", srcs = ["tape.py"], + srcs_version = "PY3", deps = [ ":_tape", ":context_stack", @@ -115,16 +119,19 @@ py_library( py_library( name = "def_function", srcs = ["def_function.py"], + srcs_version = "PY3", ) py_library( name = "thread_local_stack", srcs = ["thread_local_stack.py"], + srcs_version = "PY3", ) py_library( name = "context_stack", srcs = ["context_stack.py"], + srcs_version = "PY3", deps = [":thread_local_stack"], ) diff --git a/tensorflow/python/keras/BUILD b/tensorflow/python/keras/BUILD index ead6aaa107f..a2f0dfe3ef6 100755 --- a/tensorflow/python/keras/BUILD +++ b/tensorflow/python/keras/BUILD @@ -25,7 +25,7 @@ py_library( "estimator/__init__.py", "keras_parameterized.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":backend", ":engine", @@ -53,7 +53,7 @@ py_library( py_library( name = "backend", srcs = ["backend.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":backend_config", "//tensorflow/core:protos_all_py", @@ -104,7 +104,7 @@ py_library( py_library( name = "backend_config", srcs = ["backend_config.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", ], @@ -117,7 +117,7 @@ py_library( ":metrics", ":models", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python/keras/engine", ], @@ -128,7 +128,7 @@ py_library( srcs = [ "activations.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":backend", "//tensorflow/python/keras/layers:advanced_activations", @@ -140,7 +140,7 @@ py_library( py_library( name = "base_layer", srcs = [], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python/keras/engine:base_layer", ], @@ -151,7 +151,7 @@ py_library( srcs = [ "callbacks.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":backend", "//tensorflow/python/keras/distribute:distributed_file_utils", @@ -169,6 +169,7 @@ py_library( srcs = [ "combinations.py", ], + srcs_version = "PY3", deps = [ ":testing_utils", "//tensorflow/python:framework_combinations", @@ -182,7 +183,7 @@ py_library( srcs = [ "callbacks_v1.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":backend", "//tensorflow/python/keras/utils:engine_utils", @@ -195,7 +196,7 @@ py_library( srcs = [ "constraints.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":backend", "//tensorflow/python/keras/utils:engine_utils", @@ -209,7 +210,7 @@ py_library( "initializers/initializers_v1.py", "initializers/initializers_v2.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":backend", "//tensorflow/python:array_ops", @@ -232,7 +233,7 @@ py_library( srcs = [ "losses.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":backend", "//tensorflow/python/keras/utils:engine_utils", @@ -244,7 +245,7 @@ py_library( srcs = [ "metrics.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":activations", ":backend", @@ -284,7 +285,7 @@ py_library( srcs = [ "models.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":backend", ":metrics", @@ -305,7 +306,7 @@ py_library( "optimizer_v1.py", "optimizers.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":backend", "//tensorflow/python/keras/optimizer_v2", @@ -318,7 +319,7 @@ py_library( srcs = [ "regularizers.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":backend", "//tensorflow/python/keras/utils:engine_utils", @@ -330,6 +331,7 @@ py_library( srcs = [ "testing_utils.py", ], + srcs_version = "PY3", deps = [ ":backend", ":models", diff --git a/tensorflow/python/keras/applications/BUILD b/tensorflow/python/keras/applications/BUILD index fbd9de7d3aa..8006896ffda 100644 --- a/tensorflow/python/keras/applications/BUILD +++ b/tensorflow/python/keras/applications/BUILD @@ -36,7 +36,7 @@ py_library( "vgg19.py", "xception.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/python:lib", diff --git a/tensorflow/python/keras/benchmarks/BUILD b/tensorflow/python/keras/benchmarks/BUILD index a3287a249e7..8afda3d4a39 100644 --- a/tensorflow/python/keras/benchmarks/BUILD +++ b/tensorflow/python/keras/benchmarks/BUILD @@ -30,6 +30,7 @@ filegroup( # Add all benchmarks related utils here for pip testing dependencis. py_library( name = "keras_benchmark_lib_pip", + srcs_version = "PY3", deps = [ ":benchmark_util", ":distribution_util", @@ -40,6 +41,7 @@ py_library( # This lib is mainly for running benchmarks on mlcompass infra. py_library( name = "profiler_lib", + srcs_version = "PY3", visibility = [ "//learning/brain/contrib/keras_benchmark:__subpackages__", "//tensorflow/python/keras:__subpackages__", @@ -93,6 +95,7 @@ cuda_py_test( py_library( name = "benchmark_util", srcs = ["benchmark_util.py"], + srcs_version = "PY3", deps = [ ":distribution_util", "//tensorflow:tensorflow_py", @@ -225,6 +228,7 @@ cuda_py_test( py_library( name = "distribution_util", srcs = ["distribution_util.py"], + srcs_version = "PY3", deps = [ "//tensorflow:tensorflow_py", ], diff --git a/tensorflow/python/keras/benchmarks/layer_benchmarks/BUILD b/tensorflow/python/keras/benchmarks/layer_benchmarks/BUILD index a3f90deb66f..54d447485fc 100644 --- a/tensorflow/python/keras/benchmarks/layer_benchmarks/BUILD +++ b/tensorflow/python/keras/benchmarks/layer_benchmarks/BUILD @@ -40,12 +40,14 @@ BECHMARK_TAGS = [ py_library( name = "run_xprof", srcs = ["run_xprof.py"], + srcs_version = "PY3", visibility = ["//tensorflow/python/keras:__subpackages__"], ) py_library( name = "layer_benchmarks_test_base", srcs = ["layer_benchmarks_test_base.py"], + srcs_version = "PY3", visibility = ["//tensorflow/python/keras:__subpackages__"], deps = [ ":run_xprof", diff --git a/tensorflow/python/keras/benchmarks/saved_model_benchmarks/BUILD b/tensorflow/python/keras/benchmarks/saved_model_benchmarks/BUILD index c99d062143f..ade9d1db1c8 100644 --- a/tensorflow/python/keras/benchmarks/saved_model_benchmarks/BUILD +++ b/tensorflow/python/keras/benchmarks/saved_model_benchmarks/BUILD @@ -30,6 +30,7 @@ filegroup( py_library( name = "saved_model_benchmark_util", srcs = ["saved_model_benchmark_util.py"], + srcs_version = "PY3", deps = [ "//tensorflow:tensorflow_py", "//tensorflow/python/keras/benchmarks:profiler_lib", diff --git a/tensorflow/python/keras/datasets/BUILD b/tensorflow/python/keras/datasets/BUILD index 67f400db4b0..b973d700232 100644 --- a/tensorflow/python/keras/datasets/BUILD +++ b/tensorflow/python/keras/datasets/BUILD @@ -27,7 +27,7 @@ py_library( "mnist.py", "reuters.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/python:platform", diff --git a/tensorflow/python/keras/distribute/BUILD b/tensorflow/python/keras/distribute/BUILD index 4b563db6716..4fef30be710 100644 --- a/tensorflow/python/keras/distribute/BUILD +++ b/tensorflow/python/keras/distribute/BUILD @@ -29,7 +29,7 @@ py_library( "distributed_training_utils.py", "distributed_training_utils_v1.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":sidecar_evaluator", "//tensorflow/python:client_testlib", @@ -62,6 +62,7 @@ py_library( py_library( name = "distribute_test_lib_pip", + srcs_version = "PY3", deps = [ ":distribute_strategy_test_lib", ":keras_correctness_test_lib", @@ -76,7 +77,7 @@ py_library( py_library( name = "optimizer_combinations", srcs = ["optimizer_combinations.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:training", "//tensorflow/python/distribute:combinations", @@ -90,7 +91,7 @@ py_library( srcs = [ "worker_training_state.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":distributed_file_utils", "//tensorflow/python:constant_op", @@ -107,12 +108,13 @@ py_library( py_library( name = "model_collection_base", srcs = ["model_collection_base.py"], + srcs_version = "PY3", ) py_library( name = "model_combinations", srcs = ["model_combinations.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":simple_models", "//tensorflow/python/distribute:combinations", @@ -122,6 +124,7 @@ py_library( py_library( name = "simple_models", srcs = ["simple_models.py"], + srcs_version = "PY3", deps = [ ":model_collection_base", "//tensorflow/python:constant_op", @@ -133,6 +136,7 @@ py_library( py_library( name = "saved_model_test_base", srcs = ["saved_model_test_base.py"], + srcs_version = "PY3", deps = [ ":model_combinations", "//tensorflow/python:array_ops", @@ -316,6 +320,7 @@ py_library( srcs = [ "distribute_strategy_test.py", ], + srcs_version = "PY3", deps = [ ":optimizer_combinations", ":strategy_combinations", @@ -404,6 +409,7 @@ py_library( "keras_rnn_model_correctness_test.py", "keras_stateful_lstm_model_correctness_test.py", ], + srcs_version = "PY3", deps = [ ":strategy_combinations", "//tensorflow/python:client_testlib", @@ -612,6 +618,7 @@ py_library( srcs = [ "keras_utils_test.py", ], + srcs_version = "PY3", deps = [ "//tensorflow/python:client_testlib", "//tensorflow/python:training", @@ -775,6 +782,7 @@ py_library( srcs = [ "multi_worker_testing_utils.py", ], + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:framework_ops", @@ -788,7 +796,7 @@ py_library( py_library( name = "tpu_strategy_test_utils", srcs = ["tpu_strategy_test_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:platform", "//tensorflow/python/distribute:tpu_strategy", @@ -870,6 +878,7 @@ py_library( srcs = [ "distributed_file_utils.py", ], + srcs_version = "PY3", deps = [ "//tensorflow/python:lib", "//tensorflow/python/distribute:distribute_lib", @@ -934,6 +943,7 @@ tf_py_test( py_library( name = "strategy_combinations", srcs = ["strategy_combinations.py"], + srcs_version = "PY3", deps = [ "//tensorflow/python/distribute:strategy_combinations", ], @@ -942,6 +952,7 @@ py_library( py_library( name = "test_example", srcs = ["test_example.py"], + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:constant_op", diff --git a/tensorflow/python/keras/engine/BUILD b/tensorflow/python/keras/engine/BUILD index 185f15a9331..1a5b0a92e8c 100644 --- a/tensorflow/python/keras/engine/BUILD +++ b/tensorflow/python/keras/engine/BUILD @@ -42,7 +42,7 @@ py_library( "training_utils_v1.py", "training_v1.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":base_layer", ":base_preprocessing_layer", @@ -95,7 +95,7 @@ py_library( py_library( name = "base_layer_utils", srcs = ["base_layer_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:auto_control_deps", @@ -119,7 +119,7 @@ py_library( "base_layer.py", "base_layer_v1.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":base_layer_utils", ":input_spec", @@ -179,7 +179,7 @@ py_library( py_library( name = "data_adapter", srcs = ["data_adapter.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:framework_ops", "//tensorflow/python:util", @@ -192,7 +192,7 @@ py_library( py_library( name = "input_spec", srcs = ["input_spec.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:dtypes", "//tensorflow/python:lib", @@ -206,7 +206,7 @@ py_library( py_library( name = "keras_tensor", srcs = ["keras_tensor.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:dtypes", "//tensorflow/python:lib", @@ -222,7 +222,7 @@ py_library( "base_preprocessing_layer.py", "base_preprocessing_layer_v1.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":base_layer", "//tensorflow/python/data", @@ -235,7 +235,7 @@ py_library( py_library( name = "node", srcs = ["node.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":base_layer_utils", "//tensorflow/python:framework_ops", diff --git a/tensorflow/python/keras/feature_column/BUILD b/tensorflow/python/keras/feature_column/BUILD index e73691341b5..c725eb824a6 100644 --- a/tensorflow/python/keras/feature_column/BUILD +++ b/tensorflow/python/keras/feature_column/BUILD @@ -17,6 +17,7 @@ filegroup( py_library( name = "feature_column", srcs = ["__init__.py"], + srcs_version = "PY3", deps = [ ":base_feature_layer", ":dense_features", @@ -28,6 +29,7 @@ py_library( py_library( name = "base_feature_layer", srcs = ["base_feature_layer.py"], + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:variable_scope", @@ -42,6 +44,7 @@ py_library( srcs = [ "dense_features.py", ], + srcs_version = "PY3", deps = [ ":base_feature_layer", "//tensorflow/python:framework_ops", @@ -57,6 +60,7 @@ py_library( srcs = [ "dense_features_v2.py", ], + srcs_version = "PY3", deps = [ ":base_feature_layer", ":dense_features", @@ -120,6 +124,7 @@ tf_py_test( py_library( name = "sequence_feature_column", srcs = ["sequence_feature_column.py"], + srcs_version = "PY3", deps = [ ":base_feature_layer", "//tensorflow/python:array_ops", diff --git a/tensorflow/python/keras/layers/BUILD b/tensorflow/python/keras/layers/BUILD index de071893704..2e9c9c8dfb4 100644 --- a/tensorflow/python/keras/layers/BUILD +++ b/tensorflow/python/keras/layers/BUILD @@ -30,7 +30,7 @@ py_library( "__init__.py", "serialization.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":advanced_activations", ":convolutional", @@ -62,7 +62,7 @@ py_library( py_library( name = "advanced_activations", srcs = ["advanced_activations.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:math_ops", "//tensorflow/python:util", @@ -79,7 +79,7 @@ py_library( py_library( name = "convolutional", srcs = ["convolutional.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":pooling", "//tensorflow/python:array_ops", @@ -103,7 +103,7 @@ py_library( py_library( name = "convolutional_recurrent", srcs = ["convolutional_recurrent.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":recurrent", "//tensorflow/python:array_ops", @@ -125,7 +125,7 @@ py_library( py_library( name = "core", srcs = ["core.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:constant_op", @@ -162,7 +162,7 @@ py_library( py_library( name = "cudnn_recurrent", srcs = ["cudnn_recurrent.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":recurrent", ":recurrent_v2", @@ -182,7 +182,7 @@ py_library( py_library( name = "dense_attention", srcs = ["dense_attention.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:dtypes", @@ -201,7 +201,7 @@ py_library( py_library( name = "einsum_dense", srcs = ["einsum_dense.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:special_math_ops", "//tensorflow/python:tensor_shape", @@ -217,7 +217,7 @@ py_library( py_library( name = "multi_head_attention", srcs = ["multi_head_attention.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:platform", "//tensorflow/python:special_math_ops", @@ -234,7 +234,7 @@ py_library( py_library( name = "embeddings", srcs = ["embeddings.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:embedding_ops", "//tensorflow/python:framework_ops", @@ -254,7 +254,7 @@ py_library( py_library( name = "kernelized", srcs = ["kernelized.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:dtypes", "//tensorflow/python:framework_ops", @@ -273,7 +273,7 @@ py_library( py_library( name = "local", srcs = ["local.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", "//tensorflow/python/keras:activations", @@ -292,7 +292,7 @@ py_library( py_library( name = "merge", srcs = ["merge.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:math_ops", @@ -307,7 +307,7 @@ py_library( py_library( name = "noise", srcs = ["noise.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:math_ops", @@ -322,7 +322,7 @@ py_library( py_library( name = "normalization", srcs = ["normalization.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:constant_op", @@ -351,7 +351,7 @@ py_library( py_library( name = "normalization_v2", srcs = ["normalization_v2.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":normalization", "//tensorflow/python:util", @@ -361,7 +361,7 @@ py_library( py_library( name = "pooling", srcs = ["pooling.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:math_ops", @@ -378,7 +378,7 @@ py_library( py_library( name = "recurrent", srcs = ["recurrent.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:control_flow_ops", @@ -409,7 +409,7 @@ py_library( py_library( name = "recurrent_v2", srcs = ["recurrent_v2.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":recurrent", "//tensorflow/python:array_ops", @@ -436,7 +436,7 @@ py_library( py_library( name = "rnn_cell_wrapper_v2", srcs = ["rnn_cell_wrapper_v2.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":recurrent", "//tensorflow/python:util", @@ -447,7 +447,7 @@ py_library( py_library( name = "wrappers", srcs = ["wrappers.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":recurrent", "//tensorflow/python:array_ops", diff --git a/tensorflow/python/keras/layers/legacy_rnn/BUILD b/tensorflow/python/keras/layers/legacy_rnn/BUILD index 99a8d1140b9..76a8bddc401 100644 --- a/tensorflow/python/keras/layers/legacy_rnn/BUILD +++ b/tensorflow/python/keras/layers/legacy_rnn/BUILD @@ -18,6 +18,7 @@ filegroup( py_library( name = "rnn_cell_impl", srcs = ["rnn_cell_impl.py"], + srcs_version = "PY3", deps = [ ":rnn_cell_wrapper_impl", "//tensorflow/python:array_ops", @@ -50,6 +51,7 @@ py_library( py_library( name = "rnn_cell_wrapper_impl", srcs = ["rnn_cell_wrapper_impl.py"], + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:framework_ops", diff --git a/tensorflow/python/keras/layers/ops/BUILD b/tensorflow/python/keras/layers/ops/BUILD index ea70ee982db..9006bacb8da 100644 --- a/tensorflow/python/keras/layers/ops/BUILD +++ b/tensorflow/python/keras/layers/ops/BUILD @@ -17,7 +17,7 @@ filegroup( py_library( name = "core", srcs = ["core.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:framework_ops", "//tensorflow/python:sparse_ops", diff --git a/tensorflow/python/keras/layers/preprocessing/BUILD b/tensorflow/python/keras/layers/preprocessing/BUILD index 50461573f84..6232e7badd4 100644 --- a/tensorflow/python/keras/layers/preprocessing/BUILD +++ b/tensorflow/python/keras/layers/preprocessing/BUILD @@ -27,7 +27,7 @@ py_library( srcs = [ "__init__.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":category_crossing", ":discretization", @@ -49,7 +49,7 @@ py_library( "discretization.py", "discretization_v1.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:boosted_trees_ops", @@ -72,7 +72,7 @@ py_library( srcs = [ "category_crossing.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:dtypes", @@ -95,7 +95,7 @@ py_library( srcs = [ "hashing.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:dtypes", @@ -119,7 +119,7 @@ py_library( srcs = [ "image_preprocessing.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:check_ops", @@ -150,7 +150,7 @@ py_library( "index_lookup.py", "index_lookup_v1.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":category_encoding", ":table_utils", @@ -171,7 +171,7 @@ py_library( "normalization.py", "normalization_v1.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:dtypes", @@ -193,7 +193,7 @@ py_library( "integer_lookup.py", "integer_lookup_v1.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":index_lookup", ":table_utils", @@ -208,7 +208,7 @@ py_library( srcs = [ "table_utils.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:dtypes", @@ -231,7 +231,7 @@ py_library( "text_vectorization.py", "text_vectorization_v1.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":category_encoding", ":string_lookup", @@ -260,7 +260,7 @@ py_library( "category_encoding.py", "category_encoding_v1.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:bincount_ops", @@ -288,7 +288,7 @@ py_library( srcs = [ "reduction.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:math_ops", @@ -303,7 +303,7 @@ py_library( "string_lookup.py", "string_lookup_v1.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":index_lookup", ":table_utils", @@ -318,7 +318,7 @@ py_library( srcs = [ "preprocessing_stage.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:framework_ops", "//tensorflow/python:util", @@ -332,7 +332,7 @@ py_library( py_library( name = "preprocessing_test_utils", srcs = ["preprocessing_test_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:client_testlib", "//tensorflow/python:util", diff --git a/tensorflow/python/keras/legacy_tf_layers/BUILD b/tensorflow/python/keras/legacy_tf_layers/BUILD index a8751302681..d637be61aed 100644 --- a/tensorflow/python/keras/legacy_tf_layers/BUILD +++ b/tensorflow/python/keras/legacy_tf_layers/BUILD @@ -24,7 +24,7 @@ py_library( "__init__.py", "base.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:dtypes", "//tensorflow/python:framework_ops", @@ -42,6 +42,7 @@ py_library( py_library( name = "convolutional", srcs = ["convolutional.py"], + srcs_version = "PY3", deps = [ ":layers_base", "//tensorflow/python:init_ops", @@ -53,6 +54,7 @@ py_library( py_library( name = "core", srcs = ["core.py"], + srcs_version = "PY3", deps = [ ":layers_base", "//tensorflow/python:init_ops", @@ -64,6 +66,7 @@ py_library( py_library( name = "normalization", srcs = ["normalization.py"], + srcs_version = "PY3", deps = [ ":layers_base", "//tensorflow/python:init_ops", @@ -75,6 +78,7 @@ py_library( py_library( name = "pooling", srcs = ["pooling.py"], + srcs_version = "PY3", deps = [ ":layers_base", "//tensorflow/python:util", diff --git a/tensorflow/python/keras/mixed_precision/BUILD b/tensorflow/python/keras/mixed_precision/BUILD index ccf55c8b166..9de80738e47 100644 --- a/tensorflow/python/keras/mixed_precision/BUILD +++ b/tensorflow/python/keras/mixed_precision/BUILD @@ -40,7 +40,7 @@ filegroup( py_library( name = "mixed_precision_experimental", srcs = ["__init__.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":get_layer_policy", ":loss_scale_optimizer", @@ -53,7 +53,7 @@ py_library( srcs = [ "policy.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":device_compatibility_check", "//tensorflow/python:framework", @@ -84,7 +84,7 @@ tf_py_test( py_library( name = "device_compatibility_check", srcs = ["device_compatibility_check.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:config", ], @@ -105,7 +105,7 @@ cuda_py_test( py_library( name = "get_layer_policy", srcs = ["get_layer_policy.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python/keras/engine:base_layer", ], @@ -128,7 +128,7 @@ py_library( srcs = [ "autocast_variable.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:framework_ops", "//tensorflow/python:math_ops", @@ -164,7 +164,7 @@ tf_py_test( py_library( name = "loss_scale", srcs = ["loss_scale.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:loss_scale", "//tensorflow/python/keras/utils:generic_utils", @@ -174,7 +174,7 @@ py_library( py_library( name = "loss_scale_optimizer", srcs = ["loss_scale_optimizer.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":loss_scale", "//tensorflow/python/distribute:collective_all_reduce_strategy", @@ -248,7 +248,7 @@ cuda_py_test( py_library( name = "test_util", srcs = ["test_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:framework", "//tensorflow/python/keras", diff --git a/tensorflow/python/keras/optimizer_v2/BUILD b/tensorflow/python/keras/optimizer_v2/BUILD index 138741d1806..d452cff7d09 100644 --- a/tensorflow/python/keras/optimizer_v2/BUILD +++ b/tensorflow/python/keras/optimizer_v2/BUILD @@ -34,7 +34,7 @@ py_library( "rmsprop.py", "utils.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":learning_rate_schedule", "//tensorflow/python:control_flow_ops", @@ -64,7 +64,7 @@ py_library( srcs = [ "learning_rate_schedule.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:control_flow_ops", "//tensorflow/python:framework", @@ -77,7 +77,7 @@ py_library( py_library( name = "legacy_learning_rate_decay", srcs = ["legacy_learning_rate_decay.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":learning_rate_schedule", "//tensorflow/python:dtypes", diff --git a/tensorflow/python/keras/premade/BUILD b/tensorflow/python/keras/premade/BUILD index b7570dad580..71d9ab28aa7 100644 --- a/tensorflow/python/keras/premade/BUILD +++ b/tensorflow/python/keras/premade/BUILD @@ -22,7 +22,7 @@ py_library( "linear.py", "wide_deep.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:framework", "//tensorflow/python:math_ops", diff --git a/tensorflow/python/keras/preprocessing/BUILD b/tensorflow/python/keras/preprocessing/BUILD index c74c248b5cc..5f364c5e503 100644 --- a/tensorflow/python/keras/preprocessing/BUILD +++ b/tensorflow/python/keras/preprocessing/BUILD @@ -21,6 +21,7 @@ py_library( srcs = [ "__init__.py", ], + srcs_version = "PY3", deps = [ ":image", ":sequence", @@ -37,6 +38,7 @@ py_library( "image.py", "image_dataset.py", ], + srcs_version = "PY3", deps = [ "//tensorflow/python:util", "//tensorflow/python/keras:backend", @@ -50,6 +52,7 @@ py_library( srcs = [ "sequence.py", ], + srcs_version = "PY3", deps = [ "//tensorflow/python:util", "//tensorflow/python/keras/utils:data_utils", @@ -61,6 +64,7 @@ py_library( srcs = [ "timeseries.py", ], + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:math_ops", @@ -76,6 +80,7 @@ py_library( "text.py", "text_dataset.py", ], + srcs_version = "PY3", deps = ["//tensorflow/python:util"], ) diff --git a/tensorflow/python/keras/saving/BUILD b/tensorflow/python/keras/saving/BUILD index f4e0bf8f167..5e0fa507fee 100644 --- a/tensorflow/python/keras/saving/BUILD +++ b/tensorflow/python/keras/saving/BUILD @@ -45,7 +45,7 @@ py_library( "saved_model_experimental.py", "saving_utils.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":load_context", "//tensorflow/python:lib", @@ -75,7 +75,7 @@ py_library( srcs = [ "saved_model/load_context.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [], ) diff --git a/tensorflow/python/keras/tests/BUILD b/tensorflow/python/keras/tests/BUILD index 7718884cc91..5397bbf33d2 100644 --- a/tensorflow/python/keras/tests/BUILD +++ b/tensorflow/python/keras/tests/BUILD @@ -165,7 +165,7 @@ py_library( srcs = [ "model_architectures.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python/keras", ], @@ -187,7 +187,7 @@ tf_py_test( py_library( name = "model_subclassing_test_util", srcs = ["model_subclassing_test_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python/keras", ], @@ -482,6 +482,6 @@ tf_xla_py_test( py_library( name = "get_config_samples", srcs = ["get_config_samples.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [], ) diff --git a/tensorflow/python/keras/utils/BUILD b/tensorflow/python/keras/utils/BUILD index 1ffad777e74..cdd1854e191 100644 --- a/tensorflow/python/keras/utils/BUILD +++ b/tensorflow/python/keras/utils/BUILD @@ -24,6 +24,7 @@ py_library( srcs = [ "__init__.py", ], + srcs_version = "PY3", deps = [ ":all_utils", ], @@ -34,6 +35,7 @@ py_library( srcs = [ "all_utils.py", ], + srcs_version = "PY3", deps = [ ":control_flow_util", ":engine_utils", @@ -48,14 +50,14 @@ py_library( py_library( name = "control_flow_util", srcs = ["control_flow_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [], ) py_library( name = "data_utils", srcs = ["data_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":generic_utils", ":io_utils", @@ -69,7 +71,7 @@ py_library( "conv_utils.py", "losses_utils.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":data_utils", ":io_utils", @@ -80,7 +82,7 @@ py_library( py_library( name = "io_utils", srcs = ["io_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "@six_archive//:six", ], @@ -89,7 +91,7 @@ py_library( py_library( name = "tf_utils", srcs = ["tf_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":object_identity", "//tensorflow/python:composite_tensor", @@ -110,7 +112,7 @@ py_library( srcs = [ "generic_utils.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":tf_contextlib", ":tf_inspect", @@ -124,7 +126,7 @@ py_library( srcs = [ "mode_keys.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python/saved_model/model_utils:mode_keys", ], @@ -136,7 +138,7 @@ py_library( "kernelized_utils.py", "layer_utils.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":engine_utils", "//tensorflow/python:util", @@ -150,7 +152,7 @@ py_library( srcs = [ "metrics_utils.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":generic_utils", ":tf_utils", @@ -176,7 +178,7 @@ py_library( srcs = [ "version_utils.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:framework_ops", "//tensorflow/python:util", @@ -188,7 +190,7 @@ py_library( srcs = [ "multi_gpu_utils.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:framework_ops", @@ -203,7 +205,7 @@ py_library( srcs = [ "np_utils.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", "//third_party/py/numpy", @@ -213,14 +215,14 @@ py_library( py_library( name = "object_identity", srcs = ["object_identity.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [], ) py_library( name = "tf_contextlib", srcs = ["tf_contextlib.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", ], @@ -229,7 +231,7 @@ py_library( py_library( name = "tf_inspect", srcs = ["tf_inspect.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", ], @@ -240,7 +242,7 @@ py_library( srcs = [ "vis_utils.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", ], diff --git a/tensorflow/python/keras/wrappers/BUILD b/tensorflow/python/keras/wrappers/BUILD index 9786cff1463..85fd4389833 100644 --- a/tensorflow/python/keras/wrappers/BUILD +++ b/tensorflow/python/keras/wrappers/BUILD @@ -20,7 +20,7 @@ py_library( "__init__.py", "scikit_learn.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", "//tensorflow/python/keras:engine", diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD index 510a7da150e..90bbd982fa5 100644 --- a/tensorflow/python/kernel_tests/BUILD +++ b/tensorflow/python/kernel_tests/BUILD @@ -367,6 +367,7 @@ cuda_py_test( py_library( name = "cudnn_deterministic_base", srcs = ["cudnn_deterministic_base.py"], + srcs_version = "PY3", deps = [ "//tensorflow/python:client_testlib", "//tensorflow/python:constant_op", @@ -1736,6 +1737,7 @@ cuda_py_test( py_library( name = "bias_op_base", srcs = ["bias_op_base.py"], + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:client_testlib", diff --git a/tensorflow/python/kernel_tests/proto/BUILD b/tensorflow/python/kernel_tests/proto/BUILD index 0e935dfe8c4..d0945ed7c51 100644 --- a/tensorflow/python/kernel_tests/proto/BUILD +++ b/tensorflow/python/kernel_tests/proto/BUILD @@ -59,6 +59,7 @@ py_library( name = "proto_op_test_base", testonly = 1, srcs = ["proto_op_test_base.py"], + srcs_version = "PY3", deps = [ ":test_example_proto_py", "//tensorflow/python:client_testlib", @@ -69,6 +70,7 @@ py_library( name = "decode_proto_op_test_base", testonly = 1, srcs = ["decode_proto_op_test_base.py"], + srcs_version = "PY3", deps = [ ":proto_op_test_base", ":test_example_proto_py", @@ -81,6 +83,7 @@ py_library( name = "encode_proto_op_test_base", testonly = 1, srcs = ["encode_proto_op_test_base.py"], + srcs_version = "PY3", deps = [ ":proto_op_test_base", ":test_example_proto_py", @@ -89,7 +92,10 @@ py_library( ], ) -py_library(name = "py_test_deps") +py_library( + name = "py_test_deps", + srcs_version = "PY3", +) tf_proto_library( name = "test_example_proto", @@ -110,6 +116,7 @@ py_library( name = "descriptor_source_test_base", testonly = 1, srcs = ["descriptor_source_test_base.py"], + srcs_version = "PY3", deps = [ ":proto_op_test_base", "//third_party/py/numpy", diff --git a/tensorflow/python/kernel_tests/random/BUILD b/tensorflow/python/kernel_tests/random/BUILD index 74d275be8ca..3da1c161a70 100644 --- a/tensorflow/python/kernel_tests/random/BUILD +++ b/tensorflow/python/kernel_tests/random/BUILD @@ -15,6 +15,7 @@ package( py_library( name = "util", srcs = ["util.py"], + srcs_version = "PY3", deps = [ "//third_party/py/numpy", ], diff --git a/tensorflow/python/kernel_tests/signal/BUILD b/tensorflow/python/kernel_tests/signal/BUILD index bf1fd711800..e6d17ad470f 100644 --- a/tensorflow/python/kernel_tests/signal/BUILD +++ b/tensorflow/python/kernel_tests/signal/BUILD @@ -11,7 +11,7 @@ exports_files(["LICENSE"]) py_library( name = "test_util", srcs = ["test_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/core:protos_all_py", "//tensorflow/lite/python:interpreter", diff --git a/tensorflow/python/lib/io/BUILD b/tensorflow/python/lib/io/BUILD index 71c35f2a12b..f6e4984e997 100644 --- a/tensorflow/python/lib/io/BUILD +++ b/tensorflow/python/lib/io/BUILD @@ -47,7 +47,7 @@ py_library( "python_io.py", "tf_record.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":_pywrap_file_io", ":_pywrap_record_io", diff --git a/tensorflow/python/module/BUILD b/tensorflow/python/module/BUILD index 1bae3ce21a1..95a5b743abb 100644 --- a/tensorflow/python/module/BUILD +++ b/tensorflow/python/module/BUILD @@ -10,6 +10,7 @@ exports_files(["LICENSE"]) py_library( name = "module", srcs = ["module.py"], + srcs_version = "PY3", deps = [ "//tensorflow/python:framework_ops", "//tensorflow/python:tf2", diff --git a/tensorflow/python/ops/distributions/BUILD b/tensorflow/python/ops/distributions/BUILD index 53b48827907..19ee2cc3333 100644 --- a/tensorflow/python/ops/distributions/BUILD +++ b/tensorflow/python/ops/distributions/BUILD @@ -16,7 +16,7 @@ py_library( "will not receive new features, and will be removed by " + "early 2019. You should update all usage of " + "`tf.distributions` to `tfp.distributions`."), - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":util", "//tensorflow/python:array_ops", @@ -38,7 +38,7 @@ py_library( py_library( name = "util", srcs = ["util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:check_ops", diff --git a/tensorflow/python/ops/linalg/BUILD b/tensorflow/python/ops/linalg/BUILD index fc5e71cad41..32c6e52d6dc 100644 --- a/tensorflow/python/ops/linalg/BUILD +++ b/tensorflow/python/ops/linalg/BUILD @@ -6,7 +6,7 @@ package( py_library( name = "linalg", srcs = glob(["*.py"]), - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":linalg_impl", "//tensorflow/python:check_ops", @@ -26,7 +26,7 @@ py_library( py_library( name = "linalg_impl", srcs = ["linalg_impl.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":linear_operator_util", "//tensorflow/python:array_ops", @@ -40,7 +40,7 @@ py_library( py_library( name = "linear_operator_util", srcs = ["linear_operator_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:check_ops", diff --git a/tensorflow/python/ops/linalg/sparse/BUILD b/tensorflow/python/ops/linalg/sparse/BUILD index 86b85c76319..8ebfe510600 100644 --- a/tensorflow/python/ops/linalg/sparse/BUILD +++ b/tensorflow/python/ops/linalg/sparse/BUILD @@ -27,7 +27,7 @@ py_library( "sparse_csr_matrix_grad.py", "sparse_csr_matrix_ops.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":gen_sparse_csr_matrix_ops", "//third_party/py/numpy", diff --git a/tensorflow/python/ops/losses/BUILD b/tensorflow/python/ops/losses/BUILD index 87992adfe5e..853aa69ac25 100644 --- a/tensorflow/python/ops/losses/BUILD +++ b/tensorflow/python/ops/losses/BUILD @@ -16,7 +16,7 @@ py_library( "losses_impl.py", "util.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:confusion_matrix", diff --git a/tensorflow/python/ops/numpy_ops/BUILD b/tensorflow/python/ops/numpy_ops/BUILD index 96eb5509de3..8b742f68c02 100644 --- a/tensorflow/python/ops/numpy_ops/BUILD +++ b/tensorflow/python/ops/numpy_ops/BUILD @@ -19,7 +19,7 @@ py_library( "np_random.py", "np_utils.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/python:array_ops", diff --git a/tensorflow/python/ops/numpy_ops/integration_test/benchmarks/BUILD b/tensorflow/python/ops/numpy_ops/integration_test/benchmarks/BUILD index 012e1fbfcf3..ee4c01b3cff 100644 --- a/tensorflow/python/ops/numpy_ops/integration_test/benchmarks/BUILD +++ b/tensorflow/python/ops/numpy_ops/integration_test/benchmarks/BUILD @@ -27,6 +27,7 @@ py_binary( py_library( name = "numpy_mlp", srcs = ["numpy_mlp.py"], + srcs_version = "PY3", deps = [ "//third_party/py/numpy", ], @@ -35,6 +36,7 @@ py_library( py_library( name = "tf_numpy_mlp", srcs = ["tf_numpy_mlp.py"], + srcs_version = "PY3", deps = [ "//tensorflow:tensorflow_py", "//tensorflow/python/ops/numpy_ops:numpy", diff --git a/tensorflow/python/ops/parallel_for/BUILD b/tensorflow/python/ops/parallel_for/BUILD index 9208073d946..b43ec2b1808 100644 --- a/tensorflow/python/ops/parallel_for/BUILD +++ b/tensorflow/python/ops/parallel_for/BUILD @@ -16,7 +16,7 @@ py_library( "pfor.py", "test_util.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":control_flow_ops", ":gradients", @@ -50,7 +50,7 @@ py_library( py_library( name = "pfor_lib", srcs = ["pfor.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/compiler/tf2xla/python:xla", "//tensorflow/python:array_ops", @@ -76,7 +76,7 @@ py_library( py_library( name = "control_flow_ops", srcs = ["control_flow_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":pfor_lib", @@ -98,7 +98,7 @@ py_library( py_library( name = "test_util", srcs = ["test_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":pfor_lib", "//tensorflow/python:client_testlib", @@ -189,7 +189,7 @@ cuda_py_test( py_library( name = "gradients", srcs = ["gradients.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":control_flow_ops", "//tensorflow/python:array_ops", diff --git a/tensorflow/python/ops/ragged/BUILD b/tensorflow/python/ops/ragged/BUILD index d726c3b832d..55ce42496ee 100644 --- a/tensorflow/python/ops/ragged/BUILD +++ b/tensorflow/python/ops/ragged/BUILD @@ -15,7 +15,7 @@ exports_files(["LICENSE"]) py_library( name = "ragged", srcs = ["__init__.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", tags = ["nofixdeps"], deps = [ ":ragged_array_ops", @@ -47,7 +47,7 @@ py_library( py_library( name = "ragged_array_ops", srcs = ["ragged_array_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_functional_ops", ":ragged_math_ops", @@ -67,7 +67,7 @@ py_library( py_library( name = "ragged_batch_gather_ops", srcs = ["ragged_batch_gather_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_gather_ops", ":ragged_tensor", @@ -84,7 +84,7 @@ py_library( srcs = [ "ragged_batch_gather_with_default_op.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_array_ops", ":ragged_dispatch", @@ -103,7 +103,7 @@ py_library( py_library( name = "ragged_concat_ops", srcs = ["ragged_concat_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_array_ops", ":ragged_gather_ops", @@ -120,7 +120,7 @@ py_library( py_library( name = "ragged_conversion_ops", srcs = ["ragged_conversion_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_tensor", "//tensorflow/python:dtypes", @@ -130,6 +130,7 @@ py_library( py_library( name = "ragged_factory_ops", srcs = ["ragged_factory_ops.py"], + srcs_version = "PY3", deps = [ ":ragged_tensor", ":ragged_tensor_value", @@ -146,7 +147,7 @@ py_library( py_library( name = "ragged_functional_ops", srcs = ["ragged_functional_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_config", ":ragged_tensor", @@ -161,7 +162,7 @@ py_library( py_library( name = "ragged_gather_ops", srcs = ["ragged_gather_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_array_ops", ":ragged_tensor", @@ -177,7 +178,7 @@ py_library( py_library( name = "ragged_getitem", srcs = ["ragged_getitem.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_gather_ops", ":ragged_math_ops", @@ -193,7 +194,7 @@ py_library( py_library( name = "ragged_math_ops", srcs = ["ragged_math_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_functional_ops", ":ragged_tensor", @@ -214,7 +215,7 @@ py_library( py_library( name = "ragged_operators", srcs = ["ragged_operators.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_getitem", ":ragged_tensor", @@ -226,7 +227,7 @@ py_library( py_library( name = "ragged_ops", srcs = ["ragged_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_array_ops", ":ragged_batch_gather_ops", @@ -255,7 +256,7 @@ py_library( py_library( name = "ragged_string_ops", srcs = ["ragged_string_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_array_ops", ":ragged_math_ops", @@ -271,7 +272,7 @@ py_library( py_library( name = "ragged_squeeze_op", srcs = ["ragged_squeeze_op.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_tensor", ":ragged_util", @@ -287,13 +288,13 @@ py_library( py_library( name = "ragged_config", srcs = ["ragged_config.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) py_library( name = "row_partition", srcs = ["row_partition.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":segment_id_ops", "//tensorflow/python:array_ops", @@ -315,7 +316,7 @@ py_library( py_library( name = "ragged_tensor", srcs = ["ragged_tensor.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_config", ":ragged_tensor_value", @@ -345,7 +346,7 @@ py_library( py_library( name = "ragged_tensor_shape", srcs = ["ragged_tensor_shape.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_array_ops", ":ragged_config", @@ -365,7 +366,7 @@ py_library( py_library( name = "ragged_tensor_value", srcs = ["ragged_tensor_value.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", "//third_party/py/numpy", @@ -375,7 +376,7 @@ py_library( py_library( name = "ragged_util", srcs = ["ragged_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:check_ops", @@ -389,7 +390,7 @@ py_library( py_library( name = "ragged_where_op", srcs = ["ragged_where_op.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_concat_ops", ":ragged_functional_ops", @@ -404,7 +405,7 @@ py_library( py_library( name = "segment_id_ops", srcs = ["segment_id_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_util", "//tensorflow/python:array_ops", @@ -421,7 +422,7 @@ py_library( py_library( name = "ragged_map_ops", srcs = ["ragged_map_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_config", ":ragged_tensor", @@ -444,7 +445,7 @@ py_library( py_library( name = "ragged_dispatch", srcs = ["ragged_dispatch.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ragged_array_ops", ":ragged_batch_gather_ops", @@ -474,7 +475,7 @@ py_library( py_library( name = "ragged_tensor_test_ops", srcs = ["ragged_tensor_test_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:bitwise_ops", diff --git a/tensorflow/python/ops/risc/BUILD b/tensorflow/python/ops/risc/BUILD index 458798e1ece..376edae5d8b 100644 --- a/tensorflow/python/ops/risc/BUILD +++ b/tensorflow/python/ops/risc/BUILD @@ -6,7 +6,7 @@ package( py_library( name = "risc_grad", srcs = ["risc_grad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:framework_ops", ], @@ -15,7 +15,7 @@ py_library( py_library( name = "risc_ops", srcs = ["risc_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:risc_ops_gen", ], diff --git a/tensorflow/python/ops/signal/BUILD b/tensorflow/python/ops/signal/BUILD index 9d0fe3a54b2..50c4a0b7e28 100644 --- a/tensorflow/python/ops/signal/BUILD +++ b/tensorflow/python/ops/signal/BUILD @@ -19,7 +19,7 @@ py_library( "util_ops.py", "window_ops.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:constant_op", diff --git a/tensorflow/python/ops/structured/BUILD b/tensorflow/python/ops/structured/BUILD index 81e8b37dc7d..fe8efec86ce 100644 --- a/tensorflow/python/ops/structured/BUILD +++ b/tensorflow/python/ops/structured/BUILD @@ -15,7 +15,7 @@ exports_files(["LICENSE"]) py_library( name = "structured", srcs = ["__init__.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", tags = ["nofixdeps"], deps = [ ":structured_array_ops", @@ -29,6 +29,7 @@ py_library( "structured_array_ops.py", "structured_tensor.py", ], + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:check_ops", @@ -54,6 +55,7 @@ py_library( srcs = [ "structured_array_ops.py", ], + srcs_version = "PY3", deps = [ ":structured_tensor", "//tensorflow/python:array_ops", diff --git a/tensorflow/python/platform/BUILD b/tensorflow/python/platform/BUILD index 85484f591a0..108f7355679 100644 --- a/tensorflow/python/platform/BUILD +++ b/tensorflow/python/platform/BUILD @@ -30,6 +30,7 @@ tf_py_build_info_genrule( py_library( name = "build_info", srcs = ["build_info.py"], + srcs_version = "PY3", ) py_library( @@ -45,7 +46,7 @@ py_library( "device_context.py", # In platform_device_context. ], ) + ["build_info.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":build_info", "//tensorflow/core:protos_all_py", @@ -62,7 +63,7 @@ py_library( py_library( name = "benchmark", srcs = ["benchmark.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":platform", "//tensorflow/python:client", @@ -73,13 +74,13 @@ py_library( py_library( name = "analytics", srcs = ["analytics.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) py_library( name = "device_context", srcs = ["device_context.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:control_flow_ops", "//tensorflow/python:framework", @@ -89,7 +90,7 @@ py_library( py_library( name = "test", srcs = ["googletest.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":benchmark", "@absl_py//absl/testing:absltest", @@ -184,7 +185,7 @@ tf_python_pybind_extension( py_library( name = "client_testlib", srcs = ["test.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":test", "//tensorflow/python:client", diff --git a/tensorflow/python/profiler/BUILD b/tensorflow/python/profiler/BUILD index 42e542c1e3a..89ae0432a85 100644 --- a/tensorflow/python/profiler/BUILD +++ b/tensorflow/python/profiler/BUILD @@ -9,7 +9,7 @@ package( py_library( name = "profiler", srcs = ["profiler.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":model_analyzer", @@ -23,7 +23,7 @@ py_library( py_library( name = "profiler_client", srcs = ["profiler_client.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:c_api_util", "//tensorflow/python:util", @@ -45,7 +45,7 @@ cuda_py_test( py_library( name = "profiler_v2", srcs = ["profiler_v2.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//tensorflow:internal"], deps = [ "//tensorflow/python:errors", @@ -74,7 +74,7 @@ cuda_py_test( py_library( name = "option_builder", srcs = ["option_builder.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":tfprof_logger", ], @@ -83,7 +83,7 @@ py_library( py_library( name = "model_analyzer", srcs = ["model_analyzer.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":option_builder", ":tfprof_logger", @@ -137,7 +137,7 @@ cuda_py_test( py_library( name = "tfprof_logger", srcs = ["tfprof_logger.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/core/profiler:protos_all_py", "//tensorflow/python:framework_for_generated_wrappers", @@ -167,7 +167,7 @@ tf_py_test( py_library( name = "profile_context", srcs = ["profile_context.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":model_analyzer", ":tfprof_logger", @@ -197,7 +197,7 @@ cuda_py_test( py_library( name = "pprof_profiler", srcs = ["pprof_profiler.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = ["@com_google_pprof//:pprof_proto_py"], ) @@ -223,7 +223,7 @@ py_test( py_library( name = "trace", srcs = ["trace.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = [ "//perftools/accelerators/xprof/xprofilez/integration_tests:__pkg__", "//tensorflow:internal", @@ -237,7 +237,7 @@ py_library( py_library( name = "traceme", srcs = ["traceme.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":trace", ], diff --git a/tensorflow/python/profiler/integration_test/BUILD b/tensorflow/python/profiler/integration_test/BUILD index a7b92cd714a..3ef48a50afb 100644 --- a/tensorflow/python/profiler/integration_test/BUILD +++ b/tensorflow/python/profiler/integration_test/BUILD @@ -8,6 +8,7 @@ package( py_library( name = "mnist_testing_utils", srcs = ["mnist_testing_utils.py"], + srcs_version = "PY3", deps = [ "//tensorflow:tensorflow_py", "//tensorflow/python:extra_py_tests_deps", diff --git a/tensorflow/python/profiler/internal/BUILD b/tensorflow/python/profiler/internal/BUILD index aa71ad47744..a4fa497c204 100644 --- a/tensorflow/python/profiler/internal/BUILD +++ b/tensorflow/python/profiler/internal/BUILD @@ -12,7 +12,7 @@ package( py_library( name = "flops_registry", srcs = ["flops_registry.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:framework_ops", "//tensorflow/python:graph_util", @@ -22,7 +22,7 @@ py_library( py_library( name = "model_analyzer_testlib", srcs = ["model_analyzer_testlib.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/python:array_ops", diff --git a/tensorflow/python/saved_model/BUILD b/tensorflow/python/saved_model/BUILD index 0de43370259..a3941cb63dc 100644 --- a/tensorflow/python/saved_model/BUILD +++ b/tensorflow/python/saved_model/BUILD @@ -386,7 +386,7 @@ py_library( srcs = [ "load.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":function_deserialization", ":load_options", diff --git a/tensorflow/python/tf_program/BUILD b/tensorflow/python/tf_program/BUILD index 9dfb0df8a24..b70ad30260c 100644 --- a/tensorflow/python/tf_program/BUILD +++ b/tensorflow/python/tf_program/BUILD @@ -3,6 +3,7 @@ package(licenses = ["notice"]) py_library( name = "pywrap_tfd", srcs = ["pywrap_tfd.py"], + srcs_version = "PY3", deps = [ "//tensorflow/compiler/mlir/python/mlir_wrapper", ], @@ -11,6 +12,7 @@ py_library( py_library( name = "mlir_gen", srcs = ["mlir_gen.py"], + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":pywrap_tfd", diff --git a/tensorflow/python/tools/BUILD b/tensorflow/python/tools/BUILD index ba8d623c4b7..e25212fbd7f 100644 --- a/tensorflow/python/tools/BUILD +++ b/tensorflow/python/tools/BUILD @@ -25,6 +25,7 @@ py_library( # Include the TF upgrade script to users can run it directly after install TF "//tensorflow/tools/compatibility:tf_upgrade_v2", ], + srcs_version = "PY3", deps = [ ":saved_model_aot_compile", ":saved_model_utils", @@ -41,7 +42,7 @@ py_library( py_library( name = "saved_model_utils", srcs = ["saved_model_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) py_test( @@ -62,7 +63,7 @@ py_test( py_library( name = "freeze_graph_lib", srcs = ["freeze_graph.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":saved_model_utils", "//tensorflow/core:protos_all_py", @@ -90,7 +91,7 @@ py_binary( py_library( name = "freeze_graph_main_lib", srcs = ["freeze_graph.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":freeze_graph_lib", ], @@ -107,7 +108,7 @@ py_binary( py_library( name = "import_pb_to_tensorboard_lib", srcs = ["import_pb_to_tensorboard.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/core:protos_all_py", "//tensorflow/python", @@ -151,7 +152,7 @@ py_binary( py_library( name = "inspect_checkpoint_lib", srcs = ["inspect_checkpoint.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python", # TODO(b/34059704): remove when fixed "//tensorflow/python:platform", @@ -162,7 +163,7 @@ py_library( py_library( name = "strip_unused_lib", srcs = ["strip_unused_lib.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/core:protos_all_py", "//tensorflow/python:framework", @@ -173,7 +174,7 @@ py_library( py_library( name = "module_util", srcs = ["module_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) py_binary( @@ -211,7 +212,7 @@ py_test( py_library( name = "optimize_for_inference_lib", srcs = ["optimize_for_inference_lib.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":strip_unused_lib", "//tensorflow/core:protos_all_py", @@ -234,7 +235,7 @@ py_binary( py_library( name = "optimize_for_inference_main_lib", srcs = ["optimize_for_inference.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":optimize_for_inference_lib", "//tensorflow/core:protos_all_py", @@ -270,7 +271,7 @@ py_test( py_library( name = "selective_registration_header_lib", srcs = ["selective_registration_header_lib.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/python", # TODO(b/34059704): remove when fixed @@ -291,7 +292,7 @@ py_binary( py_library( name = "print_selective_registration_header_lib", srcs = ["print_selective_registration_header.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":selective_registration_header_lib", @@ -322,7 +323,7 @@ py_binary( py_library( name = "saved_model_cli_lib", srcs = ["saved_model_cli.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ # Note: if you make any changes here, make corresponding changes to the # deps of the "tools_pip" target in this file. Otherwise release builds @@ -338,7 +339,7 @@ py_library( py_library( name = "saved_model_aot_compile", srcs = ["saved_model_aot_compile.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python", "//tensorflow/python:tf_optimizer", diff --git a/tensorflow/python/tools/api/generator/BUILD b/tensorflow/python/tools/api/generator/BUILD index a65b629af71..f9e235a6735 100644 --- a/tensorflow/python/tools/api/generator/BUILD +++ b/tensorflow/python/tools/api/generator/BUILD @@ -19,7 +19,7 @@ exports_files( py_library( name = "create_python_api", srcs = ["//tensorflow/python/tools/api/generator:create_python_api.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/python:util", @@ -31,7 +31,7 @@ py_library( py_library( name = "doc_srcs", srcs = ["doc_srcs.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/python:util", diff --git a/tensorflow/python/tpu/BUILD b/tensorflow/python/tpu/BUILD index 44838e6b05c..805f65a9b48 100644 --- a/tensorflow/python/tpu/BUILD +++ b/tensorflow/python/tpu/BUILD @@ -122,7 +122,7 @@ py_library( "tpu_estimator.py", "util.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":async_checkpoint", ":feature_column", @@ -155,7 +155,7 @@ py_library( py_library( name = "functional", srcs = ["functional.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = [ "//visibility:public", ], @@ -180,7 +180,7 @@ py_library( srcs = [ "__init__.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":feature_column", ":feature_column_v2", @@ -196,7 +196,7 @@ py_library( "__init__.py", "api.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":feature_column", ":feature_column_v2", @@ -476,6 +476,7 @@ pytype_library( py_library( name = "tpu_name_util", srcs = ["tpu_name_util.py"], + srcs_version = "PY3", deps = [ "//tensorflow/python/util:tf_export", ], @@ -697,6 +698,7 @@ tpu_py_test( # NOTE this target should only be depended on by the tpu_test_wrapper macro. py_library( name = "tpu_test_deps", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = ["//tensorflow/python:client_testlib"], ) diff --git a/tensorflow/python/tpu/client/BUILD b/tensorflow/python/tpu/client/BUILD index dc94bffb64e..049d0cb6184 100644 --- a/tensorflow/python/tpu/client/BUILD +++ b/tensorflow/python/tpu/client/BUILD @@ -15,7 +15,7 @@ py_library( "client.py", "version.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "@six_archive//:six", ], @@ -26,7 +26,7 @@ py_library( srcs = [ "__init__.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":client", "@six_archive//:six", diff --git a/tensorflow/python/tpu/experimental/BUILD b/tensorflow/python/tpu/experimental/BUILD index 1c95e9f9219..a68011a919e 100644 --- a/tensorflow/python/tpu/experimental/BUILD +++ b/tensorflow/python/tpu/experimental/BUILD @@ -10,7 +10,7 @@ py_library( srcs = [ "__init__.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python/tpu:tpu_strategy_util", ], diff --git a/tensorflow/python/tpu/profiler/BUILD b/tensorflow/python/tpu/profiler/BUILD index 84ffb4234c0..b168d7714bf 100644 --- a/tensorflow/python/tpu/profiler/BUILD +++ b/tensorflow/python/tpu/profiler/BUILD @@ -8,7 +8,7 @@ package( py_library( name = "profiler", srcs = ["__init__.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":profiler_analysis_pb2_grpc", "//tensorflow/core/profiler:profiler_analysis_proto_py", @@ -20,7 +20,7 @@ py_library( py_library( name = "profiler_analysis_pb2_grpc", srcs = ["profiler_analysis_pb2_grpc.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = ["//tensorflow/core/profiler:profiler_analysis_proto_py"], ) @@ -31,7 +31,7 @@ py_library( "capture_tpu_profile.py", "version.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:client", "//tensorflow/python:errors", diff --git a/tensorflow/python/training/BUILD b/tensorflow/python/training/BUILD index bee08640828..de4fed7ea07 100644 --- a/tensorflow/python/training/BUILD +++ b/tensorflow/python/training/BUILD @@ -76,7 +76,7 @@ py_library( "training.py", ":deprecated_inclusions_in_training_lib", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":adadelta", ":adagrad", @@ -121,7 +121,7 @@ py_library( py_library( name = "training", - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":training_lib", "//tensorflow/python/training/tracking:base", @@ -133,7 +133,7 @@ py_library( py_library( name = "adadelta", srcs = ["adadelta.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":optimizer", ":training_ops", @@ -146,7 +146,7 @@ py_library( py_library( name = "adagrad_da", srcs = ["adagrad_da.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":optimizer", ":training_ops", @@ -161,7 +161,7 @@ py_library( py_library( name = "adagrad", srcs = ["adagrad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":optimizer", ":training_ops", @@ -177,7 +177,7 @@ py_library( py_library( name = "adam", srcs = ["adam.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":optimizer", ":training_ops", @@ -194,7 +194,7 @@ py_library( py_library( name = "basic_loops", srcs = ["basic_loops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:errors", "//tensorflow/python/util:tf_export", @@ -204,7 +204,7 @@ py_library( py_library( name = "checkpoint_ops", srcs = ["checkpoint_ops.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:checkpoint_ops_gen", @@ -218,7 +218,7 @@ py_library( py_library( name = "checkpoint_utils", srcs = ["checkpoint_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":checkpoint_management", ":py_checkpoint_reader", @@ -238,7 +238,7 @@ py_library( py_library( name = "coordinator", srcs = ["coordinator.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:errors", "//tensorflow/python:platform", @@ -251,7 +251,7 @@ py_library( py_library( name = "device_setter", srcs = ["device_setter.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":server_lib", "//tensorflow/python:device", @@ -264,14 +264,14 @@ py_library( py_library( name = "distribution_strategy_context", srcs = ["distribution_strategy_context.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = ["//tensorflow/python/distribute:distribute_lib"], ) py_library( name = "evaluation", srcs = ["evaluation.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":basic_session_run_hooks", ":monitored_session", @@ -290,7 +290,7 @@ py_library( py_library( name = "ftrl", srcs = ["ftrl.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":optimizer", ":training_ops", @@ -304,7 +304,7 @@ py_library( py_library( name = "gradient_descent", srcs = ["gradient_descent.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":optimizer", ":training_ops", @@ -318,7 +318,7 @@ py_library( py_library( name = "input", srcs = ["input.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":queue_runner", "//tensorflow/python:array_ops", @@ -346,7 +346,7 @@ py_library( py_library( name = "momentum", srcs = ["momentum.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":optimizer", ":training_ops", @@ -359,7 +359,7 @@ py_library( py_library( name = "moving_averages", srcs = ["moving_averages.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":slot_creator", "//tensorflow/python:control_flow_ops", @@ -379,7 +379,7 @@ py_library( py_library( name = "optimizer", srcs = ["optimizer.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":slot_creator", "//tensorflow/python:array_ops", @@ -406,7 +406,7 @@ py_library( py_library( name = "proximal_adagrad", srcs = ["proximal_adagrad.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":optimizer", ":training_ops", @@ -420,7 +420,7 @@ py_library( py_library( name = "proximal_gradient_descent", srcs = ["proximal_gradient_descent.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":optimizer", ":training_ops", @@ -433,7 +433,7 @@ py_library( py_library( name = "quantize_training", srcs = ["quantize_training.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:_pywrap_quantize_training", "//tensorflow/python:util", @@ -444,7 +444,7 @@ py_library( py_library( name = "queue_runner_impl", srcs = ["queue_runner_impl.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:errors", "//tensorflow/python:framework_ops", @@ -459,14 +459,14 @@ py_library( py_library( name = "queue_runner", srcs = ["queue_runner.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [":queue_runner_impl"], ) py_library( name = "rmsprop", srcs = ["rmsprop.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":optimizer", ":training_ops", @@ -481,7 +481,7 @@ py_library( py_library( name = "session_manager", srcs = ["session_manager.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":checkpoint_management", "//tensorflow/python:errors", @@ -497,7 +497,7 @@ py_library( py_library( name = "slot_creator", srcs = ["slot_creator.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/compiler/xla/experimental/xla_sharding", "//tensorflow/python:array_ops", @@ -512,7 +512,7 @@ py_library( py_library( name = "summary_io", srcs = ["summary_io.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", ], @@ -521,7 +521,7 @@ py_library( py_library( name = "sync_replicas_optimizer", srcs = ["sync_replicas_optimizer.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":optimizer", ":queue_runner", @@ -544,7 +544,7 @@ py_library( py_library( name = "tensorboard_logging", srcs = ["tensorboard_logging.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:platform", ], @@ -556,7 +556,7 @@ py_library( "gen_training_ops.py", "training_ops.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:training_ops_gen", ], @@ -565,7 +565,7 @@ py_library( py_library( name = "warm_starting_util", srcs = ["warm_starting_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":checkpoint_ops", ":checkpoint_utils", @@ -588,7 +588,7 @@ py_library( "distribute.py", "distribution_strategy_context.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python/distribute:distribute_lib", ], @@ -795,6 +795,7 @@ tf_py_test( py_library( name = "py_checkpoint_reader", srcs = ["py_checkpoint_reader.py"], + srcs_version = "PY3", deps = [ "//tensorflow/python:dtypes", "//tensorflow/python:errors", @@ -813,6 +814,7 @@ tf_proto_library( py_library( name = "checkpoint_management", srcs = ["checkpoint_management.py"], + srcs_version = "PY3", deps = [ ":training_util", "//tensorflow/python:errors", @@ -851,7 +853,7 @@ cuda_py_test( py_library( name = "saver", srcs = ["saver.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":checkpoint_management", ":py_checkpoint_reader", @@ -882,7 +884,7 @@ py_library( py_library( name = "saver_test_utils", srcs = ["saver_test_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":saver", "//tensorflow/python:dtypes", @@ -985,7 +987,7 @@ tf_py_test( py_library( name = "basic_session_run_hooks", srcs = ["basic_session_run_hooks.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":session_run_hook", ":summary_io", @@ -1007,13 +1009,14 @@ py_library( py_library( name = "session_run_hook", srcs = ["session_run_hook.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = ["//tensorflow/python/util:tf_export"], ) py_library( name = "supervisor", srcs = ["supervisor.py"], + srcs_version = "PY3", deps = [ ":coordinator", ":saver", @@ -1062,7 +1065,7 @@ tf_py_test( py_library( name = "server_lib", srcs = ["server_lib.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:errors", "//tensorflow/python:pywrap_tf_session", @@ -1074,7 +1077,7 @@ py_library( py_library( name = "training_util", srcs = ["training_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:dtypes", "//tensorflow/python:framework", @@ -1336,7 +1339,7 @@ tf_py_test( py_library( name = "monitored_session", srcs = ["monitored_session.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":basic_session_run_hooks", ":coordinator", diff --git a/tensorflow/python/training/experimental/BUILD b/tensorflow/python/training/experimental/BUILD index 239ea2bd608..0355537c739 100644 --- a/tensorflow/python/training/experimental/BUILD +++ b/tensorflow/python/training/experimental/BUILD @@ -9,7 +9,7 @@ package( py_library( name = "loss_scale", srcs = ["loss_scale.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:control_flow_ops", "//tensorflow/python:dtypes", @@ -30,7 +30,7 @@ py_library( py_library( name = "loss_scale_optimizer", srcs = ["loss_scale_optimizer.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":loss_scale", "//tensorflow/python:control_flow_ops", @@ -86,13 +86,13 @@ py_test( py_library( name = "mixed_precision_global_state", srcs = ["mixed_precision_global_state.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) py_library( name = "mixed_precision", srcs = ["mixed_precision.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":loss_scale", ":loss_scale_optimizer", @@ -117,7 +117,7 @@ cuda_py_test( py_library( name = "loss_scaling_gradient_tape", srcs = ["loss_scaling_gradient_tape.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":loss_scale", "//tensorflow/python:array_ops", diff --git a/tensorflow/python/training/saving/BUILD b/tensorflow/python/training/saving/BUILD index 1edad746341..fb2d20f46e9 100644 --- a/tensorflow/python/training/saving/BUILD +++ b/tensorflow/python/training/saving/BUILD @@ -15,6 +15,7 @@ exports_files(["LICENSE"]) py_library( name = "checkpoint_options", srcs = ["checkpoint_options.py"], + srcs_version = "PY3", deps = [ "//tensorflow/python/util:tf_export", ], @@ -23,7 +24,7 @@ py_library( py_library( name = "functional_saver", srcs = ["functional_saver.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":checkpoint_options", ":saveable_hook", @@ -55,12 +56,13 @@ cuda_py_test( py_library( name = "saveable_object", srcs = ["saveable_object.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) py_library( name = "saveable_hook", srcs = ["saveable_hook.py"], + srcs_version = "PY3", deps = [ "//tensorflow/python:constant_op", "//tensorflow/python/training/tracking:base", @@ -70,7 +72,7 @@ py_library( py_library( name = "saveable_object_util", srcs = ["saveable_object_util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:resource_variable_ops", "//tensorflow/python:variables", diff --git a/tensorflow/python/training/tracking/BUILD b/tensorflow/python/training/tracking/BUILD index 370b78c84f5..37f56718a7c 100644 --- a/tensorflow/python/training/tracking/BUILD +++ b/tensorflow/python/training/tracking/BUILD @@ -19,7 +19,7 @@ exports_files(["LICENSE"]) py_library( name = "base", srcs = ["base.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:array_ops", "//tensorflow/python:constant_op", @@ -47,7 +47,7 @@ tf_py_test( py_library( name = "tracking", srcs = ["tracking.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":base", ":data_structures", @@ -67,13 +67,13 @@ tf_py_test( py_library( name = "layer_utils", srcs = ["layer_utils.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) py_library( name = "data_structures", srcs = ["data_structures.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":base", ":layer_utils", @@ -103,7 +103,7 @@ tf_py_test( py_library( name = "graph_view", srcs = ["graph_view.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":base", ":tracking", @@ -119,7 +119,7 @@ py_library( py_library( name = "util", srcs = ["util.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":base", ":data_structures", @@ -219,7 +219,7 @@ tf_py_test( py_library( name = "python_state", srcs = ["python_state.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":base", ], diff --git a/tensorflow/python/util/BUILD b/tensorflow/python/util/BUILD index 6726a1c09e5..5ea6d43ea3e 100644 --- a/tensorflow/python/util/BUILD +++ b/tensorflow/python/util/BUILD @@ -414,7 +414,7 @@ py_library( ], ), compatible_with = get_compatible_with_portable(), - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = visibility + [ "//tensorflow:__pkg__", "//third_party/py/tensorflow_core:__subpackages__", @@ -460,6 +460,7 @@ py_library( name = "nest_test_main_lib", testonly = True, srcs = ["nest_test.py"], + srcs_version = "PY3", deps = [ ":util", "//tensorflow/python:array_ops", @@ -519,7 +520,7 @@ tf_py_test( py_library( name = "tf_should_use", srcs = ["tf_should_use.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":util", "//tensorflow/python:framework_ops", @@ -553,7 +554,7 @@ tf_py_test( py_library( name = "example_parser_configuration", srcs = ["example_parser_configuration.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ "//tensorflow/core:protos_all_py", diff --git a/tensorflow/tools/api/lib/BUILD b/tensorflow/tools/api/lib/BUILD index 47161ee537d..94919d8c3f7 100644 --- a/tensorflow/tools/api/lib/BUILD +++ b/tensorflow/tools/api/lib/BUILD @@ -18,7 +18,7 @@ tf_proto_library( py_library( name = "python_object_to_proto_visitor", srcs = ["python_object_to_proto_visitor.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":api_objects_proto_py", "//tensorflow/python:platform", diff --git a/tensorflow/tools/common/BUILD b/tensorflow/tools/common/BUILD index c5d53f6d00d..c7c57093a2a 100644 --- a/tensorflow/tools/common/BUILD +++ b/tensorflow/tools/common/BUILD @@ -11,7 +11,7 @@ package( py_library( name = "public_api", srcs = ["public_api.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", "@six_archive//:six", @@ -32,7 +32,7 @@ py_test( py_library( name = "traverse", srcs = ["traverse.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:util", "@six_archive//:six", @@ -55,7 +55,7 @@ py_test( py_library( name = "test_module1", srcs = ["test_module1.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":test_module2", ], @@ -64,5 +64,5 @@ py_library( py_library( name = "test_module2", srcs = ["test_module2.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) diff --git a/tensorflow/tools/compatibility/BUILD b/tensorflow/tools/compatibility/BUILD index 238b6909324..16bd1f8ff28 100644 --- a/tensorflow/tools/compatibility/BUILD +++ b/tensorflow/tools/compatibility/BUILD @@ -14,14 +14,14 @@ package( py_library( name = "ipynb", srcs = ["ipynb.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = ["@six_archive//:six"], ) py_library( name = "ast_edits", srcs = ["ast_edits.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "@pasta", "@six_archive//:six", @@ -55,7 +55,7 @@ py_binary( py_library( name = "tf_upgrade_lib", srcs = ["tf_upgrade.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":ast_edits", "@six_archive//:six", @@ -82,20 +82,20 @@ py_library( name = "renames_v2", srcs = ["renames_v2.py"], compatible_with = get_compatible_with_portable(), - srcs_version = "PY2AND3", + srcs_version = "PY3", ) py_library( name = "reorders_v2", srcs = ["reorders_v2.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", ) py_library( name = "all_renames_v2", srcs = ["all_renames_v2.py"], compatible_with = get_compatible_with_portable(), - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = [ "//tensorflow:__pkg__", "//tensorflow:__subpackages__", @@ -119,14 +119,14 @@ py_test( py_library( name = "module_deprecations_v2", srcs = ["module_deprecations_v2.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [":ast_edits"], ) py_library( name = "tf_upgrade_v2_lib", srcs = ["tf_upgrade_v2.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":all_renames_v2", ":ast_edits", @@ -139,7 +139,7 @@ py_library( py_library( name = "tf_upgrade_v2_safety_lib", srcs = ["tf_upgrade_v2_safety.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":all_renames_v2", ":ast_edits", diff --git a/tensorflow/tools/docs/BUILD b/tensorflow/tools/docs/BUILD index 6d74df38b45..b51618c3ec9 100644 --- a/tensorflow/tools/docs/BUILD +++ b/tensorflow/tools/docs/BUILD @@ -32,7 +32,7 @@ distribute_module = [ py_library( name = "tf_doctest_lib", srcs = ["tf_doctest_lib.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//third_party/py/numpy", ], @@ -132,7 +132,7 @@ py_library( name = "doc_controls", srcs = ["doc_controls.py"], compatible_with = get_compatible_with_portable(), - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], ) diff --git a/tensorflow/tools/graph_transforms/BUILD b/tensorflow/tools/graph_transforms/BUILD index 3aeaf86f139..9a331e2eea9 100644 --- a/tensorflow/tools/graph_transforms/BUILD +++ b/tensorflow/tools/graph_transforms/BUILD @@ -334,7 +334,7 @@ tf_cc_binary( py_library( name = "transform_graph_py", srcs = ["__init__.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/core:protos_all_py", "//tensorflow/python:errors", diff --git a/tensorflow/tools/tensorflow_builder/compat_checker/BUILD b/tensorflow/tools/tensorflow_builder/compat_checker/BUILD index d2119dd1e63..c496e286275 100644 --- a/tensorflow/tools/tensorflow_builder/compat_checker/BUILD +++ b/tensorflow/tools/tensorflow_builder/compat_checker/BUILD @@ -18,7 +18,7 @@ licenses(["notice"]) # Apache 2.0 py_library( name = "compat_checker", srcs = ["compat_checker.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow/python:platform", "//tensorflow/python:util", diff --git a/tensorflow/tools/test/BUILD b/tensorflow/tools/test/BUILD index f314dcfff11..2681feec529 100644 --- a/tensorflow/tools/test/BUILD +++ b/tensorflow/tools/test/BUILD @@ -20,7 +20,7 @@ py_library( "gpu_info_lib.py", "system_info_lib.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ "//tensorflow:tensorflow_py", "//tensorflow/core:protos_all_py", @@ -47,7 +47,7 @@ py_library( srcs = [ "run_and_gather_logs_lib.py", ], - srcs_version = "PY2AND3", + srcs_version = "PY3", deps = [ ":system_info_lib", "//tensorflow/core:protos_all_py", @@ -71,7 +71,7 @@ py_binary( py_library( name = "run_and_gather_logs_main_lib", srcs = ["run_and_gather_logs.py"], - srcs_version = "PY2AND3", + srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ ":run_and_gather_logs_lib",