Use sccache-cl instead of sccache (pytorch#422)

KyleCZH · Mar 24, 2020 · d5a1241 · d5a1241
1 parent 7ec2fd4
commit d5a1241
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/conda/pytorch-nightly/bld.bat b/conda/pytorch-nightly/bld.bat
@@ -38,6 +38,7 @@ set LIB=%SRC_DIR%\mkl\lib;%LIB%
 IF "%USE_SCCACHE%" == "1" (
     mkdir %SRC_DIR%\tmp_bin
     curl -k https://s3.amazonaws.com/ossci-windows/sccache.exe --output %SRC_DIR%\tmp_bin\sccache.exe
+    curl -k https://s3.amazonaws.com/ossci-windows/sccache-cl.exe --output %SRC_DIR%\tmp_bin\sccache-cl.exe
     copy %SRC_DIR%\tmp_bin\sccache.exe %SRC_DIR%\tmp_bin\nvcc.exe
     set "PATH=%SRC_DIR%\tmp_bin;%PATH%"
     set SCCACHE_IDLE_TIMEOUT=1500
@@ -74,8 +75,8 @@ sccache --stop-server
 sccache --start-server
 sccache --zero-stats
 
-set CC=sccache cl
-set CXX=sccache cl
+set CC=sccache-cl
+set CXX=sccache-cl
 
 :sccache_end
 

diff --git a/windows/build_pytorch.bat b/windows/build_pytorch.bat
@@ -94,6 +94,7 @@ if not "%CUDA_VERSION%" == "cpu" (
 if "%USE_SCCACHE%" == "1" (
     mkdir %CD%\tmp_bin
     curl -k https://s3.amazonaws.com/ossci-windows/sccache.exe --output %CD%\tmp_bin\sccache.exe
+    curl -k https://s3.amazonaws.com/ossci-windows/sccache-cl.exe --output %CD%\tmp_bin\sccache-cl.exe
     if not "%CUDA_VERSION%" == "" (
         copy %CD%\tmp_bin\sccache.exe %CD%\tmp_bin\nvcc.exe
 

diff --git a/windows/internal/check_opts.bat b/windows/internal/check_opts.bat
@@ -17,6 +17,15 @@ IF NOT ERRORLEVEL 1 (
     set CXX=clcache
 )
 
+where /q sccache-cl.exe
+
+IF NOT ERRORLEVEL 1 (
+    echo sccache-cl found, using it to speed up builds
+    set CC=sccache-cl
+    set CXX=sccache-cl
+    goto sccache_end
+)
+
 where /q sccache.exe
 
 IF NOT ERRORLEVEL 1 (
@@ -25,6 +34,8 @@ IF NOT ERRORLEVEL 1 (
     set CXX=sccache cl
 )
 
+:sccache_end
+
 IF exist "%MKLProductDir%\mkl\lib\intel64_win" (
     echo MKL found, adding it to build
     set "LIB=%MKLProductDir%\mkl\lib\intel64_win;%MKLProductDir%\compiler\lib\intel64_win;%LIB%";