Build tensorflow 2.0 by default on master.

PiperOrigin-RevId: 272567663
This commit is contained in:
A. Unique TensorFlower 2019-10-02 18:45:34 -07:00 committed by TensorFlower Gardener
parent b9d938352a
commit 2a8e8706a4
5 changed files with 7 additions and 5 deletions

View File

@ -175,8 +175,8 @@ build:v1 --define=tf_api_version=1
build:v2 --define=tf_api_version=2
test:v1 --action_env=TF2_BEHAVIOR=0
test:v2 --action_env=TF2_BEHAVIOR=1
build --config=v1
test --config=v1
build --config=v2
test --config=v2
# Default options should come above this line

View File

@ -23,5 +23,5 @@ import tensorflow as tf
if tf.test.is_built_with_cuda():
_cuda_op_module = tf.load_op_library(os.path.join(
tf.resource_loader.get_data_files_path(), 'cuda_op_kernel.so'))
tf.compat.v1.resource_loader.get_data_files_path(), 'cuda_op_kernel.so'))
add_one = _cuda_op_module.add_one

View File

@ -49,6 +49,7 @@ cuda_py_test(
"no_windows", # TODO(b/141617449): needs investigation
"optonly",
"oss_serial",
"v1only",
],
)
@ -67,6 +68,7 @@ cuda_py_test(
"no_windows", # TODO(b/141617449): needs investigation
"optonly",
"oss_serial",
"v1only",
],
# Times out
xla_enable_strict_auto_jit = False,

View File

@ -168,7 +168,7 @@ N_JOBS="${NUMBER_OF_PROCESSORS}"
bazel test --announce_rc --config=opt -k --test_output=errors \
${EXTRA_TEST_FLAGS} \
--define=no_tensorflow_py_deps=true --test_lang_filters=py \
--test_tag_filters=-no_pip,-no_windows,-no_oss,-gpu,-tpu \
--test_tag_filters=-no_pip,-no_windows,-no_oss,-gpu,-tpu,-v1only \
--build_tag_filters=-no_pip,-no_windows,-no_oss,-gpu,-tpu --build_tests_only \
--test_size_filters=small,medium \
--jobs="${N_JOBS}" --test_timeout="300,450,1200,3600" \

View File

@ -170,7 +170,7 @@ bazel test --announce_rc --config=opt -k --test_output=errors \
${EXTRA_TEST_FLAGS} \
--run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute \
--define=no_tensorflow_py_deps=true --test_lang_filters=py \
--test_tag_filters=-no_pip,-no_windows,-no_windows_gpu,-no_gpu,-no_pip_gpu,-no_oss,gpu \
--test_tag_filters=-no_pip,-no_windows,-no_windows_gpu,-no_gpu,-no_pip_gpu,-no_oss,gpu,-v1only \
--build_tag_filters=-no_pip,-no_windows,-no_windows_gpu,-no_gpu,-no_pip_gpu,-no_oss,gpu --build_tests_only \
--test_size_filters=small,medium \
--local_test_jobs=$TF_GPU_COUNT --test_timeout="300,450,1200,3600" \