diff options
| author |  Amit Patankar <amitpatankar@google.com> | 2018-08-20 15:33:13 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-08-20 15:37:11 -0700 |
| commit | 135bd2714387eb5285fc9c621d9a8dc042d5f435 (patch) | |
| tree | d2d1316af3c25fa859dbfde9f4e9db1d7b43844a /tensorflow/tools/ci_build | |
| parent | fe747c18093737065f482c15f14d95981fd55ef4 (diff) | |
Adding functionality to Windows generate scripts to run for tf-nightly.
PiperOrigin-RevId: 209496111
Diffstat (limited to 'tensorflow/tools/ci_build')
| -rw-r--r-- | tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh | 12 | ||||
| -rw-r--r-- | tensorflow/tools/ci_build/windows/gpu/pip/build_tf_windows.sh | 12 |
2 files changed, 22 insertions, 2 deletions
diff --git a/tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh b/tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh index 47e0e5dd59..2baab50f40 100644 --- a/tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh +++ b/tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh @@ -68,6 +68,7 @@ TEST_TARGET="//${PY_TEST_DIR}/tensorflow/python/... \ # --test_contrib_only Use tensorflow/contrib/... as test target for ARG in "$@"; do case "$ARG" in + --tf_nightly) TF_NIGHTLY=1 ;; --skip_test) SKIP_TEST=1 ;; --enable_remote_cache) set_remote_cache_options ;; --release_build) RELEASE_BUILD=1 ;; @@ -86,6 +87,11 @@ else export TF_OVERRIDE_EIGEN_STRONG_INLINE=1 fi +if [[ "$TF_NIGHTLY" == 1 ]]; then + ./tensorflow/tools/ci_build/update_version.py --nightly + EXTRA_PIP_FLAG="--nightly_flag" +fi + # Enable short object file path to avoid long path issue on Windows. echo "startup --output_user_root=${TMPDIR}" >> "${TMP_BAZELRC}" @@ -104,7 +110,11 @@ fi # Create a python test directory to avoid package name conflict create_python_test_dir "${PY_TEST_DIR}" -./bazel-bin/tensorflow/tools/pip_package/build_pip_package "$PWD/${PY_TEST_DIR}" +./bazel-bin/tensorflow/tools/pip_package/build_pip_package "$PWD/${PY_TEST_DIR}" "${EXTRA_PIP_FLAG}" + +if [[ "$TF_NIGHTLY" == 1 ]]; then + exit 0 +fi # Running python tests on Windows needs pip package installed PIP_NAME=$(ls ${PY_TEST_DIR}/tensorflow-*.whl) diff --git a/tensorflow/tools/ci_build/windows/gpu/pip/build_tf_windows.sh b/tensorflow/tools/ci_build/windows/gpu/pip/build_tf_windows.sh index e3eee11080..42792ac710 100644 --- a/tensorflow/tools/ci_build/windows/gpu/pip/build_tf_windows.sh +++ b/tensorflow/tools/ci_build/windows/gpu/pip/build_tf_windows.sh @@ -68,6 +68,7 @@ TEST_TARGET="//${PY_TEST_DIR}/tensorflow/python/... \ # --test_contrib_only Use tensorflow/contrib/... as test target for ARG in "$@"; do case "$ARG" in + --tf_nightly) TF_NIGHTLY=1 ;; --skip_test) SKIP_TEST=1 ;; --enable_remote_cache) set_remote_cache_options ;; --release_build) RELEASE_BUILD=1 ;; @@ -86,6 +87,11 @@ else export TF_OVERRIDE_EIGEN_STRONG_INLINE=1 fi +if [[ "$TF_NIGHTLY" == 1 ]]; then + ./tensorflow/tools/ci_build/update_version.py --nightly + EXTRA_PIP_FLAG="--nightly_flag" +fi + # Enable short object file path to avoid long path issue on Windows. echo "startup --output_user_root=${TMPDIR}" >> "${TMP_BAZELRC}" @@ -107,7 +113,11 @@ fi # Create a python test directory to avoid package name conflict create_python_test_dir "${PY_TEST_DIR}" -./bazel-bin/tensorflow/tools/pip_package/build_pip_package "$PWD/${PY_TEST_DIR}" +./bazel-bin/tensorflow/tools/pip_package/build_pip_package "$PWD/${PY_TEST_DIR}" --gpu "${EXTRA_PIP_FLAG}" + +if [[ "$TF_NIGHTLY" == 1 ]]; then + exit 0 +fi # Running python tests on Windows needs pip package installed PIP_NAME=$(ls ${PY_TEST_DIR}/tensorflow-*.whl) |