Fix tests

Signed-off-by: cyy <[email protected]>

Author: cyyever

libkineto/CMakeLists.txt

@@ -122,10 +122,7 @@ set(KINETO_COMPILE_OPTIONS "-DKINETO_NAMESPACE=libkineto")
 list(APPEND KINETO_COMPILE_OPTIONS "-DFMT_HEADER_ONLY")
 list(APPEND KINETO_COMPILE_OPTIONS "-DENABLE_IPC_FABRIC")
 list(APPEND KINETO_COMPILE_OPTIONS)
-if(NOT MSVC)
-  list(APPEND KINETO_COMPILE_OPTIONS "-std=c++17")
-else()
-  list(APPEND KINETO_COMPILE_OPTIONS "/std:c++17")
+if(MSVC)
   list(APPEND KINETO_COMPILE_OPTIONS "-DWIN32_LEAN_AND_MEAN")
   list(APPEND KINETO_COMPILE_OPTIONS "-DNOGDI")
 endif()
@@ -147,24 +144,6 @@ endif()
 target_compile_options(kineto_base PRIVATE "${KINETO_COMPILE_OPTIONS}")
 target_compile_options(kineto_api PRIVATE "${KINETO_COMPILE_OPTIONS}")
 
-if(NOT TARGET fmt)
-  if(NOT FMT_SOURCE_DIR)
-    set(FMT_SOURCE_DIR "${LIBKINETO_THIRDPARTY_DIR}/fmt"
-      CACHE STRING "fmt source directory from submodules")
-  endif()
-
-  # Build FMT.
-  # FMT and some other libraries use BUILD_SHARED_LIBS to control
-  # the library type.
-  # Save and restore the value after configuring FMT
-  set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
-  set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
-  set(FMT_LIBRARY_TYPE static CACHE STRING "Set lib type to static")
-  add_subdirectory("${FMT_SOURCE_DIR}" "${LIBKINETO_BINARY_DIR}/fmt")
-  set_property(TARGET fmt PROPERTY POSITION_INDEPENDENT_CODE ON)
-  set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE)
-endif()
-
 set(FMT_INCLUDE_DIR "${FMT_SOURCE_DIR}/include")
 message(STATUS "Kineto: FMT_SOURCE_DIR = ${FMT_SOURCE_DIR}")
 message(STATUS "Kineto: FMT_INCLUDE_DIR = ${FMT_INCLUDE_DIR}")
@@ -231,6 +210,7 @@ else()
   message(FATAL_ERROR "Unsupported library type ${KINETO_LIBRARY_TYPE}")
 endif()
 target_link_libraries(kineto kineto_base kineto_api)
+target_link_libraries(kineto $<BUILD_INTERFACE:fmt::fmt-header-only>)
 
 if(NOT LIBKINETO_NOROCTRACER)
   find_library(ROCTRACER_LIBRARY NAMES libroctracer64.so HINTS

libkineto/test/CuptiProfilerApiTest.cu

@@ -33,7 +33,6 @@
 
 using namespace KINETO_NAMESPACE;
 
-static int numRanges = 1;
 
 using Type = double;
 
@@ -219,6 +218,7 @@ bool runTestWithUserRange(
     bool async = false) {
   // create a CUPTI range based profiling profiler
   //  this configures the counter data as well
+  constexpr int numRanges = 1;
   CuptiRangeProfilerOptions opts{
       .metricNames = metricNames,
       .deviceId = deviceNum,