diff --git a/.github/actions/setup-pytorch/action.yml b/.github/actions/setup-pytorch/action.yml index 94aa14cad1..24ffb09cdd 100644 --- a/.github/actions/setup-pytorch/action.yml +++ b/.github/actions/setup-pytorch/action.yml @@ -78,7 +78,7 @@ runs: shell: bash env: # Increase this value to reset cache - CACHE_NUMBER: 18 + CACHE_NUMBER: 19 run: | ONEAPI_LINK=$(readlink /opt/intel/oneapi || true) ONEAPI_KEY=$(sha256sum /opt/intel/installed.txt 2> /dev/null | cut -d\ -f1 || true) @@ -124,6 +124,12 @@ runs: # FIXME: Compatibility with versions of CMake older than 3.5 has been removed, this brakes compilation of third_party/protobuf: # CMake Error at third_party/protobuf/cmake/CMakeLists.txt:2 (cmake_minimum_required) pip install 'cmake<4.0.0' + # Try to avoid the following error: + # A module that was compiled using NumPy 1.x cannot be run in + # NumPy 2.2.6 as it may crash. To support both 1.x and 2.x + # versions of NumPy, modules must be compiled with NumPy 2.0. + # Some module may need to rebuild instead e.g. with 'pybind11>=2.12'. + pip install 'numpy>2.0' pip install -r requirements.txt USE_XCCL=1 USE_STATIC_MKL=1 python -m build --wheel --no-isolation 2>&1 | grep -v \ "Double arithmetic operation is not supported on this platform with FP64 conversion emulation mode (poison FP64 kernels is enabled)." | grep -v '^$' diff --git a/benchmarks/cutlass_kernel/CMakeLists.txt b/benchmarks/cutlass_kernel/CMakeLists.txt index b6999741ce..06343f1803 100644 --- a/benchmarks/cutlass_kernel/CMakeLists.txt +++ b/benchmarks/cutlass_kernel/CMakeLists.txt @@ -58,7 +58,7 @@ add_custom_target(generate_gemm_config DEPENDS ${GEMM_CONFIG_OUTPUT}) Python3_add_library(cutlass_kernel MODULE WITH_SOABI python_main.cpp) -target_compile_options(cutlass_kernel PRIVATE "-fsycl" "-fsycl-targets=intel_gpu_pvc,intel_gpu_bmg_g21" "-fpreview-breaking-changes") +target_compile_options(cutlass_kernel PRIVATE "-fsycl" "-fsycl-targets=intel_gpu_pvc,intel_gpu_bmg_g21") target_compile_options(cutlass_kernel PRIVATE "-DCUTLASS_ENABLE_SYCL") target_compile_options(cutlass_kernel PRIVATE "-DSYCL_INTEL_TARGET") target_compile_definitions(cutlass_kernel PRIVATE GEMM_CONFIG_HEADER=\"${GEMM_CONFIG_OUTPUT}\") diff --git a/benchmarks/onednn_kernel/CMakeLists.txt b/benchmarks/onednn_kernel/CMakeLists.txt index cbd499ed69..b8f3ca11c3 100644 --- a/benchmarks/onednn_kernel/CMakeLists.txt +++ b/benchmarks/onednn_kernel/CMakeLists.txt @@ -5,7 +5,7 @@ set(oneDNN_KERNEL_FLAGS ${oneDNN_KERNEL_FLAGS} Python3_add_library(onednn_kernel MODULE WITH_SOABI python_main.cpp) -target_compile_options(onednn_kernel PRIVATE "-fsycl" "-fpreview-breaking-changes") +target_compile_options(onednn_kernel PRIVATE "-fsycl") target_compile_options(onednn_kernel PRIVATE "-DDNNL_CPU_RUNTIME=SYCL") target_compile_options(onednn_kernel PRIVATE "-DDNNL_GPU_RUNTIME=SYCL") diff --git a/benchmarks/xetla_kernel/CMakeLists.txt b/benchmarks/xetla_kernel/CMakeLists.txt index 4646e97fe2..29debdc043 100644 --- a/benchmarks/xetla_kernel/CMakeLists.txt +++ b/benchmarks/xetla_kernel/CMakeLists.txt @@ -27,7 +27,7 @@ endif() Python3_add_library(xetla_kernel MODULE WITH_SOABI python_main.cpp) target_compile_options(xetla_kernel PRIVATE "-fPIC") -target_compile_options(xetla_kernel PRIVATE "-fsycl" "-fpreview-breaking-changes") +target_compile_options(xetla_kernel PRIVATE "-fsycl") target_compile_options(xetla_kernel PUBLIC "-DXETPP_NEW_XMAIN") target_link_options(xetla_kernel PRIVATE ${XETLA_KERNEL_FLAGS}) target_link_libraries(xetla_kernel PUBLIC ${TORCH_LIBRARIES} ${TORCH_PYTHON_LIBRARY}) diff --git a/utils/SPIRVRunner/CMakeLists.txt b/utils/SPIRVRunner/CMakeLists.txt index efba0e0e2c..737aef61e6 100644 --- a/utils/SPIRVRunner/CMakeLists.txt +++ b/utils/SPIRVRunner/CMakeLists.txt @@ -35,9 +35,7 @@ ExternalProject_Add( ) set(JSON_INCLUDE_DIR ${CMAKE_BINARY_DIR}/nlohmann_json/src/json/include/) -# Add preview-breaking-changes for ABI compatibility with SYCL library linked by PyTorch: -# https://github.com/pytorch/pytorch/commit/92bebb46fa9fd60523d8aeb7b5f1a3f488c4cd93 -set(COMPILE_FLAGS "-fsycl -Wall -fpreview-breaking-changes") +set(COMPILE_FLAGS "-fsycl -Wall") set(LINK_FLAGS "-fsycl -lze_loader") set(SYCL_FUNCTIONS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../third_party/intel/backend/include")