From f61b7b4b215c3231b4b77b9b707bec3048573c9f Mon Sep 17 00:00:00 2001 From: xoviat Date: Tue, 31 Oct 2017 16:15:16 -0500 Subject: [PATCH 1/9] [appveyor] enable clcache --- appveyor.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 1c0474d2d..196b91727 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,6 +23,9 @@ skip_commits: # Add [av skip] to commit messages message: /\[av skip\]/ +cache: + - '%USERPROFILE%\clcache' + environment: matrix: - COMPILER: clang-cl @@ -39,8 +42,11 @@ install: before_build: - echo Running cmake... - cd c:\projects\OpenBLAS + - ps: If ($env:COMPILER -eq "clang-cl") { $env:PATH = "C:\Python36-x64;C:\Python36-x64\Scripts;$env:PATH;" } + - ps: If ($env:COMPILER -eq "clang-cl") { $env:CLCACHE_CL = "clang-cl" } + - ps: If ($env:COMPILER -eq "clang-cl") { pip install git+https://github.com/frerich/clcache.git } - if [%COMPILER%]==[cl] cmake -G "Visual Studio 12 Win64" . - - if [%COMPILER%]==[clang-cl] cmake -G "Ninja" -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl . + - if [%COMPILER%]==[clang-cl] cmake -G "Ninja" -DCMAKE_CXX_COMPILER=clcache -DCMAKE_C_COMPILER=clcache . - if [%DYNAMIC_ARCH%]==[ON] cmake -DDYNAMIC_ARCH=ON . build_script: From e06443e5ace087421476b9bb345b132157238855 Mon Sep 17 00:00:00 2001 From: xoviat Date: Tue, 31 Oct 2017 16:23:50 -0500 Subject: [PATCH 2/9] [appveyor] suppress failure --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 196b91727..7d5c2b033 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,9 +42,8 @@ install: before_build: - echo Running cmake... - cd c:\projects\OpenBLAS - - ps: If ($env:COMPILER -eq "clang-cl") { $env:PATH = "C:\Python36-x64;C:\Python36-x64\Scripts;$env:PATH;" } - ps: If ($env:COMPILER -eq "clang-cl") { $env:CLCACHE_CL = "clang-cl" } - - ps: If ($env:COMPILER -eq "clang-cl") { pip install git+https://github.com/frerich/clcache.git } + - ps: If ($env:COMPILER -eq "clang-cl") { pip install git+https://github.com/frerich/clcache.git; $LastExitCode=0 } - if [%COMPILER%]==[cl] cmake -G "Visual Studio 12 Win64" . - if [%COMPILER%]==[clang-cl] cmake -G "Ninja" -DCMAKE_CXX_COMPILER=clcache -DCMAKE_C_COMPILER=clcache . - if [%DYNAMIC_ARCH%]==[ON] cmake -DDYNAMIC_ARCH=ON . From 9e81791bc52eb7d226da75c2be653fae1458cab8 Mon Sep 17 00:00:00 2001 From: xoviat Date: Tue, 31 Oct 2017 16:29:01 -0500 Subject: [PATCH 3/9] [appveyor] fix environment --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7d5c2b033..f4b82e737 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,9 +42,9 @@ install: before_build: - echo Running cmake... - cd c:\projects\OpenBLAS - - ps: If ($env:COMPILER -eq "clang-cl") { $env:CLCACHE_CL = "clang-cl" } - - ps: If ($env:COMPILER -eq "clang-cl") { pip install git+https://github.com/frerich/clcache.git; $LastExitCode=0 } - - if [%COMPILER%]==[cl] cmake -G "Visual Studio 12 Win64" . + - set CLCACHE_CL=%COMPILER% + - ps: pip install git+https://github.com/frerich/clcache.git; $LastExitCode=0 + - if [%COMPILER%]==[cl] cmake -G "Visual Studio 12 Win64" -DCMAKE_CXX_COMPILER=clcache -DCMAKE_C_COMPILER=clcache . - if [%COMPILER%]==[clang-cl] cmake -G "Ninja" -DCMAKE_CXX_COMPILER=clcache -DCMAKE_C_COMPILER=clcache . - if [%DYNAMIC_ARCH%]==[ON] cmake -DDYNAMIC_ARCH=ON . From b51ef0c7a2e14894d14db33b75671858fbbd0045 Mon Sep 17 00:00:00 2001 From: xoviat Date: Tue, 31 Oct 2017 16:40:33 -0500 Subject: [PATCH 4/9] [appveyor] use -q --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f4b82e737..c64f9b69a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,7 +43,7 @@ before_build: - echo Running cmake... - cd c:\projects\OpenBLAS - set CLCACHE_CL=%COMPILER% - - ps: pip install git+https://github.com/frerich/clcache.git; $LastExitCode=0 + - pip install -q git+https://github.com/frerich/clcache.git - if [%COMPILER%]==[cl] cmake -G "Visual Studio 12 Win64" -DCMAKE_CXX_COMPILER=clcache -DCMAKE_C_COMPILER=clcache . - if [%COMPILER%]==[clang-cl] cmake -G "Ninja" -DCMAKE_CXX_COMPILER=clcache -DCMAKE_C_COMPILER=clcache . - if [%DYNAMIC_ARCH%]==[ON] cmake -DDYNAMIC_ARCH=ON . From 8eefc4fc5ec8405933956e93b13f173b3c4cff91 Mon Sep 17 00:00:00 2001 From: xoviat Date: Tue, 31 Oct 2017 16:41:19 -0500 Subject: [PATCH 5/9] [appveyor] set branch --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index c64f9b69a..34e64cbcf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,7 +43,7 @@ before_build: - echo Running cmake... - cd c:\projects\OpenBLAS - set CLCACHE_CL=%COMPILER% - - pip install -q git+https://github.com/frerich/clcache.git + - pip install -q git+https://github.com/xoviat/clcache.git@patch-1 - if [%COMPILER%]==[cl] cmake -G "Visual Studio 12 Win64" -DCMAKE_CXX_COMPILER=clcache -DCMAKE_C_COMPILER=clcache . - if [%COMPILER%]==[clang-cl] cmake -G "Ninja" -DCMAKE_CXX_COMPILER=clcache -DCMAKE_C_COMPILER=clcache . - if [%DYNAMIC_ARCH%]==[ON] cmake -DDYNAMIC_ARCH=ON . From f7c7dff720550e3465559ea1943266902cd14aa8 Mon Sep 17 00:00:00 2001 From: xoviat Date: Tue, 31 Oct 2017 16:51:49 -0500 Subject: [PATCH 6/9] [appveyor] set branch --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 34e64cbcf..46c40f74d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,7 +43,7 @@ before_build: - echo Running cmake... - cd c:\projects\OpenBLAS - set CLCACHE_CL=%COMPILER% - - pip install -q git+https://github.com/xoviat/clcache.git@patch-1 + - pip install -q git+https://github.com/xoviat/clcache.git@findCompiler - if [%COMPILER%]==[cl] cmake -G "Visual Studio 12 Win64" -DCMAKE_CXX_COMPILER=clcache -DCMAKE_C_COMPILER=clcache . - if [%COMPILER%]==[clang-cl] cmake -G "Ninja" -DCMAKE_CXX_COMPILER=clcache -DCMAKE_C_COMPILER=clcache . - if [%DYNAMIC_ARCH%]==[ON] cmake -DDYNAMIC_ARCH=ON . From a306cb9f4d30ba354d4a1f2c88d9a95ba179ddcc Mon Sep 17 00:00:00 2001 From: xoviat Date: Tue, 31 Oct 2017 16:56:44 -0500 Subject: [PATCH 7/9] [appveyor] move installation to install section --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 46c40f74d..cef130e3d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -38,12 +38,12 @@ install: - if [%COMPILER%]==[clang-cl] conda config --add channels conda-forge --force - if [%COMPILER%]==[clang-cl] conda install --yes clangdev ninja cmake - if [%COMPILER%]==[clang-cl] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 + - pip install -q git+https://github.com/xoviat/clcache.git@findCompiler before_build: - echo Running cmake... - cd c:\projects\OpenBLAS - set CLCACHE_CL=%COMPILER% - - pip install -q git+https://github.com/xoviat/clcache.git@findCompiler - if [%COMPILER%]==[cl] cmake -G "Visual Studio 12 Win64" -DCMAKE_CXX_COMPILER=clcache -DCMAKE_C_COMPILER=clcache . - if [%COMPILER%]==[clang-cl] cmake -G "Ninja" -DCMAKE_CXX_COMPILER=clcache -DCMAKE_C_COMPILER=clcache . - if [%DYNAMIC_ARCH%]==[ON] cmake -DDYNAMIC_ARCH=ON . From 4446dee89bc105458ec29baee64879894ab7b490 Mon Sep 17 00:00:00 2001 From: xoviat Date: Tue, 31 Oct 2017 17:02:40 -0500 Subject: [PATCH 8/9] [appveyor] save and cache --- appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index cef130e3d..fe521ee5f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,6 +27,8 @@ cache: - '%USERPROFILE%\clcache' environment: + global: + APPVEYOR_SAVE_CACHE_ON_ERROR: true matrix: - COMPILER: clang-cl DYNAMIC_ARCH: ON @@ -44,6 +46,8 @@ before_build: - echo Running cmake... - cd c:\projects\OpenBLAS - set CLCACHE_CL=%COMPILER% + - clcache -M 644245094 + - clcache -c - if [%COMPILER%]==[cl] cmake -G "Visual Studio 12 Win64" -DCMAKE_CXX_COMPILER=clcache -DCMAKE_C_COMPILER=clcache . - if [%COMPILER%]==[clang-cl] cmake -G "Ninja" -DCMAKE_CXX_COMPILER=clcache -DCMAKE_C_COMPILER=clcache . - if [%DYNAMIC_ARCH%]==[ON] cmake -DDYNAMIC_ARCH=ON . From 4e9dae32ebc29d4bda6351a6a15c581c7f8da4e0 Mon Sep 17 00:00:00 2001 From: xoviat Date: Tue, 31 Oct 2017 17:14:16 -0500 Subject: [PATCH 9/9] [appveyor] set branch --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index fe521ee5f..0ddb57598 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,7 +40,7 @@ install: - if [%COMPILER%]==[clang-cl] conda config --add channels conda-forge --force - if [%COMPILER%]==[clang-cl] conda install --yes clangdev ninja cmake - if [%COMPILER%]==[clang-cl] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - - pip install -q git+https://github.com/xoviat/clcache.git@findCompiler + - pip install -q git+https://github.com/xoviat/clcache.git@assembly before_build: - echo Running cmake...