Code refactor

windows/cuda100.bat

@@ -17,14 +17,14 @@ set NO_CUDA=
 set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
 
 IF "%NVTOOLSEXT_PATH%"=="" (
-    echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed, disabling CUDA
-    set NO_CUDA=1
+    echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed, failing
+    exit /b 1
     goto optcheck
 )
 
 IF "%CUDA_PATH_V10_0%"=="" (
-    echo CUDA 10.0 not found, disabling it
-    set NO_CUDA=1
+    echo CUDA 10.0 not found, failing
+    exit /b 1
 ) ELSE (
     set TORCH_CUDA_ARCH_LIST=3.5;5.0+PTX;6.0;6.1;7.0;7.5
     set TORCH_NVCC_FLAGS=-Xfatbin -compress-all

windows/cuda80.bat

@@ -17,18 +17,18 @@ set NO_CUDA=
 set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
 
 IF "%NVTOOLSEXT_PATH%"=="" (
-    echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed, disabling CUDA
-    set NO_CUDA=1
+    echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed, failing
+    exit /b 1
     goto optcheck
 )
 
 IF "%CUDA_PATH_V8_0%"=="" (
-    echo CUDA 8 not found, disabling it
-    set NO_CUDA=1
+    echo CUDA 8 not found, failing
+    exit /b 1
 ) ELSE (
     IF "%VS140COMNTOOLS%"=="" (
-        echo CUDA 8 found, but VS2015 not found, disabling it
-        set NO_CUDA=1
+        echo CUDA 8 found, but VS2015 not found, failing
+        exit /b 1
     ) ELSE (
         set TORCH_CUDA_ARCH_LIST=3.5;5.0+PTX;6.0;6.1
         set TORCH_NVCC_FLAGS=-Xfatbin -compress-all

windows/cuda90.bat

@@ -17,14 +17,14 @@ set NO_CUDA=
 set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
 
 IF "%NVTOOLSEXT_PATH%"=="" (
-    echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed, disabling CUDA
-    set NO_CUDA=1
+    echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed, failing
+    exit /b 1
     goto optcheck
 )
 
 IF "%CUDA_PATH_V9_0%"=="" (
-    echo CUDA 9 not found, disabling it
-    set NO_CUDA=1
+    echo CUDA 9 not found, failing
+    exit /b 1
 ) ELSE (
     set TORCH_CUDA_ARCH_LIST=3.5;5.0+PTX;6.0;7.0
     set TORCH_NVCC_FLAGS=-Xfatbin -compress-all

windows/cuda91.bat → windows/old/cuda91.bat

@@ -1,47 +1,47 @@
-@echo off
-
-IF NOT EXIST "setup.py" IF NOT EXIST "pytorch" (
-    call internal\clone.bat
-    cd ..
-    IF ERRORLEVEL 1 goto eof
-) ELSE (
-    call internal\clean.bat
-)
-
-call internal\check_deps.bat
-IF ERRORLEVEL 1 goto eof
-
-REM Check for optional components
-
-set NO_CUDA=
-set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
-
-IF "%NVTOOLSEXT_PATH%"=="" (
-    echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed, disabling CUDA
-    set NO_CUDA=1
-    goto optcheck
-)
-
-IF "%CUDA_PATH_V9_1%"=="" (
-    echo CUDA 9.1 not found, disabling it
-    set NO_CUDA=1
-) ELSE (
-    set TORCH_CUDA_ARCH_LIST=3.5;5.0+PTX;6.0;6.1;7.0
-    set TORCH_NVCC_FLAGS=-Xfatbin -compress-all
-
-    set "CUDA_PATH=%CUDA_PATH_V9_1%"
-    set "PATH=%CUDA_PATH_V9_1%\bin;%PATH%"
-)
-
-:optcheck
-
-call internal\check_opts.bat
-IF ERRORLEVEL 1 goto eof
-
-call internal\copy.bat
-IF ERRORLEVEL 1 goto eof
-
-call internal\setup.bat
-IF ERRORLEVEL 1 goto eof
-
-:eof
+@echo off
+
+IF NOT EXIST "setup.py" IF NOT EXIST "pytorch" (
+    call internal\clone.bat
+    cd ..
+    IF ERRORLEVEL 1 goto eof
+) ELSE (
+    call internal\clean.bat
+)
+
+call internal\check_deps.bat
+IF ERRORLEVEL 1 goto eof
+
+REM Check for optional components
+
+set NO_CUDA=
+set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
+
+IF "%NVTOOLSEXT_PATH%"=="" (
+    echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed, disabling CUDA
+    set NO_CUDA=1
+    goto optcheck
+)
+
+IF "%CUDA_PATH_V9_1%"=="" (
+    echo CUDA 9.1 not found, disabling it
+    set NO_CUDA=1
+) ELSE (
+    set TORCH_CUDA_ARCH_LIST=3.5;5.0+PTX;6.0;6.1;7.0
+    set TORCH_NVCC_FLAGS=-Xfatbin -compress-all
+
+    set "CUDA_PATH=%CUDA_PATH_V9_1%"
+    set "PATH=%CUDA_PATH_V9_1%\bin;%PATH%"
+)
+
+:optcheck
+
+call internal\check_opts.bat
+IF ERRORLEVEL 1 goto eof
+
+call internal\copy.bat
+IF ERRORLEVEL 1 goto eof
+
+call internal\setup.bat
+IF ERRORLEVEL 1 goto eof
+
+:eof

windows/cuda92.bat → windows/old/cuda92.bat

@@ -1,47 +1,47 @@
-@echo off
-
-IF NOT EXIST "setup.py" IF NOT EXIST "pytorch" (
-    call internal\clone.bat
-    cd ..
-    IF ERRORLEVEL 1 goto eof
-) ELSE (
-    call internal\clean.bat
-)
-
-call internal\check_deps.bat
-IF ERRORLEVEL 1 goto eof
-
-REM Check for optional components
-
-set NO_CUDA=
-set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
-
-IF "%NVTOOLSEXT_PATH%"=="" (
-    echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed, disabling CUDA
-    set NO_CUDA=1
-    goto optcheck
-)
-
-IF "%CUDA_PATH_V9_2%"=="" (
-    echo CUDA 9.2 not found, disabling it
-    set NO_CUDA=1
-) ELSE (
-    set TORCH_CUDA_ARCH_LIST=3.5;5.0+PTX;6.0;6.1;7.0
-    set TORCH_NVCC_FLAGS=-Xfatbin -compress-all
-
-    set "CUDA_PATH=%CUDA_PATH_V9_2%"
-    set "PATH=%CUDA_PATH_V9_2%\bin;%PATH%"
-)
-
-:optcheck
-
-call internal\check_opts.bat
-IF ERRORLEVEL 1 goto eof
-
-call internal\copy.bat
-IF ERRORLEVEL 1 goto eof
-
-call internal\setup.bat
-IF ERRORLEVEL 1 goto eof
-
-:eof
+@echo off
+
+IF NOT EXIST "setup.py" IF NOT EXIST "pytorch" (
+    call internal\clone.bat
+    cd ..
+    IF ERRORLEVEL 1 goto eof
+) ELSE (
+    call internal\clean.bat
+)
+
+call internal\check_deps.bat
+IF ERRORLEVEL 1 goto eof
+
+REM Check for optional components
+
+set NO_CUDA=
+set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
+
+IF "%NVTOOLSEXT_PATH%"=="" (
+    echo NVTX ^(Visual Studio Extension ^for CUDA^) ^not installed, disabling CUDA
+    set NO_CUDA=1
+    goto optcheck
+)
+
+IF "%CUDA_PATH_V9_2%"=="" (
+    echo CUDA 9.2 not found, disabling it
+    set NO_CUDA=1
+) ELSE (
+    set TORCH_CUDA_ARCH_LIST=3.5;5.0+PTX;6.0;6.1;7.0
+    set TORCH_NVCC_FLAGS=-Xfatbin -compress-all
+
+    set "CUDA_PATH=%CUDA_PATH_V9_2%"
+    set "PATH=%CUDA_PATH_V9_2%\bin;%PATH%"
+)
+
+:optcheck
+
+call internal\check_opts.bat
+IF ERRORLEVEL 1 goto eof
+
+call internal\copy.bat
+IF ERRORLEVEL 1 goto eof
+
+call internal\setup.bat
+IF ERRORLEVEL 1 goto eof
+
+:eof

windows/templates/auth_task.yml

@@ -0,0 +1,17 @@
+jobs:
+- job: 'VSTS_Auth_Task'
+  timeoutInMinutes: 5
+  cancelTimeoutInMinutes: 5
+  variables:
+  - group: 'peterjc-vsts-token'
+
+  pool:
+    vmImage: 'win1803'
+
+  steps:
+  - checkout: self
+    clean: true
+
+  - template: vsts_auth.yml
+    parameters:
+      auth: $(vsts_auth)

windows/templates/build_conda.yml

@@ -0,0 +1,12 @@
+parameters:
+  msagent: false
+
+steps:
+- script: 'if not exist %PYTORCH_FINAL_PACKAGE_DIR% mkdir %PYTORCH_FINAL_PACKAGE_DIR%'
+  displayName: 'Create final package directory'
+
+- bash: './conda/build_pytorch.sh $CUDA_VERSION $PYTORCH_BUILD_VERSION $PYTORCH_BUILD_NUMBER'
+  displayName: Build
+  env:
+    ${{ if eq(parameters.msagent, True) }}:
+      MAX_JOBS: 2