From fece1fcd8c9b3f6ff806812979c6555a8b9e8d56 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 14 Apr 2020 21:29:41 +0800 Subject: [PATCH] Don't use nightly_defaults.bat from builder --- windows/internal/build_conda.bat | 6 ------ windows/internal/build_wheels.bat | 3 --- windows/internal/setup.bat | 6 +++--- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/windows/internal/build_conda.bat b/windows/internal/build_conda.bat index 64313d039..d6e9c5b05 100644 --- a/windows/internal/build_conda.bat +++ b/windows/internal/build_conda.bat @@ -5,11 +5,5 @@ if errorlevel 1 exit /b 1 call windows/internal/cuda_install.bat if errorlevel 1 exit /b 1 -call windows/internal/nightly_defaults.bat Conda -if errorlevel 1 exit /b 1 - -set PYTORCH_FINAL_PACKAGE_DIR=%CD%\windows\output -if not exist "%PYTORCH_FINAL_PACKAGE_DIR%" mkdir %PYTORCH_FINAL_PACKAGE_DIR% - bash ./conda/build_pytorch.sh %CUDA_VERSION% %PYTORCH_BUILD_VERSION% %PYTORCH_BUILD_NUMBER% if errorlevel 1 exit /b 1 diff --git a/windows/internal/build_wheels.bat b/windows/internal/build_wheels.bat index d95cb4737..1aa2b3ef5 100644 --- a/windows/internal/build_wheels.bat +++ b/windows/internal/build_wheels.bat @@ -5,8 +5,5 @@ if errorlevel 1 exit /b 1 call windows/internal/cuda_install.bat if errorlevel 1 exit /b 1 -call windows/internal/nightly_defaults.bat Wheels -if errorlevel 1 exit /b 1 - call windows/build_pytorch.bat %CUDA_VERSION% %PYTORCH_BUILD_VERSION% %PYTORCH_BUILD_NUMBER% if errorlevel 1 exit /b 1 diff --git a/windows/internal/setup.bat b/windows/internal/setup.bat index 1e9e2065a..7b6a09000 100755 --- a/windows/internal/setup.bat +++ b/windows/internal/setup.bat @@ -75,14 +75,14 @@ IF "%DEBUG%" == "" ( 7z a -tzip "%LIBTORCH_PREFIX%-%PYTORCH_BUILD_VERSION%.zip" libtorch\* if not exist ..\output mkdir ..\output -copy /Y "%LIBTORCH_PREFIX%-%PYTORCH_BUILD_VERSION%.zip" ..\output\ -copy /Y "%LIBTORCH_PREFIX%-%PYTORCH_BUILD_VERSION%.zip" ..\output\%LIBTORCH_PREFIX%-latest.zip +copy /Y "%LIBTORCH_PREFIX%-%PYTORCH_BUILD_VERSION%.zip" "%PYTORCH_FINAL_PACKAGE_DIR%\" +copy /Y "%LIBTORCH_PREFIX%-%PYTORCH_BUILD_VERSION%.zip" "%PYTORCH_FINAL_PACKAGE_DIR%\%LIBTORCH_PREFIX%-latest.zip" goto build_end :pytorch :: This stores in e.g. D:/_work/1/s/windows/output/cpu -pip wheel -vvv -e . --no-deps --wheel-dir ../output +pip wheel -vvv -e . --no-deps --wheel-dir "%PYTORCH_FINAL_PACKAGE_DIR%" :build_end IF ERRORLEVEL 1 exit /b 1