Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add one more flag for Bazel compatibility. #30651

Merged
merged 1 commit into from
Jul 12, 2019
Merged

Add one more flag for Bazel compatibility. #30651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions tensorflow/tools/ci_build/ci_sanity.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@ do_bazel_nobuild() {
BUILD_TARGET="${BUILD_TARGET} -//tensorflow/lite/schema/..."
BAZEL_FLAGS="${BAZEL_FLAGS} --incompatible_package_name_is_a_function=false"
BAZEL_FLAGS="${BAZEL_FLAGS} --incompatible_remove_native_http_archive=false"
BAZEL_FLAGS="${BAZEL_FLAGS} --incompatible_strict_action_env=false"
BUILD_CMD="bazel build --nobuild ${BAZEL_FLAGS} -- ${BUILD_TARGET}"

${BUILD_CMD}
Expand Down
9 changes: 8 additions & 1 deletion tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ fi

run_configure_for_cpu_build

EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --incompatible_package_name_is_a_function=false"
EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --incompatible_remove_native_http_archive=false"
EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --incompatible_strict_action_env=false"
bazel build --announce_rc --config=opt ${EXTRA_BUILD_FLAGS} \
tensorflow/tools/pip_package:build_pip_package \
--incompatible_remove_native_http_archive=false || exit $?
Expand All @@ -148,7 +151,11 @@ N_JOBS="${NUMBER_OF_PROCESSORS}"

# Define no_tensorflow_py_deps=true so that every py_test has no deps anymore,
# which will result testing system installed tensorflow
bazel test --announce_rc --config=opt -k --test_output=errors \
bazel test \
--incompatible_package_name_is_a_function=false \
--incompatible_remove_native_http_archive=false \
--incompatible_strict_action_env=false \
--announce_rc --config=opt -k --test_output=errors \
--define=no_tensorflow_py_deps=true --test_lang_filters=py \
--test_tag_filters=-no_pip,-no_windows,-no_oss,-gpu \
--build_tag_filters=-no_pip,-no_windows,-no_oss,-gpu --build_tests_only \
Expand Down
9 changes: 8 additions & 1 deletion tensorflow/tools/ci_build/windows/gpu/pip/build_tf_windows.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ fi

run_configure_for_gpu_build

EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --incompatible_package_name_is_a_function=false"
EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --incompatible_remove_native_http_archive=false"
EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} --incompatible_strict_action_env=false"
bazel build --announce_rc --config=opt --define=no_tensorflow_py_deps=true \
${EXTRA_BUILD_FLAGS} \
tensorflow/tools/pip_package:build_pip_package || exit $?
Expand Down Expand Up @@ -151,7 +154,11 @@ TF_GPU_COUNT=${TF_GPU_COUNT:-4}
# Define no_tensorflow_py_deps=true so that every py_test has no deps anymore,
# which will result testing system installed tensorflow
# GPU tests are very flaky when running concurrently, so set local_test_jobs=1
bazel test --announce_rc --config=opt -k --test_output=errors \
bazel test \
--incompatible_package_name_is_a_function=false \
--incompatible_remove_native_http_archive=false \
--incompatible_strict_action_env=false \
--announce_rc --config=opt -k --test_output=errors \
--test_env=TF_GPU_COUNT \
--run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute \
--define=no_tensorflow_py_deps=true --test_lang_filters=py \
Expand Down
1 change: 1 addition & 0 deletions tensorflow/tools/pip_package/check_load_py_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ def main():
'bazel', 'query',
"--incompatible_package_name_is_a_function=false",
"--incompatible_remove_native_http_archive=false",
"--incompatible_strict_action_env=false",
'kind(py_test, //tensorflow/contrib/... + '
'//tensorflow/python/... - '
'//tensorflow/contrib/tensorboard/...)']).strip()
Expand Down
3 changes: 2 additions & 1 deletion tensorflow/tools/pip_package/pip_smoke_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@

RELEASE_PATCH_FLAGS = (
" --incompatible_package_name_is_a_function=false"
" --incompatible_remove_native_http_archive=false")
" --incompatible_remove_native_http_archive=false"
" --incompatible_strict_action_env=false")


def GetBuild(dir_base):
Expand Down