diff --git a/.github/workflows/_windows_ut.yml b/.github/workflows/_windows_ut.yml index 33e86b1d23..efaad6497b 100644 --- a/.github/workflows/_windows_ut.yml +++ b/.github/workflows/_windows_ut.yml @@ -72,6 +72,9 @@ jobs: call conda install -y libuv call conda install -y rust git config --system core.longpaths true + git config --global core.symlinks true + git config --global core.fsmonitor false + powershell -Command "Set-ItemProperty -Path "HKLM:\\SYSTEM\CurrentControlSet\Control\FileSystem" -Name "LongPathsEnabled" -Value 1" git status git show -s git submodule sync && git submodule update --init --recursive @@ -106,7 +109,7 @@ jobs: set MAX_JOBS=4 python setup.py bdist_wheel > build_torch_wheel_log.log echo "[INFO] begin to install torch whls" - for /r C:\runner\actions-runner\_work\torch-xpu-ops\pytorch\dist %%i in (torch*.whl) do ( + for /r C:\actions-runner\_work\torch-xpu-ops\pytorch\dist %%i in (torch*.whl) do ( set TORCH_WHL=%%i ) echo "[INFO] the torch version is %TORCH_WHL%" @@ -127,14 +130,14 @@ jobs: uses: actions/upload-artifact@v4 with: name: Torch-XPU-Windows-Log-${{ github.event.pull_request.number || github.sha }} - path: 'C:\runner\actions-runner\_work\torch-xpu-ops\pytorch\build_torch_wheel_log.log' + path: 'C:\actions-runner\_work\torch-xpu-ops\pytorch\build_torch_wheel_log.log' - name: Upload Windows binary if: ${{ ! cancelled() }} uses: actions/upload-artifact@v4 with: name: Torch-XPU-Windows-Binary-${{ github.event.pull_request.number || github.sha }} - path: 'C:\runner\actions-runner\_work\torch-xpu-ops\pytorch\dist' + path: 'C:\actions-runner\_work\torch-xpu-ops\pytorch\dist' - name: Run XPU OP Extended UT if: contains(inputs.ut, 'op_extended') || github.event_name == 'schedule' diff --git a/cmake/Modules/FindSYCL.cmake b/cmake/Modules/FindSYCL.cmake index b7ca5ff03e..1ea4263f2b 100644 --- a/cmake/Modules/FindSYCL.cmake +++ b/cmake/Modules/FindSYCL.cmake @@ -263,8 +263,12 @@ macro(SYCL_WRAP_SRCS sycl_target generated_files) set(SYCL_compile_output_dir "${SYCL_compile_intermediate_directory}") get_filename_component( basename ${file} NAME ) - set(generated_file_path "${SYCL_compile_output_dir}/${CMAKE_CFG_INTDIR}") - set(generated_file_basename "${sycl_target}_gen_${basename}${generated_extension}") + if(CMAKE_CFG_INTDIR STREQUAL ".") + set(generated_file_path "${SYCL_compile_output_dir}") + else() + set(generated_file_path "${SYCL_compile_output_dir}/${CMAKE_CFG_INTDIR}") + endif() + set(generated_file_basename "${sycl_target}_${basename}${generated_extension}") set(generated_file "${generated_file_path}/${generated_file_basename}") set(SYCL_generated_dependency_file "${SYCL_compile_intermediate_directory}/${generated_file_basename}.SYCL-depend") # generate by compiler options -M -MF set(cmake_dependency_file "${SYCL_compile_intermediate_directory}/${generated_file_basename}.depend") # parse and convert SYCL_generated_dependency_file(compiler format) to cmake format