Defaults to C++20 for torch targets

cyyever · pytorchmergebot · commit db21f788aec7 · 2025-08-10T04:21:57.000Z
Signed-off-by: cyy &lt;cyyever@outlook.com&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1027,6 +1027,8 @@ if(NOT MSVC)
   append_cxx_flag_if_supported("-Wno-strict-overflow" CMAKE_CXX_FLAGS)
   append_cxx_flag_if_supported("-Wno-strict-aliasing" CMAKE_CXX_FLAGS)
   append_cxx_flag_if_supported("-Wno-stringop-overflow" CMAKE_CXX_FLAGS)
+  append_cxx_flag_if_supported("-Wno-deprecated-enum-enum-conversion" CMAKE_CXX_FLAGS)
+  append_cxx_flag_if_supported("-Wno-error=deprecated-enum-enum-conversion" CMAKE_CXX_FLAGS)
   append_cxx_flag_if_supported("-Wvla-extension" CMAKE_CXX_FLAGS)
   append_cxx_flag_if_supported("-Wsuggest-override" CMAKE_CXX_FLAGS)
   append_cxx_flag_if_supported("-Wnewline-eof" CMAKE_CXX_FLAGS)
diff --git a/cmake/public/utils.cmake b/cmake/public/utils.cmake
@@ -337,7 +337,7 @@ endmacro()
 # Usage:
 #   torch_compile_options(lib_name)
 function(torch_compile_options libname)
-  set_property(TARGET ${libname} PROPERTY CXX_STANDARD 17)
+  set_property(TARGET ${libname} PROPERTY CXX_STANDARD 20)
 
   # until they can be unified, keep these lists synced with setup.py
   if(MSVC)
@@ -384,9 +384,12 @@ function(torch_compile_options libname)
       )
     if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
       list(APPEND private_compile_options -Wredundant-move)
+      list(APPEND private_compile_options -Wno-error=deprecated-declarations -Wno-error=redundant-move)
     endif()
     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
       list(APPEND private_compile_options -Wextra-semi -Wmove)
+      list(APPEND private_compile_options -Wno-return-std-move)
+      list(APPEND private_compile_options -Wno-deprecated-enum-enum-conversion -Wno-ambiguous-reversed-operator)
     else()
       list(APPEND private_compile_options
         # Considered to be flaky.  See the discussion at
