From dcea11e4b7c9bdf65ca3fd1fe9170ad2beca58fb Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Wed, 17 Nov 2021 10:09:10 -0800 Subject: [PATCH] Cleanup after making `--experimental_cc_shared_library` be a default for all builds. PiperOrigin-RevId: 410560474 Change-Id: I7650e5770d41e23766530c15d576a3f7255ffafe --- .bazelrc | 1 + tensorflow/tools/ci_build/builds/pip_new.sh | 1 - tensorflow/tools/ci_build/nightly_release/macos/cpu_py36.sh | 1 - tensorflow/tools/ci_build/nightly_release/macos/cpu_py37.sh | 1 - tensorflow/tools/ci_build/nightly_release/macos/cpu_py38.sh | 1 - tensorflow/tools/ci_build/nightly_release/macos/cpu_py39.sh | 1 - tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py310.sh | 1 - tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py37.sh | 1 - tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py38.sh | 1 - tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py39.sh | 1 - tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py310.sh | 1 - tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py37.sh | 1 - tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py38.sh | 1 - tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py39.sh | 1 - 14 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.bazelrc b/.bazelrc index 5d459083973..1014d1506c8 100644 --- a/.bazelrc +++ b/.bazelrc @@ -149,6 +149,7 @@ build --define=no_aws_support=true build --define=no_hdfs_support=true # TF now has `cc_shared_library` targets, so it needs the experimental flag +# TODO(rostam): Remove when `cc_shared_library` is enabled by default build --experimental_cc_shared_library # Default options should come above this line. diff --git a/tensorflow/tools/ci_build/builds/pip_new.sh b/tensorflow/tools/ci_build/builds/pip_new.sh index 1f534bf110e..362c5223d2a 100755 --- a/tensorflow/tools/ci_build/builds/pip_new.sh +++ b/tensorflow/tools/ci_build/builds/pip_new.sh @@ -320,7 +320,6 @@ bazel clean update_bazel_flags # Build. This outputs the file `build_pip_package`. bazel build \ - --experimental_cc_shared_library \ --action_env=PYTHON_BIN_PATH=${PYTHON_BIN_PATH} \ ${TF_BUILD_FLAGS} \ ${PIP_BUILD_TARGET} \ diff --git a/tensorflow/tools/ci_build/nightly_release/macos/cpu_py36.sh b/tensorflow/tools/ci_build/nightly_release/macos/cpu_py36.sh index bb3287b09b7..f6b5283001a 100644 --- a/tensorflow/tools/ci_build/nightly_release/macos/cpu_py36.sh +++ b/tensorflow/tools/ci_build/nightly_release/macos/cpu_py36.sh @@ -35,7 +35,6 @@ export PYTHON_BIN_PATH=$(which python3.6) # Build the pip package bazel build \ - --experimental_cc_shared_library \ --config=release_cpu_macos \ --repo_env=PYTHON_BIN_PATH="$PYTHON_BIN_PATH" \ tensorflow/tools/pip_package:build_pip_package diff --git a/tensorflow/tools/ci_build/nightly_release/macos/cpu_py37.sh b/tensorflow/tools/ci_build/nightly_release/macos/cpu_py37.sh index 93bbe7347a4..e4dcd9c56eb 100644 --- a/tensorflow/tools/ci_build/nightly_release/macos/cpu_py37.sh +++ b/tensorflow/tools/ci_build/nightly_release/macos/cpu_py37.sh @@ -35,7 +35,6 @@ export PYTHON_BIN_PATH=$(which python3.7) # Build the pip package bazel build \ - --experimental_cc_shared_library \ --config=release_cpu_macos \ --repo_env=PYTHON_BIN_PATH="$PYTHON_BIN_PATH" \ tensorflow/tools/pip_package:build_pip_package diff --git a/tensorflow/tools/ci_build/nightly_release/macos/cpu_py38.sh b/tensorflow/tools/ci_build/nightly_release/macos/cpu_py38.sh index 21e3d41a621..747b238e6b1 100644 --- a/tensorflow/tools/ci_build/nightly_release/macos/cpu_py38.sh +++ b/tensorflow/tools/ci_build/nightly_release/macos/cpu_py38.sh @@ -35,7 +35,6 @@ export PYTHON_BIN_PATH=$(which python3.8) # Build the pip package bazel build \ - --experimental_cc_shared_library \ --config=release_cpu_macos \ --repo_env=PYTHON_BIN_PATH="$PYTHON_BIN_PATH" \ tensorflow/tools/pip_package:build_pip_package diff --git a/tensorflow/tools/ci_build/nightly_release/macos/cpu_py39.sh b/tensorflow/tools/ci_build/nightly_release/macos/cpu_py39.sh index 31ab79eb303..ea01e1b0623 100644 --- a/tensorflow/tools/ci_build/nightly_release/macos/cpu_py39.sh +++ b/tensorflow/tools/ci_build/nightly_release/macos/cpu_py39.sh @@ -40,7 +40,6 @@ export PYTHON_BIN_PATH=$(which python) # Build the pip package # Pass PYENV_VERSION since we're using pyenv. See b/182399580 bazel build \ - --experimental_cc_shared_library \ --config=release_cpu_macos \ --action_env=PYENV_VERSION="$PYENV_VERSION" \ tensorflow/tools/pip_package:build_pip_package diff --git a/tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py310.sh b/tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py310.sh index 558d91a94e2..6288c336e16 100644 --- a/tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py310.sh +++ b/tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py310.sh @@ -28,7 +28,6 @@ export PYTHON_BIN_PATH=$(which python) # Build the pip package bazel build \ - --experimental_cc_shared_library \ --config=release_cpu_linux \ --action_env=PYTHON_BIN_PATH="$PYTHON_BIN_PATH" \ tensorflow/tools/pip_package:build_pip_package diff --git a/tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py37.sh b/tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py37.sh index 50dbae87dc5..bb6043d7d22 100644 --- a/tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py37.sh +++ b/tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py37.sh @@ -28,7 +28,6 @@ export PYTHON_BIN_PATH=$(which python) # Build the pip package bazel build \ - --experimental_cc_shared_library \ --config=release_cpu_linux \ --action_env=PYTHON_BIN_PATH="$PYTHON_BIN_PATH" \ tensorflow/tools/pip_package:build_pip_package diff --git a/tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py38.sh b/tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py38.sh index 9011c8706c1..3cc0ea97f29 100644 --- a/tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py38.sh +++ b/tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py38.sh @@ -28,7 +28,6 @@ export PYTHON_BIN_PATH=$(which python) # Build the pip package bazel build \ - --experimental_cc_shared_library \ --config=release_cpu_linux \ --action_env=PYTHON_BIN_PATH="$PYTHON_BIN_PATH" \ tensorflow/tools/pip_package:build_pip_package diff --git a/tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py39.sh b/tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py39.sh index f7d32e49f82..ce027ec716b 100644 --- a/tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py39.sh +++ b/tensorflow/tools/ci_build/nightly_release/ubuntu/cpu_py39.sh @@ -28,7 +28,6 @@ export PYTHON_BIN_PATH=$(which python) # Build the pip package bazel build \ - --experimental_cc_shared_library \ --config=release_cpu_linux \ --action_env=PYTHON_BIN_PATH="$PYTHON_BIN_PATH" \ tensorflow/tools/pip_package:build_pip_package diff --git a/tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py310.sh b/tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py310.sh index e13ce5e53e1..852b3df2208 100644 --- a/tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py310.sh +++ b/tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py310.sh @@ -28,7 +28,6 @@ export PYTHON_BIN_PATH=$(which python) # Build the pip package bazel build \ - --experimental_cc_shared_library \ --config=release_gpu_linux \ --action_env=PYTHON_BIN_PATH="$PYTHON_BIN_PATH" \ tensorflow/tools/pip_package:build_pip_package diff --git a/tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py37.sh b/tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py37.sh index 8787477ee00..13a89857606 100644 --- a/tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py37.sh +++ b/tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py37.sh @@ -28,7 +28,6 @@ export PYTHON_BIN_PATH=$(which python) # Build the pip package bazel build \ - --experimental_cc_shared_library \ --config=release_gpu_linux \ --action_env=PYTHON_BIN_PATH="$PYTHON_BIN_PATH" \ tensorflow/tools/pip_package:build_pip_package diff --git a/tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py38.sh b/tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py38.sh index 475650c4dac..16e3e36de61 100644 --- a/tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py38.sh +++ b/tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py38.sh @@ -28,7 +28,6 @@ export PYTHON_BIN_PATH=$(which python) # Build the pip package bazel build \ - --experimental_cc_shared_library \ --config=release_gpu_linux \ --action_env=PYTHON_BIN_PATH="$PYTHON_BIN_PATH" \ tensorflow/tools/pip_package:build_pip_package diff --git a/tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py39.sh b/tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py39.sh index a4ecd770ac4..0d937c24965 100644 --- a/tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py39.sh +++ b/tensorflow/tools/ci_build/nightly_release/ubuntu/gpu_py39.sh @@ -28,7 +28,6 @@ export PYTHON_BIN_PATH=$(which python) # Build the pip package bazel build \ - --experimental_cc_shared_library \ --config=release_gpu_linux \ --action_env=PYTHON_BIN_PATH="$PYTHON_BIN_PATH" \ tensorflow/tools/pip_package:build_pip_package