diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2017-09-30 05:26:54 -0700 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2017-09-30 05:31:17 -0700 |
| commit | dda3c5d96d1d9f44e8d365a0f536256c3406e068 (patch) | |
| tree | 9c27db3bbf9ec0d201ef6380eb6518fae8dde9f8 | |
| parent | 4b3fd5c82e69729476b9ddb247356065a89274be (diff) | |
Automated g4 rollback of changelist 170207994
PiperOrigin-RevId: 170584354
| -rw-r--r-- | configure.py | 2 | ||||
| -rw-r--r-- | tensorflow/BUILD | 6 | ||||
| -rw-r--r-- | tensorflow/core/platform/default/build_config.bzl | 5 | ||||
| -rwxr-xr-x | tensorflow/tools/ci_build/ci_parameterized_build.sh | 2 |
4 files changed, 1 insertions, 14 deletions
diff --git a/configure.py b/configure.py index 87f90d49cd..df2c74d23d 100644 --- a/configure.py +++ b/configure.py @@ -990,8 +990,6 @@ def main(): 'with_gcp_support', False, 'gcp') set_build_var(environ_cp, 'TF_NEED_HDFS', 'Hadoop File System', 'with_hdfs_support', False, 'hdfs') - set_build_var(environ_cp, 'TF_NEED_S3', 'Amazon S3 File System', - 'with_s3_support', False, 's3') set_build_var(environ_cp, 'TF_ENABLE_XLA', 'XLA JIT', 'with_xla_support', False, 'xla') set_build_var(environ_cp, 'TF_NEED_GDR', 'GDR', 'with_gdr_support', diff --git a/tensorflow/BUILD b/tensorflow/BUILD index 84e5b0575a..252362e6a5 100644 --- a/tensorflow/BUILD +++ b/tensorflow/BUILD @@ -186,12 +186,6 @@ config_setting( ) config_setting( - name = "with_s3_support", - values = {"define": "with_s3_support=true"}, - visibility = ["//visibility:public"], -) - -config_setting( name = "with_xla_support", values = {"define": "with_xla_support=true"}, visibility = ["//visibility:public"], diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl index d8b150b4d1..8a67951b24 100644 --- a/tensorflow/core/platform/default/build_config.bzl +++ b/tensorflow/core/platform/default/build_config.bzl @@ -396,11 +396,6 @@ def tf_additional_core_deps(): "//tensorflow/core/platform/hadoop:hadoop_file_system", ], "//conditions:default": [], - }) + select({ - "//tensorflow:with_s3_support": [ - "//tensorflow/contrib/s3:s3_file_system", - ], - "//conditions:default": [], }) # TODO(jart, jhseu): Delete when GCP is default on. diff --git a/tensorflow/tools/ci_build/ci_parameterized_build.sh b/tensorflow/tools/ci_build/ci_parameterized_build.sh index 9dee049e54..7a1479c150 100755 --- a/tensorflow/tools/ci_build/ci_parameterized_build.sh +++ b/tensorflow/tools/ci_build/ci_parameterized_build.sh @@ -129,7 +129,7 @@ BAZEL_CMD="bazel test" BAZEL_BUILD_ONLY_CMD="bazel build" BAZEL_CLEAN_CMD="bazel clean" -DEFAULT_BAZEL_CONFIGS="--config=gcp --config=hdfs --config=s3" +DEFAULT_BAZEL_CONFIGS="--config=gcp --config=hdfs" PIP_CMD="${CI_BUILD_DIR}/builds/pip.sh" PIP_TEST_TUTORIALS_FLAG="--test_tutorials" |