From b555a8f2e0a5b233db721a02a74162992f59b879 Mon Sep 17 00:00:00 2001 From: Yifei Feng Date: Mon, 25 Nov 2019 13:46:08 -0800 Subject: [PATCH] Update windows release build script to create the correct pip package names. PiperOrigin-RevId: 282425067 Change-Id: I13b05c37eb9dbeac2d9beea31b21898f12cfdc89 --- .../ci_build/release/windows/cpu_py35_full/release.bat | 2 +- .../ci_build/release/windows/cpu_py36_full/release.bat | 2 +- .../ci_build/release/windows/cpu_py37_full/release.bat | 2 +- .../ci_build/release/windows/gpu_py35_full/nightly.bat | 5 ++++- .../release/windows/gpu_py35_full/release_pip_rename.sh | 4 ++-- .../ci_build/release/windows/gpu_py35_full/release_v1.bat | 2 +- .../ci_build/release/windows/gpu_py36_full/release.bat | 5 ++++- .../release/windows/gpu_py36_full/release_pip_rename.sh | 4 ++-- .../ci_build/release/windows/gpu_py36_full/release_v1.bat | 2 +- .../ci_build/release/windows/gpu_py37_full/release.bat | 5 ++++- .../release/windows/gpu_py37_full/release_pip_rename.sh | 4 ++-- .../ci_build/release/windows/gpu_py37_full/release_v1.bat | 2 +- .../tools/ci_build/windows/cpu/pip/build_tf_windows.sh | 6 +++++- .../tools/ci_build/windows/gpu/pip/build_tf_windows.sh | 6 +++++- 14 files changed, 34 insertions(+), 17 deletions(-) diff --git a/tensorflow/tools/ci_build/release/windows/cpu_py35_full/release.bat b/tensorflow/tools/ci_build/release/windows/cpu_py35_full/release.bat index f10ba0ecc4f..bd8c217ddef 100644 --- a/tensorflow/tools/ci_build/release/windows/cpu_py35_full/release.bat +++ b/tensorflow/tools/ci_build/release/windows/cpu_py35_full/release.bat @@ -17,4 +17,4 @@ SET PYTHON_DIRECTORY=Python35 CALL tensorflow\tools\ci_build\release\common_win.bat -call tensorflow\tools\ci_build\windows\cpu\pip\run.bat --release_build --extra_build_flags "--config=v2" --extra_test_flags "--test_env=TF2_BEHAVIOR=1" +call tensorflow\tools\ci_build\windows\cpu\pip\run.bat --release_build --extra_build_flags "--config=v2" --extra_test_flags "--test_env=TF2_BEHAVIOR=1" --project_name "tensorflow_cpu" diff --git a/tensorflow/tools/ci_build/release/windows/cpu_py36_full/release.bat b/tensorflow/tools/ci_build/release/windows/cpu_py36_full/release.bat index 244e9479eb5..0a81a90a431 100644 --- a/tensorflow/tools/ci_build/release/windows/cpu_py36_full/release.bat +++ b/tensorflow/tools/ci_build/release/windows/cpu_py36_full/release.bat @@ -17,4 +17,4 @@ SET PYTHON_DIRECTORY=Python36 CALL tensorflow\tools\ci_build\release\common_win.bat -call tensorflow\tools\ci_build\windows\cpu\pip\run.bat --release_build --extra_build_flags "--config=v2" --extra_test_flags "--test_env=TF2_BEHAVIOR=1" +call tensorflow\tools\ci_build\windows\cpu\pip\run.bat --release_build --extra_build_flags "--config=v2" --extra_test_flags "--test_env=TF2_BEHAVIOR=1" --project_name "tensorflow_cpu" diff --git a/tensorflow/tools/ci_build/release/windows/cpu_py37_full/release.bat b/tensorflow/tools/ci_build/release/windows/cpu_py37_full/release.bat index 4164c3cc9b5..9591d7aac34 100644 --- a/tensorflow/tools/ci_build/release/windows/cpu_py37_full/release.bat +++ b/tensorflow/tools/ci_build/release/windows/cpu_py37_full/release.bat @@ -17,4 +17,4 @@ SET PYTHON_DIRECTORY=Python37 CALL tensorflow\tools\ci_build\release\common_win.bat -call tensorflow\tools\ci_build\windows\cpu\pip\run.bat --release_build --extra_build_flags "--config=v2" --extra_test_flags "--test_env=TF2_BEHAVIOR=1" +call tensorflow\tools\ci_build\windows\cpu\pip\run.bat --release_build --extra_build_flags "--config=v2" --extra_test_flags "--test_env=TF2_BEHAVIOR=1" --project_name "tensorflow_cpu" diff --git a/tensorflow/tools/ci_build/release/windows/gpu_py35_full/nightly.bat b/tensorflow/tools/ci_build/release/windows/gpu_py35_full/nightly.bat index 19e8ebcfabd..56d5b9637b6 100644 --- a/tensorflow/tools/ci_build/release/windows/gpu_py35_full/nightly.bat +++ b/tensorflow/tools/ci_build/release/windows/gpu_py35_full/nightly.bat @@ -17,4 +17,7 @@ SET PYTHON_DIRECTORY=Python35 CALL tensorflow\tools\ci_build\release\common_win.bat -call tensorflow\tools\ci_build\windows\gpu\pip\run.bat --extra_build_flags "--config=v2" --extra_test_flags "--test_env=TF2_BEHAVIOR=1" +call tensorflow\tools\ci_build\windows\gpu\pip\run.bat --extra_build_flags "--config=v2" --extra_test_flags "--test_env=TF2_BEHAVIOR=1" --project_name "tensorflow" + +for %%a in ("%~dp0\.") do set "PARENT_DIR=%%~nxa" +bash -l tensorflow\tools\ci_build\release\windows\%PARENT_DIR%\release_pip_rename.sh \ No newline at end of file diff --git a/tensorflow/tools/ci_build/release/windows/gpu_py35_full/release_pip_rename.sh b/tensorflow/tools/ci_build/release/windows/gpu_py35_full/release_pip_rename.sh index 6a868382777..039f9516d86 100644 --- a/tensorflow/tools/ci_build/release/windows/gpu_py35_full/release_pip_rename.sh +++ b/tensorflow/tools/ci_build/release/windows/gpu_py35_full/release_pip_rename.sh @@ -19,6 +19,6 @@ set -x source tensorflow/tools/ci_build/release/common.sh # Copy and rename to tensorflow -for f in $(ls py_test_dir/tensorflow_gpu-*cp3*-cp3*m-win_amd64.whl); do - copy_to_new_project_name "${f}" tensorflow +for f in $(ls py_test_dir/tensorflow-*cp3*-cp3*m-win_amd64.whl); do + copy_to_new_project_name "${f}" tensorflow_gpu done diff --git a/tensorflow/tools/ci_build/release/windows/gpu_py35_full/release_v1.bat b/tensorflow/tools/ci_build/release/windows/gpu_py35_full/release_v1.bat index abd63888e70..55e4e4f5782 100644 --- a/tensorflow/tools/ci_build/release/windows/gpu_py35_full/release_v1.bat +++ b/tensorflow/tools/ci_build/release/windows/gpu_py35_full/release_v1.bat @@ -17,7 +17,7 @@ SET PYTHON_DIRECTORY=Python35 CALL tensorflow\tools\ci_build\release\common_win.bat -call tensorflow\tools\ci_build\windows\gpu\pip\run.bat --release_build +call tensorflow\tools\ci_build\windows\gpu\pip\run.bat --release_build --project_name "tensorflow" for %%a in ("%~dp0\.") do set "PARENT_DIR=%%~nxa" bash -l tensorflow\tools\ci_build\release\windows\%PARENT_DIR%\release_pip_rename.sh diff --git a/tensorflow/tools/ci_build/release/windows/gpu_py36_full/release.bat b/tensorflow/tools/ci_build/release/windows/gpu_py36_full/release.bat index ed0c127afe5..ede8bd35f52 100644 --- a/tensorflow/tools/ci_build/release/windows/gpu_py36_full/release.bat +++ b/tensorflow/tools/ci_build/release/windows/gpu_py36_full/release.bat @@ -17,4 +17,7 @@ SET PYTHON_DIRECTORY=Python36 CALL tensorflow\tools\ci_build\release\common_win.bat -call tensorflow\tools\ci_build\windows\gpu\pip\run.bat --release_build --extra_build_flags "--config=v2" --extra_test_flags "--test_env=TF2_BEHAVIOR=1" +call tensorflow\tools\ci_build\windows\gpu\pip\run.bat --release_build --extra_build_flags "--config=v2" --extra_test_flags "--test_env=TF2_BEHAVIOR=1" --project_name "tensorflow" + +for %%a in ("%~dp0\.") do set "PARENT_DIR=%%~nxa" +bash -l tensorflow\tools\ci_build\release\windows\%PARENT_DIR%\release_pip_rename.sh \ No newline at end of file diff --git a/tensorflow/tools/ci_build/release/windows/gpu_py36_full/release_pip_rename.sh b/tensorflow/tools/ci_build/release/windows/gpu_py36_full/release_pip_rename.sh index 6a868382777..039f9516d86 100644 --- a/tensorflow/tools/ci_build/release/windows/gpu_py36_full/release_pip_rename.sh +++ b/tensorflow/tools/ci_build/release/windows/gpu_py36_full/release_pip_rename.sh @@ -19,6 +19,6 @@ set -x source tensorflow/tools/ci_build/release/common.sh # Copy and rename to tensorflow -for f in $(ls py_test_dir/tensorflow_gpu-*cp3*-cp3*m-win_amd64.whl); do - copy_to_new_project_name "${f}" tensorflow +for f in $(ls py_test_dir/tensorflow-*cp3*-cp3*m-win_amd64.whl); do + copy_to_new_project_name "${f}" tensorflow_gpu done diff --git a/tensorflow/tools/ci_build/release/windows/gpu_py36_full/release_v1.bat b/tensorflow/tools/ci_build/release/windows/gpu_py36_full/release_v1.bat index 7eafdf8af20..a66ca900e47 100644 --- a/tensorflow/tools/ci_build/release/windows/gpu_py36_full/release_v1.bat +++ b/tensorflow/tools/ci_build/release/windows/gpu_py36_full/release_v1.bat @@ -17,7 +17,7 @@ SET PYTHON_DIRECTORY=Python36 CALL tensorflow\tools\ci_build\release\common_win.bat -call tensorflow\tools\ci_build\windows\gpu\pip\run.bat --release_build +call tensorflow\tools\ci_build\windows\gpu\pip\run.bat --release_build --project_name "tensorflow" for %%a in ("%~dp0\.") do set "PARENT_DIR=%%~nxa" bash -l tensorflow\tools\ci_build\release\windows\%PARENT_DIR%\release_pip_rename.sh diff --git a/tensorflow/tools/ci_build/release/windows/gpu_py37_full/release.bat b/tensorflow/tools/ci_build/release/windows/gpu_py37_full/release.bat index 00d85ef9119..7509270fc43 100644 --- a/tensorflow/tools/ci_build/release/windows/gpu_py37_full/release.bat +++ b/tensorflow/tools/ci_build/release/windows/gpu_py37_full/release.bat @@ -17,4 +17,7 @@ SET PYTHON_DIRECTORY=Python37 CALL tensorflow\tools\ci_build\release\common_win.bat -call tensorflow\tools\ci_build\windows\gpu\pip\run.bat --release_build --extra_build_flags "--config=v2" --extra_test_flags "--test_env=TF2_BEHAVIOR=1" +call tensorflow\tools\ci_build\windows\gpu\pip\run.bat --release_build --extra_build_flags "--config=v2" --extra_test_flags "--test_env=TF2_BEHAVIOR=1" --project_name "tensorflow" + +for %%a in ("%~dp0\.") do set "PARENT_DIR=%%~nxa" +bash -l tensorflow\tools\ci_build\release\windows\%PARENT_DIR%\release_pip_rename.sh \ No newline at end of file diff --git a/tensorflow/tools/ci_build/release/windows/gpu_py37_full/release_pip_rename.sh b/tensorflow/tools/ci_build/release/windows/gpu_py37_full/release_pip_rename.sh index 6a868382777..039f9516d86 100644 --- a/tensorflow/tools/ci_build/release/windows/gpu_py37_full/release_pip_rename.sh +++ b/tensorflow/tools/ci_build/release/windows/gpu_py37_full/release_pip_rename.sh @@ -19,6 +19,6 @@ set -x source tensorflow/tools/ci_build/release/common.sh # Copy and rename to tensorflow -for f in $(ls py_test_dir/tensorflow_gpu-*cp3*-cp3*m-win_amd64.whl); do - copy_to_new_project_name "${f}" tensorflow +for f in $(ls py_test_dir/tensorflow-*cp3*-cp3*m-win_amd64.whl); do + copy_to_new_project_name "${f}" tensorflow_gpu done diff --git a/tensorflow/tools/ci_build/release/windows/gpu_py37_full/release_v1.bat b/tensorflow/tools/ci_build/release/windows/gpu_py37_full/release_v1.bat index 261947f58f3..059e28134c8 100644 --- a/tensorflow/tools/ci_build/release/windows/gpu_py37_full/release_v1.bat +++ b/tensorflow/tools/ci_build/release/windows/gpu_py37_full/release_v1.bat @@ -17,7 +17,7 @@ SET PYTHON_DIRECTORY=Python37 CALL tensorflow\tools\ci_build\release\common_win.bat -call tensorflow\tools\ci_build\windows\gpu\pip\run.bat --release_build +call tensorflow\tools\ci_build\windows\gpu\pip\run.bat --release_build --project_name "tensorflow" for %%a in ("%~dp0\.") do set "PARENT_DIR=%%~nxa" bash -l tensorflow\tools\ci_build\release\windows\%PARENT_DIR%\release_pip_rename.sh 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 c21fbd80bb7..5780e657de2 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 @@ -120,6 +120,10 @@ if [[ "$TF_NIGHTLY" == 1 ]]; then else EXTRA_PIP_FLAGS="--project_name ${PROJECT_NAME} --nightly_flag" fi +else + if [[ -v ${PROJECT_NAME} ]]; then + EXTRA_PIP_FLAGS="--project_name ${PROJECT_NAME}" + fi fi # Enable short object file path to avoid long path issue on Windows. @@ -154,7 +158,7 @@ if [[ "$TF_NIGHTLY" == 1 ]]; then fi # Running python tests on Windows needs pip package installed -PIP_NAME=$(ls ${PY_TEST_DIR}/tensorflow-*.whl) +PIP_NAME=$(ls ${PY_TEST_DIR}/tensorflow*.whl) reinstall_tensorflow_pip ${PIP_NAME} # NUMBER_OF_PROCESSORS is predefined on Windows 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 da2f5d275c7..9b28c1c6c90 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 @@ -120,6 +120,10 @@ if [[ "$TF_NIGHTLY" == 1 ]]; then else EXTRA_PIP_FLAGS="--project_name ${PROJECT_NAME} --nightly_flag" fi +else + if [[ -v ${PROJECT_NAME} ]]; then + EXTRA_PIP_FLAGS="--project_name ${PROJECT_NAME}" + fi fi # Enable short object file path to avoid long path issue on Windows. @@ -154,7 +158,7 @@ if [[ "$TF_NIGHTLY" == 1 ]]; then fi # Running python tests on Windows needs pip package installed -PIP_NAME=$(ls ${PY_TEST_DIR}/tensorflow_gpu-*.whl) +PIP_NAME=$(ls ${PY_TEST_DIR}/tensorflow*.whl) reinstall_tensorflow_pip ${PIP_NAME} TF_GPU_COUNT=${TF_GPU_COUNT:-4}