1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
--- a/CMakeLists.txt 2022-05-24 11:16:18.537610972 +0200
+++ b/CMakeLists.txt 2022-05-24 11:19:15.011073535 +0200
@@ -86,7 +86,8 @@
CXX_STANDARD_REQUIRED YES
CXX_EXTENSIONS NO)
-set(KINETO_COMPILE_OPTIONS "-DKINETO_NAMESPACE=libkineto")
+set(KINETO_COMPILE_OPTIONS "-DKINETO_NAMESPACE=libkineto"
+ ${CMAKE_SHARED_LIBRARY_C_FLAGS})
list(APPEND KINETO_COMPILE_OPTIONS "-DFMT_HEADER_ONLY")
list(APPEND KINETO_COMPILE_OPTIONS "-DENABLE_IPC_FABRIC")
if(NOT MSVC)
@@ -111,7 +113,7 @@
target_compile_options(kineto_base PRIVATE "${KINETO_COMPILE_OPTIONS}")
target_compile_options(kineto_api PRIVATE "${KINETO_COMPILE_OPTIONS}")
-if(NOT TARGET fmt)
+if(FALSE)
if(NOT FMT_SOURCE_DIR)
set(FMT_SOURCE_DIR "${LIBKINETO_THIRDPARTY_DIR}/fmt"
CACHE STRING "fmt source directory from submodules")
@@ -129,9 +131,7 @@
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}")
if (NOT CUPTI_INCLUDE_DIR)
set(CUPTI_INCLUDE_DIR "${CUDA_SOURCE_DIR}/extras/CUPTI/include")
endif()
@@ -144,15 +144,14 @@
set(ROCM_INCLUDE_DIRS "${ROCM_SOURCE_DIR}/include")
endif()
-set(DYNOLOG_INCLUDE_DIR "${LIBKINETO_THIRDPARTY_DIR}/dynolog/")
-set(IPCFABRIC_INCLUDE_DIR "${DYNOLOG_INCLUDE_DIR}/dynolog/src/ipcfabric/")
+set(DYNOLOG_INCLUDE_DIR "@GENTOO_PORTAGE_EPREFIX@/usr/include/dynolog/")
+set(IPCFABRIC_INCLUDE_DIR "@GENTOO_PORTAGE_EPREFIX@/usr/include/dynolog/src/ipcfabric/")
message(INFO " CUPTI_INCLUDE_DIR = ${CUPTI_INCLUDE_DIR}")
message(INFO " ROCTRACER_INCLUDE_DIR = ${ROCTRACER_INCLUDE_DIR}")
message(INFO " DYNOLOG_INCLUDE_DIR = ${DYNOLOG_INCLUDE_DIR}")
message(INFO " IPCFABRIC_INCLUDE_DIR = ${IPCFABRIC_INCLUDE_DIR}")
-add_subdirectory("${IPCFABRIC_INCLUDE_DIR}")
target_link_libraries(kineto_base PRIVATE dynolog_ipcfabric_lib)
target_include_directories(kineto_base PUBLIC
@@ -160,7 +159,6 @@
$<BUILD_INTERFACE:${LIBKINETO_INCLUDE_DIR}>
$<BUILD_INTERFACE:${LIBKINETO_SOURCE_DIR}>
$<BUILD_INTERFACE:${DYNOLOG_INCLUDE_DIR}>
- $<BUILD_INTERFACE:${FMT_INCLUDE_DIR}>
$<BUILD_INTERFACE:${IPCFABRIC_INCLUDE_DIR}>
$<BUILD_INTERFACE:${CUPTI_INCLUDE_DIR}>
$<BUILD_INTERFACE:${CUDA_INCLUDE_DIRS}>
@@ -168,7 +166,6 @@
$<BUILD_INTERFACE:${ROCM_INCLUDE_DIRS}>)
target_include_directories(kineto_api PUBLIC
- $<BUILD_INTERFACE:${FMT_INCLUDE_DIR}>
$<BUILD_INTERFACE:${LIBKINETO_INCLUDE_DIR}>)
if(KINETO_LIBRARY_TYPE STREQUAL "default")
@@ -202,8 +199,6 @@
if(CUDA_nvperf_host_LIBRARY)
target_link_libraries(kineto "${CUDA_nvperf_host_LIBRARY}")
endif()
-target_link_libraries(kineto $<BUILD_INTERFACE:fmt::fmt-header-only>)
-add_dependencies(kineto fmt::fmt-header-only)
install(TARGETS kineto EXPORT kinetoLibraryConfig
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
GitWeb
