Update windows release build script to create the correct pip package names.

PiperOrigin-RevId: 282425067
Change-Id: I13b05c37eb9dbeac2d9beea31b21898f12cfdc89
This commit is contained in:
Yifei Feng 2019-11-25 13:46:08 -08:00 committed by TensorFlower Gardener
parent 7960506932
commit b555a8f2e0
14 changed files with 34 additions and 17 deletions

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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}