Use C++17

k2-fsa · Oct 9, 2023 · 60a229e · 60a229e
1 parent 697255c
commit 60a229e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -198,7 +198,7 @@ endif()
 
 # ========= Settings for CUB begin =========
 # the following settings are modified from cub/CMakeLists.txt
-set(CMAKE_CXX_STANDARD 14 CACHE STRING "The C++ version to be used.")
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 message(STATUS "C++ Standard version: ${CMAKE_CXX_STANDARD}")

diff --git a/cmake/torch.cmake b/cmake/torch.cmake
@@ -56,6 +56,10 @@ execute_process(
 
 message(STATUS "PyTorch version: ${TORCH_VERSION}")
 
+if(TORCH_VERSION VERSION_GREATER_EQUAL "2.1")
+  set(CMAKE_CXX_STANDARD 17)
+endif()
+
 if(K2_WITH_CUDA)
 
   execute_process(