Prepare Keras for OSS build/test.

1. Update deps for third_party/py/tensorflow to :tensorflow_no_contrib for easier copybara rewrite.
2. Update visibility for benchmark test.
3. Update dependency for integration_test and tests under keras.
4. Move all the OSS required build dependency to a separate BUILD file.
5. Update requirements.txt for OSS Keras build.

PiperOrigin-RevId: 345249693
Change-Id: Idafd28758013719e12e30fb780a71f5202c8ad0a
This commit is contained in:
Scott Zhu 2020-12-02 09:36:53 -08:00 committed by TensorFlower Gardener
parent efbf1b457a
commit de8ce88945
4 changed files with 16 additions and 102 deletions
tensorflow/python/keras
BUILD
benchmarks/layer_benchmarks
integration_test
tests

View File

@ -648,83 +648,3 @@ tf_py_test(
"@absl_py//absl/testing:parameterized",
],
)
py_library(
name = "expect_absl_installed",
# This is a dummy rule used as a absl dependency in open-source.
# We expect absl to already be installed on the system, e.g. via
# `pip install absl`
visibility = ["//visibility:public"],
)
py_library(
name = "expect_h5py_installed",
# This is a dummy rule used as a h5 dependency in open-source.
# We expect h5py to already be installed on the system, e.g. via
# `pip install h5py'
visibility = ["//visibility:public"],
)
py_library(
name = "expect_keras_preprocessing_installed",
# This is a dummy rule used as a keras_preprocessing dependency in open-source.
# We expect keras_preprocessing to already be installed on the system, e.g. via
# `pip install keras_preprocessing`
visibility = ["//visibility:public"],
)
py_library(
name = "expect_numpy_installed",
# This is a dummy rule used as a numpy dependency in open-source.
# We expect numpy to already be installed on the system, e.g. via
# `pip install numpy`
visibility = ["//visibility:public"],
)
py_library(
name = "expect_pandas_installed",
# This is a dummy rule used as a pandas dependency in open-source.
# We expect pandas to already be installed on the system, e.g. via
# `pip install pandas'
visibility = ["//visibility:public"],
)
py_library(
name = "expect_pydot_installed",
# This is a dummy rule used as a pydot dependency in open-source.
# We expect pydot to already be installed on the system, e.g. via
# `pip install pydot'
visibility = ["//visibility:public"],
)
py_library(
name = "expect_scipy_installed",
# This is a dummy rule used as a scipy dependency in open-source.
# We expect scipy to already be installed on the system, e.g. via
# `pip install scipy'
visibility = ["//visibility:public"],
)
py_library(
name = "expect_six_installed",
# This is a dummy rule used as a six dependency in open-source.
# We expect six to already be installed on the system, e.g. via
# `pip install six`
visibility = ["//visibility:public"],
)
py_library(
name = "expect_tensorflow_installed",
# This is a dummy rule used as a tensorflow dependency in open-source.
# We expect tensorflow to already be installed on the system, e.g. via
# `pip install tensorflow` or `pip install tensorflow_gpu`
visibility = ["//visibility:public"],
)
py_library(
name = "expect_yaml_installed",
# This is a dummy rule used as a yaml dependency in open-source.
# We expect yaml to already be installed on the system, e.g. via
# `pip install yaml`
visibility = ["//visibility:public"],
)

View File

@ -40,13 +40,13 @@ BECHMARK_TAGS = [
py_library(
name = "run_xprof",
srcs = ["run_xprof.py"],
visibility = ["//tensorflow:internal"],
visibility = ["//tensorflow/python/keras:__subpackages__"],
)
py_library(
name = "layer_benchmarks_test_base",
srcs = ["layer_benchmarks_test_base.py"],
visibility = ["//tensorflow:internal"],
visibility = ["//tensorflow/python/keras:__subpackages__"],
deps = [
":run_xprof",
"//tensorflow:tensorflow_py",

View File

@ -17,8 +17,8 @@ tf_py_test(
srcs = ["forwardprop_test.py"],
python_version = "PY3",
deps = [
"//tensorflow:tensorflow_py",
"//tensorflow/python:extra_py_tests_deps",
"//tensorflow:tensorflow_py_no_contrib",
"@absl_py//absl/testing:parameterized",
],
)
@ -27,8 +27,7 @@ tf_py_test(
srcs = ["function_test.py"],
python_version = "PY3",
deps = [
"//tensorflow:tensorflow_py",
"//tensorflow/python:extra_py_tests_deps",
"//tensorflow:tensorflow_py_no_contrib",
],
)
@ -37,8 +36,7 @@ tf_py_test(
srcs = ["gradients_test.py"],
python_version = "PY3",
deps = [
"//tensorflow:tensorflow_py",
"//tensorflow/python:extra_py_tests_deps",
"//tensorflow:tensorflow_py_no_contrib",
],
)
@ -47,8 +45,8 @@ cuda_py_test(
srcs = ["saved_model_test.py"],
python_version = "PY3",
deps = [
"//tensorflow:tensorflow_py",
"//tensorflow/python:extra_py_tests_deps",
"//tensorflow:tensorflow_py_no_contrib",
"@absl_py//absl/testing:parameterized",
],
)
@ -57,8 +55,7 @@ tf_py_test(
srcs = ["legacy_rnn_test.py"],
python_version = "PY3",
deps = [
"//tensorflow:tensorflow_py",
"//tensorflow/python:extra_py_tests_deps",
"//tensorflow:tensorflow_py_no_contrib",
],
)
@ -66,8 +63,7 @@ tf_py_test(
name = "module_test",
srcs = ["module_test.py"],
deps = [
"//tensorflow:tensorflow_py",
"//tensorflow/python:extra_py_tests_deps",
"//tensorflow:tensorflow_py_no_contrib",
],
)
@ -76,8 +72,7 @@ tf_py_test(
srcs = ["vectorized_map_test.py"],
python_version = "PY3",
deps = [
"//tensorflow:tensorflow_py",
"//tensorflow/python:extra_py_tests_deps",
"//tensorflow:tensorflow_py_no_contrib",
],
)
@ -87,8 +82,7 @@ cuda_py_test(
python_version = "PY3",
tags = ["no_rocm"],
deps = [
"//tensorflow:tensorflow_py",
"//tensorflow/python:extra_py_tests_deps",
"//tensorflow:tensorflow_py_no_contrib",
],
)
@ -100,8 +94,8 @@ tpu_py_test(
python_version = "PY3",
tags = ["no_oss"],
deps = [
"//tensorflow:tensorflow_py",
"//tensorflow/python:extra_py_tests_deps",
"//tensorflow:tensorflow_py_no_contrib",
"@absl_py//absl/testing:parameterized",
],
)
@ -117,6 +111,7 @@ tf_py_test(
"notsan", # TODO(b/156029134)
],
deps = [
"//tensorflow:tensorflow_py",
"//tensorflow:tensorflow_py_no_contrib",
"@absl_py//absl/testing:parameterized",
],
)

View File

@ -390,7 +390,6 @@ tf_py_test(
python_version = "PY3",
tags = ["notsan"], # b/74395663
deps = [
"//tensorflow/compiler/tests:xla_test",
"//tensorflow/python:checkpoint_management",
"//tensorflow/python:client_testlib",
"//tensorflow/python:constant_op",