From c98ab5c3e0379d8058384593698d5b7f3f03a907 Mon Sep 17 00:00:00 2001 From: Alexander Batashev Date: Thu, 17 Feb 2022 11:36:59 +0300 Subject: [PATCH 1/4] debug cache location --- .github/workflows/sycl_precommit.yml | 4 ++++ .github/workflows/sycl_windows_build_and_test.yml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/.github/workflows/sycl_precommit.yml b/.github/workflows/sycl_precommit.yml index 460413099e96d..14b283118d560 100644 --- a/.github/workflows/sycl_precommit.yml +++ b/.github/workflows/sycl_precommit.yml @@ -31,3 +31,7 @@ jobs: build_artifact_suffix: "default" build_cache_suffix: "default" lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9" + + linux_default: + name: Win + uses: ./.github/workflows/sycl_windows_build_and_test.yml diff --git a/.github/workflows/sycl_windows_build_and_test.yml b/.github/workflows/sycl_windows_build_and_test.yml index 1aff810052f2f..029be02608c35 100644 --- a/.github/workflows/sycl_windows_build_and_test.yml +++ b/.github/workflows/sycl_windows_build_and_test.yml @@ -59,7 +59,10 @@ jobs: CUDA_PATH: 'C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.6' CUDA_TOOLKIT_ROOT_DIR: 'C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.6' run: | + set SCCACHE_DIR=%GITHUB_WORKSPACE%\cache + set PATH=C:\ProgramData\chocolatey\lib\sccache\tools\sccache-v0.2.15-x86_64-pc-windows-msvc;%PATH% cmake --build build --target sycl-toolchain + sccache --show-stats - name: Install shell: cmd run: cmake --build build --target deploy-sycl-toolchain From 2b8d7a9afc946944dbcc16bdda6aa4513c36b477 Mon Sep 17 00:00:00 2001 From: Alexander Batashev Date: Thu, 17 Feb 2022 12:40:29 +0300 Subject: [PATCH 2/4] fix typo: --- .github/workflows/sycl_precommit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sycl_precommit.yml b/.github/workflows/sycl_precommit.yml index 14b283118d560..6e2057a5a0b79 100644 --- a/.github/workflows/sycl_precommit.yml +++ b/.github/workflows/sycl_precommit.yml @@ -32,6 +32,6 @@ jobs: build_cache_suffix: "default" lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9" - linux_default: + windows_default: name: Win uses: ./.github/workflows/sycl_windows_build_and_test.yml From 5b210ec87979d30e53c084419e1be6b57d71283d Mon Sep 17 00:00:00 2001 From: Alexander Batashev Date: Fri, 18 Feb 2022 10:52:22 +0300 Subject: [PATCH 3/4] revert test changes --- .github/workflows/sycl_precommit.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/sycl_precommit.yml b/.github/workflows/sycl_precommit.yml index 6e2057a5a0b79..460413099e96d 100644 --- a/.github/workflows/sycl_precommit.yml +++ b/.github/workflows/sycl_precommit.yml @@ -31,7 +31,3 @@ jobs: build_artifact_suffix: "default" build_cache_suffix: "default" lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9" - - windows_default: - name: Win - uses: ./.github/workflows/sycl_windows_build_and_test.yml From 7da07647df89c5f952bc6ee57c19b8582d648de6 Mon Sep 17 00:00:00 2001 From: Alexander Batashev Date: Tue, 22 Feb 2022 14:14:23 +0300 Subject: [PATCH 4/4] address comments --- .github/workflows/sycl_windows_build_and_test.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/sycl_windows_build_and_test.yml b/.github/workflows/sycl_windows_build_and_test.yml index 029be02608c35..4e798d4677cb0 100644 --- a/.github/workflows/sycl_windows_build_and_test.yml +++ b/.github/workflows/sycl_windows_build_and_test.yml @@ -33,7 +33,7 @@ jobs: key: sycl-win-build-${{ github.sha }} restore-keys: | sycl-win-build- - - name: Configure + - name: Build shell: cmd env: CUDA_PATH: 'C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.6' @@ -53,14 +53,6 @@ jobs: --cmake-opt="-DCMAKE_CXX_COMPILER_LAUNCHER=sccache" ^ --cmake-opt="-DCMAKE_C_COMPILER_LAUNCHER=sccache" ^ --cuda - - name: Build - shell: cmd - env: - CUDA_PATH: 'C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.6' - CUDA_TOOLKIT_ROOT_DIR: 'C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.6' - run: | - set SCCACHE_DIR=%GITHUB_WORKSPACE%\cache - set PATH=C:\ProgramData\chocolatey\lib\sccache\tools\sccache-v0.2.15-x86_64-pc-windows-msvc;%PATH% cmake --build build --target sycl-toolchain sccache --show-stats - name: Install