From 6fdc7c512abd68b610ad50a94778f21f50b3681f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Siwek?= Date: Tue, 16 Dec 2025 12:42:56 +0000 Subject: [PATCH 1/3] remove macros --- cmake/SYCLTLA.cmake | 14 -------------- src/BuildOnLinux.cmake | 10 ++++++++-- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/cmake/SYCLTLA.cmake b/cmake/SYCLTLA.cmake index 6266abf6b4..2591fe0335 100644 --- a/cmake/SYCLTLA.cmake +++ b/cmake/SYCLTLA.cmake @@ -6,20 +6,6 @@ # # http://www.apache.org/licenses/LICENSE-2.0 -macro(replace_cmake_build_flags) - set(CMAKE_C_FLAG_BK "${CMAKE_C_FLAGS}") - set(CMAKE_CXX_FLAGS_BK "${CMAKE_CXX_FLAGS}") - string(REPLACE "-Werror=format" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") - string(REPLACE "-Werror=format" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - string(REPLACE "-Werror=unused-variable" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") - string(REPLACE "-Werror=unused-variable" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -endmacro() - -macro(restore_cmake_build_flags) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAG_BK}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_BK}") -endmacro() - if(NOT __SYCLTLA_INCLUDED) set(__SYCLTLA_INCLUDED TRUE) include(FetchContent) diff --git a/src/BuildOnLinux.cmake b/src/BuildOnLinux.cmake index 023d1ac4d7..1e67773142 100644 --- a/src/BuildOnLinux.cmake +++ b/src/BuildOnLinux.cmake @@ -71,7 +71,11 @@ endif() if(USE_SYCLTLA) set(REPLACE_FLAGS_FOR_SYCLTLA TRUE) set_build_flags() - replace_cmake_build_flags() + + set(CMAKE_C_FLAGS_BK "${CMAKE_C_FLAGS}") + set(CMAKE_CXX_FLAGS_BK "${CMAKE_CXX_FLAGS}") + string(APPEND CMAKE_C_FLAGS " -Werror=format -Werror=unused-variable") + string(APPEND CMAKE_CXX_FLAGS " -Werror=format -Werror=unused-variable") foreach(sycl_src ${ATen_XPU_SYCLTLA_SRCS}) get_filename_component(name ${sycl_src} NAME_WLE REALPATH) @@ -93,7 +97,9 @@ if(USE_SYCLTLA) set(REPLACE_FLAGS_FOR_SYCLTLA FALSE) set_build_flags() - restore_cmake_build_flags() + + set(CMAKE_C_FLAGS "${CMAKE_C_FLAG_BK}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_BK}") endif() set(SYCL_LINK_LIBRARIES_KEYWORD) From 32980be62c428a20f241c0206eb4252331cf44df Mon Sep 17 00:00:00 2001 From: Slawomir Siwek Date: Tue, 16 Dec 2025 15:20:01 +0100 Subject: [PATCH 2/3] Leave default flags --- src/BuildOnLinux.cmake | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/BuildOnLinux.cmake b/src/BuildOnLinux.cmake index 1e67773142..01f7ef548c 100644 --- a/src/BuildOnLinux.cmake +++ b/src/BuildOnLinux.cmake @@ -71,11 +71,6 @@ endif() if(USE_SYCLTLA) set(REPLACE_FLAGS_FOR_SYCLTLA TRUE) set_build_flags() - - set(CMAKE_C_FLAGS_BK "${CMAKE_C_FLAGS}") - set(CMAKE_CXX_FLAGS_BK "${CMAKE_CXX_FLAGS}") - string(APPEND CMAKE_C_FLAGS " -Werror=format -Werror=unused-variable") - string(APPEND CMAKE_CXX_FLAGS " -Werror=format -Werror=unused-variable") foreach(sycl_src ${ATen_XPU_SYCLTLA_SRCS}) get_filename_component(name ${sycl_src} NAME_WLE REALPATH) @@ -97,9 +92,6 @@ if(USE_SYCLTLA) set(REPLACE_FLAGS_FOR_SYCLTLA FALSE) set_build_flags() - - set(CMAKE_C_FLAGS "${CMAKE_C_FLAG_BK}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_BK}") endif() set(SYCL_LINK_LIBRARIES_KEYWORD) From 39d094ecb2d546dab4fff3b7b143a2d21804055f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Siwek?= Date: Tue, 16 Dec 2025 15:43:56 +0000 Subject: [PATCH 3/3] Leave Wno-unused-variable due to external ifdefs --- src/BuildOnLinux.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/BuildOnLinux.cmake b/src/BuildOnLinux.cmake index 01f7ef548c..2fc1f1fdd5 100644 --- a/src/BuildOnLinux.cmake +++ b/src/BuildOnLinux.cmake @@ -71,6 +71,8 @@ endif() if(USE_SYCLTLA) set(REPLACE_FLAGS_FOR_SYCLTLA TRUE) set_build_flags() + set(CMAKE_CXX_FLAGS_BK "${CMAKE_CXX_FLAGS}") + string(REPLACE "-Werror=unused-variable" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") foreach(sycl_src ${ATen_XPU_SYCLTLA_SRCS}) get_filename_component(name ${sycl_src} NAME_WLE REALPATH) @@ -92,6 +94,7 @@ if(USE_SYCLTLA) set(REPLACE_FLAGS_FOR_SYCLTLA FALSE) set_build_flags() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_BK}") endif() set(SYCL_LINK_LIBRARIES_KEYWORD)