Skip to content

Refactor and fix windows smoke tests #1218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 7, 2022
Merged

Refactor and fix windows smoke tests #1218

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6659a2e
Fix windows smoke test
atalman Dec 5, 2022
7f3ac9e
Fix first if statement
atalman Dec 5, 2022
ac580c8
Refactor not to cal install nightly package
atalman Dec 5, 2022
d17602b
Revert "Refactor not to cal install nightly package"
atalman Dec 5, 2022
4de60fc
Fix pip install command remove cu102
atalman Dec 6, 2022
8932ba7
Refacor the conda installation
atalman Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions windows/internal/install_nightly_package.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,8 @@ if "%PACKAGE_TYPE%" == "libtorch" goto libtorch
:wheel
echo "install pytorch wheel from nightly"

set pip_url="https://download.pytorch.org/whl/nightly/%DESIRED_CUDA%/torch_nightly.html"
if "%DESIRED_CUDA%" == "cu102" (
set package_name_and_version="torch==%NIGHTLIES_DATE_PREAMBLE%%DATE%"
) else (
set package_name_and_version="torch==%NIGHTLIES_DATE_PREAMBLE%%DATE%+%DESIRED_CUDA%"
)
pip install "%package_name_and_version%" -f "%pip_url%" --no-cache-dir --no-index -q
set pip_url="https://download.pytorch.org/whl/nightly/%DESIRED_CUDA%"
pip3 install --pre torch --extra-index-url %pip_url%
if errorlevel 1 exit /b 1

exit /b 0
Expand Down Expand Up @@ -54,11 +49,8 @@ if "%LIBTORCH_CONFIG%" == "debug" (
) else (
set NAME_PREFIX=libtorch-win-shared-with-deps
)
if "%DESIRED_CUDA%" == "cu102" (
set package_name=%NAME_PREFIX%-%NIGHTLIES_DATE_PREAMBLE%%DATE%.zip
) else (
set package_name=%NAME_PREFIX%-%NIGHTLIES_DATE_PREAMBLE%%DATE%%%2B%DESIRED_CUDA%.zip
)

set package_name=%NAME_PREFIX%-%NIGHTLIES_DATE_PREAMBLE%%DATE%%%2B%DESIRED_CUDA%.zip
set libtorch_url="https://download.pytorch.org/libtorch/nightly/%DESIRED_CUDA%/%package_name%"
curl --retry 3 -k "%libtorch_url%" -o %package_name%
if ERRORLEVEL 1 exit /b 1
Expand Down
6 changes: 3 additions & 3 deletions windows/internal/smoke_test.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ set "PATH=%CD%\Python%PYTHON_VERSION%\Scripts;%CD%\Python;%PATH%"
pip install -q numpy protobuf "mkl>=2019"
if errorlevel 1 exit /b 1

if "%TEST_NIGHTLY_PACKAGE%" == "1" (
if NOT "%PYTORCH_BUILD_VERSION%"=="%PYTORCH_BUILD_VERSION:dev=%" (
call internal\install_nightly_package.bat
if errorlevel 1 exit /b 1
) else (
Expand Down Expand Up @@ -106,7 +106,7 @@ set CUDA_VER_MAJOR=%CUDA_VERSION:~0,-1%
set CUDA_VER_MINOR=%CUDA_VERSION:~-1,1%
set CUDA_VERSION_STR=%CUDA_VER_MAJOR%.%CUDA_VER_MINOR%

if "%TEST_NIGHTLY_PACKAGE%" == "1" (
if NOT "%PYTORCH_BUILD_VERSION%"=="%PYTORCH_BUILD_VERSION:dev=%" (
call internal\install_nightly_package.bat
if errorlevel 1 exit /b 1
goto smoke_test
Expand Down Expand Up @@ -168,7 +168,7 @@ echo "install and test libtorch"
if "%VC_YEAR%" == "2017" powershell internal\vs2017_install.ps1
if ERRORLEVEL 1 exit /b 1

if "%TEST_NIGHTLY_PACKAGE%" == "1" (
if NOT "%PYTORCH_BUILD_VERSION%"=="%PYTORCH_BUILD_VERSION:dev=%" (
call internal\install_nightly_package.bat
if errorlevel 1 exit /b 1
) else (
Expand Down