Merge jobs

pytorch · Apr 3, 2020 · 86f87e4 · 86f87e4
1 parent 68e098a
commit 86f87e4
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 74 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -238,60 +238,35 @@ jobs:
     <<: *binary_windows
     executor:
       name: win/default
-      shell: bash.exe
+      shell: cmd.exe
     steps:
       - checkout_merge
-      - run:
-          name: Install VS2017
-          command: |
-            if [[ "${VC_YEAR}" == "2017" ]]; then
-              powershell packaging/windows/internal/vs_install.ps1
-            fi
-      - run:
-          name: Install CUDA
-          command: |
-            ./packaging/windows/internal/cuda_install.bat
-      - run:
-          name: Setup nightly variables
-          command: |
-            call ./packaging/windows/internal/nightly_defaults.bat Conda
-          shell: cmd.exe
       - run:
           name: Build conda packages
           command: |
-            export PYTORCH_FINAL_PACKAGE_DIR="$CD\\packaging\\windows\\output"
-            mkdir -p $PYTORCH_FINAL_PACKAGE_DIR
-            ./packaging/conda/build_vision.sh $CUDA_VERSION $TORCHVISION_BUILD_VERSION $TORCHVISION_BUILD_NUMBER
+            if "%VC_YEAR%" == "2017" powershell packaging/windows/internal/vs_install.ps1
+            call packaging/windows/internal/cuda_install.bat
+            call packaging/windows/internal/nightly_defaults.bat Conda
+            set PYTORCH_FINAL_PACKAGE_DIR=%CD%\packaging\windows\output
+            if not exist "%PYTORCH_FINAL_PACKAGE_DIR%" mkdir %PYTORCH_FINAL_PACKAGE_DIR%
+            bash ./packaging/conda/build_vision.sh $CUDA_VERSION $TORCHVISION_BUILD_VERSION $TORCHVISION_BUILD_NUMBER
       - store_test_results:
           path: build_results/
 
   binary_win_wheel_release:
     <<: *binary_windows
     executor:
       name: win/default
-      shell: bash.exe
+      shell: cmd.exe
     steps:
       - checkout_merge
       - run:
-          name: Install VS2017
-          command: |
-            if [[ "${VC_YEAR}" == "2017" ]]; then
-              powershell packaging/windows/internal/vs_install.ps1
-            fi
-      - run:
-          name: Install CUDA
-          command: |
-            ./packaging/windows/internal/cuda_install.bat
-      - run:
-          name: Setup nightly variables
-          command: |
-            call ./packaging/windows/internal/nightly_defaults.bat Wheels
-          shell: cmd.exe
-      - run:
-          name: Build wheels packages
+          name: Build wheel packages
           command: |
+            if "%VC_YEAR%" == "2017" powershell packaging/windows/internal/vs_install.ps1
+            call packaging/windows/internal/cuda_install.bat
+            call packaging/windows/internal/nightly_defaults.bat Conda
             call packaging/windows/build_vision.bat %CUDA_VERSION% %TORCHVISION_BUILD_VERSION% %TORCHVISION_BUILD_NUMBER%
-          shell: cmd.exe
       - store_test_results:
           path: build_results/
 

diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in
@@ -238,60 +238,35 @@ jobs:
     <<: *binary_windows
     executor:
       name: win/default
-      shell: bash.exe
+      shell: cmd.exe
     steps:
       - checkout_merge
-      - run:
-          name: Install VS2017
-          command: |
-            if [[ "${VC_YEAR}" == "2017" ]]; then
-              powershell packaging/windows/internal/vs_install.ps1
-            fi
-      - run:
-          name: Install CUDA
-          command: |
-            ./packaging/windows/internal/cuda_install.bat
-      - run:
-          name: Setup nightly variables
-          command: |
-            call ./packaging/windows/internal/nightly_defaults.bat Conda
-          shell: cmd.exe
       - run:
           name: Build conda packages
           command: |
-            export PYTORCH_FINAL_PACKAGE_DIR="$CD\\packaging\\windows\\output"
-            mkdir -p $PYTORCH_FINAL_PACKAGE_DIR
-            ./packaging/conda/build_vision.sh $CUDA_VERSION $TORCHVISION_BUILD_VERSION $TORCHVISION_BUILD_NUMBER
+            if "%VC_YEAR%" == "2017" powershell packaging/windows/internal/vs_install.ps1
+            call packaging/windows/internal/cuda_install.bat
+            call packaging/windows/internal/nightly_defaults.bat Conda
+            set PYTORCH_FINAL_PACKAGE_DIR=%CD%\packaging\windows\output
+            if not exist "%PYTORCH_FINAL_PACKAGE_DIR%" mkdir %PYTORCH_FINAL_PACKAGE_DIR%
+            bash ./packaging/conda/build_vision.sh $CUDA_VERSION $TORCHVISION_BUILD_VERSION $TORCHVISION_BUILD_NUMBER
       - store_test_results:
           path: build_results/
 
   binary_win_wheel_release:
     <<: *binary_windows
     executor:
       name: win/default
-      shell: bash.exe
+      shell: cmd.exe
     steps:
       - checkout_merge
       - run:
-          name: Install VS2017
-          command: |
-            if [[ "${VC_YEAR}" == "2017" ]]; then
-              powershell packaging/windows/internal/vs_install.ps1
-            fi
-      - run:
-          name: Install CUDA
-          command: |
-            ./packaging/windows/internal/cuda_install.bat
-      - run:
-          name: Setup nightly variables
-          command: |
-            call ./packaging/windows/internal/nightly_defaults.bat Wheels
-          shell: cmd.exe
-      - run:
-          name: Build wheels packages
+          name: Build wheel packages
           command: |
+            if "%VC_YEAR%" == "2017" powershell packaging/windows/internal/vs_install.ps1
+            call packaging/windows/internal/cuda_install.bat
+            call packaging/windows/internal/nightly_defaults.bat Conda
             call packaging/windows/build_vision.bat %CUDA_VERSION% %TORCHVISION_BUILD_VERSION% %TORCHVISION_BUILD_NUMBER%
-          shell: cmd.exe
       - store_test_results:
           path: build_results/
 

diff --git a/packaging/windows/internal/vs_install.ps1 b/packaging/windows/internal/vs_install.ps1
@@ -16,6 +16,8 @@ if ($LASTEXITCODE -ne 0) {
     exit 1
 }
 
+$env:VSDEVCMD_ARGS="-vcvars_ver=14.11"
+
 $process = Start-Process "${PWD}\vs_installer.exe" -ArgumentList $VS_INSTALL_ARGS -NoNewWindow -Wait -PassThru
 Remove-Item -Path vs_installer.exe -Force
 $exitCode = $process.ExitCode