[kineto] Update to C++17 and make Config::kControllerIntervalMsecs in…

…line PyTorch is on C++17 now, so Kineto should be too kControllerIntervalMsecs
pytorch · Jul 25, 2023 · 8154dec · 8154dec
1 parent 9af4ea4
commit 8154dec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/libkineto/CMakeLists.txt b/libkineto/CMakeLists.txt
@@ -82,17 +82,17 @@ add_custom_target(libkineto_defs.bzl DEPENDS libkineto_defs.bzl)
 add_dependencies(kineto_base libkineto_defs.bzl)
 
 set_target_properties(kineto_base kineto_api PROPERTIES
-      CXX_STANDARD 14
+      CXX_STANDARD 17
       CXX_STANDARD_REQUIRED YES
       CXX_EXTENSIONS NO)
 
 set(KINETO_COMPILE_OPTIONS "-DKINETO_NAMESPACE=libkineto")
 list(APPEND KINETO_COMPILE_OPTIONS "-DFMT_HEADER_ONLY")
 list(APPEND KINETO_COMPILE_OPTIONS "-DENABLE_IPC_FABRIC")
 if(NOT MSVC)
-  list(APPEND KINETO_COMPILE_OPTIONS "-std=c++14")
+  list(APPEND KINETO_COMPILE_OPTIONS "-std=c++17")
 else()
-  list(APPEND KINETO_COMPILE_OPTIONS "/std:c++14")
+  list(APPEND KINETO_COMPILE_OPTIONS "/std:c++17")
   list(APPEND KINETO_COMPILE_OPTIONS "-DWIN32_LEAN_AND_MEAN")
   list(APPEND KINETO_COMPILE_OPTIONS "-DNOGDI")
 endif()

diff --git a/libkineto/src/Config.cpp b/libkineto/src/Config.cpp
@@ -32,7 +32,7 @@ using std::vector;
 
 namespace KINETO_NAMESPACE {
 
-#if __clang__ && __cplusplus < 201703L
+#if __cplusplus < 201703L
 constexpr std::chrono::milliseconds Config::kControllerIntervalMsecs;
 #endif