Don't use nightly_defaults.bat from builder (#439)

pytorch · Apr 14, 2020 · 96c8878 · 96c8878
1 parent 109bfd4
commit 96c8878
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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