diff options
| -rwxr-xr-x | tensorflow/tools/ci_build/builds/configured | 9 | ||||
| -rwxr-xr-x | tensorflow/tools/ci_build/builds/run_pip_tests.sh | 2 | ||||
| -rwxr-xr-x | tensorflow/tools/ci_build/ci_build.sh | 5 | ||||
| -rwxr-xr-x | tensorflow/tools/ci_build/ci_parameterized_build.sh | 18 |
4 files changed, 4 insertions, 30 deletions
diff --git a/tensorflow/tools/ci_build/builds/configured b/tensorflow/tools/ci_build/builds/configured index 90c4eace4d..a0f66ca122 100755 --- a/tensorflow/tools/ci_build/builds/configured +++ b/tensorflow/tools/ci_build/builds/configured @@ -33,13 +33,8 @@ export TF_NEED_GCP=1 # Enable support for HDFS export TF_NEED_HDFS=1 -# Enable XLA support -export TF_ENABLE_XLA=${TF_BUILD_ENABLE_XLA:-0} - -if [[ "$1" == "--disable-gcp" ]]; then - export TF_NEED_GCP=0 - shift 1 -fi +# Disable XLA support by default. +export TF_ENABLE_XLA=0 COMMAND=("$@") diff --git a/tensorflow/tools/ci_build/builds/run_pip_tests.sh b/tensorflow/tools/ci_build/builds/run_pip_tests.sh index 9a6890401b..43d5c5ff3b 100755 --- a/tensorflow/tools/ci_build/builds/run_pip_tests.sh +++ b/tensorflow/tools/ci_build/builds/run_pip_tests.sh @@ -109,7 +109,7 @@ bazel clean # virtualenv. export TF_NEED_GCP=0 export TF_NEED_HDFS=0 -export TF_ENABLE_XLA=${TF_BUILD_ENABLE_XLA:-0} +export TF_ENABLE_XLA=0 # Obtain the path to Python binary if [[ ${IS_VIRTUALENV} == "1" ]]; then diff --git a/tensorflow/tools/ci_build/ci_build.sh b/tensorflow/tools/ci_build/ci_build.sh index 9c1b75d004..5164a25012 100755 --- a/tensorflow/tools/ci_build/ci_build.sh +++ b/tensorflow/tools/ci_build/ci_build.sh @@ -73,11 +73,6 @@ CI_TENSORFLOW_SUBMODULE_PATH="${CI_TENSORFLOW_SUBMODULE_PATH:-.}" CI_COMMAND_PREFIX=("${CI_COMMAND_PREFIX[@]:-${CI_TENSORFLOW_SUBMODULE_PATH}/tensorflow/tools/ci_build/builds/with_the_same_user "\ "${CI_TENSORFLOW_SUBMODULE_PATH}/tensorflow/tools/ci_build/builds/configured ${CONTAINER_TYPE}}") -if [[ ! -z "${TF_BUILD_DISABLE_GCP}" ]] && - [[ "${TF_BUILD_DISABLE_GCP}" != "0" ]]; then - CI_COMMAND_PREFIX+=("--disable-gcp") -fi - # cmake (CPU) builds do not require configuration. if [[ "${CONTAINER_TYPE}" == "cmake" ]]; then CI_COMMAND_PREFIX=("") diff --git a/tensorflow/tools/ci_build/ci_parameterized_build.sh b/tensorflow/tools/ci_build/ci_parameterized_build.sh index fee21558e8..a18fa76d83 100755 --- a/tensorflow/tools/ci_build/ci_parameterized_build.sh +++ b/tensorflow/tools/ci_build/ci_parameterized_build.sh @@ -53,9 +53,6 @@ # additional flag --copt=-mavx or --copt=-mavx2, to # perform AVX or AVX2 builds, respectively. This requires # AVX- or AVX2-compatible CPUs. -# TF_BUILD_ENABLE_XLA: -# If it is set to any non-empty value that is not "0", -# will enable XLA and run XLA tests. # TF_BUILD_BAZEL_TARGET: # Used to override the default bazel build target: # //tensorflow/... -//tensorflow/compiler @@ -79,10 +76,6 @@ # If set to any non-empty and non-0 value, will perform # the benchmark tests (see *_logged_benchmark targets in # tools/test/BUILD) -# TF_BUILD_DISABLE_GCP: -# If set to any non-empty and non-0 value, will disable -# support for Google Cloud Platform (GCP), which is -# enabled by default. # TF_BUILD_OPTIONS: # (FASTBUILD | OPT | OPTDBG | MAVX | MAVX2_FMA | MAVX_DBG | # MAVX2_FMA_DBG) @@ -148,14 +141,7 @@ PARALLEL_GPU_TEST_CMD='//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execut BENCHMARK_CMD="${CI_BUILD_DIR}/builds/benchmark.sh" EXTRA_PARAMS="" - -export TF_BUILD_ENABLE_XLA=${TF_BUILD_ENABLE_XLA:-0} -if [[ -z $TF_BUILD_ENABLE_XLA ]] || [ $TF_BUILD_ENABLE_XLA == 0 ]; then - BAZEL_TARGET="//tensorflow/... -//tensorflow/compiler/..." -else - BAZEL_TARGET="//tensorflow/compiler/..." - EXTRA_PARAMS="${EXTRA_PARAMS} -e TF_BUILD_ENABLE_XLA=1" -fi +BAZEL_TARGET="//tensorflow/... -//tensorflow/compiler/..." if [[ -n "$TF_SKIP_CONTRIB_TESTS" ]]; then BAZEL_TARGET="$BAZEL_TARGET -//tensorflow/contrib/..." @@ -197,9 +183,7 @@ echo " TF_BUILD_BAZEL_CLEAN=${TF_BUILD_BAZEL_CLEAN}" echo " TF_BUILD_TEST_TUTORIALS=${TF_BUILD_TEST_TUTORIALS}" echo " TF_BUILD_INTEGRATION_TESTS=${TF_BUILD_INTEGRATION_TESTS}" echo " TF_BUILD_RUN_BENCHMARKS=${TF_BUILD_RUN_BENCHMARKS}" -echo " TF_BUILD_DISABLE_GCP=${TF_BUILD_DISABLE_GCP}" echo " TF_BUILD_OPTIONS=${TF_BUILD_OPTIONS}" -echo " TF_BUILD_ENABLE_XLA=${TF_BUILD_ENABLE_XLA}" # Function that tries to determine CUDA capability, if deviceQuery binary |