Skip to content

[Submodule] Bump kineto to latest #161370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Submodule] Bump kineto to latest #161370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 2 additions & 33 deletions cmake/Dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1617,38 +1617,7 @@ if(USE_KINETO)
message(STATUS " KINETO_LIBRARY_TYPE = ${KINETO_LIBRARY_TYPE}")

if(NOT LIBKINETO_NOCUPTI)
set(CUDA_SOURCE_DIR "${CUDA_TOOLKIT_ROOT_DIR}" CACHE STRING "")
message(STATUS " CUDA_SOURCE_DIR = ${CUDA_SOURCE_DIR}")
message(STATUS " CUDA_INCLUDE_DIRS = ${CUDA_INCLUDE_DIRS}")

if(NOT MSVC)
if(USE_CUPTI_SO)
set(CUPTI_LIB_NAME "libcupti.so")
else()
set(CUPTI_LIB_NAME "libcupti_static.a")
endif()
else()
set(CUPTI_LIB_NAME "cupti.lib")
endif()

find_library(CUPTI_LIBRARY_PATH ${CUPTI_LIB_NAME} PATHS
${CUDA_SOURCE_DIR}
${CUDA_SOURCE_DIR}/extras/CUPTI/lib64
${CUDA_SOURCE_DIR}/lib
${CUDA_SOURCE_DIR}/lib64
NO_DEFAULT_PATH)

find_path(CUPTI_INCLUDE_DIR cupti.h PATHS
${CUDA_SOURCE_DIR}/extras/CUPTI/include
${CUDA_INCLUDE_DIRS}
${CUDA_SOURCE_DIR}
${CUDA_SOURCE_DIR}/include
NO_DEFAULT_PATH)

if(CUPTI_LIBRARY_PATH AND CUPTI_INCLUDE_DIR)
message(STATUS " CUPTI_INCLUDE_DIR = ${CUPTI_INCLUDE_DIR}")
set(CUDA_cupti_LIBRARY ${CUPTI_LIBRARY_PATH})
message(STATUS " CUDA_cupti_LIBRARY = ${CUDA_cupti_LIBRARY}")
if(TARGET CUDA::cupti)
message(STATUS "Found CUPTI")
set(LIBKINETO_NOCUPTI OFF CACHE STRING "" FORCE)

Expand All @@ -1661,7 +1630,7 @@ if(USE_KINETO)
if(NOT APPLE)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} "dl" "pthread")
endif()
set(CMAKE_REQUIRED_LINK_OPTIONS "-Wl,--whole-archive,${CUPTI_LIBRARY_PATH},--no-whole-archive")
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} $<LINK_LIBRARY:WHOLE_ARCHIVE,CUDA::cupti_static>)
check_cxx_source_runs("#include <stdexcept>
int main() {
try {
Expand Down
2 changes: 1 addition & 1 deletion third_party/kineto
Open in desktop
Submodule kineto updated 49 files
+31 −22 .github/workflows/libkineto_cuda.yml
+2 −10 README.md
+110 −174 libkineto/CMakeLists.txt
+25 −5 libkineto/README.md
+ − libkineto/docs/source/_static/img/kineto_interconnect.png
+1 −1 libkineto/include/Config.h
+6 −0 libkineto/include/ILoggerObserver.h
+1 −1 libkineto/sample_programs/kineto_cupti_profiler.cpp
+5 −4 libkineto/src/AbstractConfig.cpp
+4 −3 libkineto/src/ActivityLoggerFactory.h
+9 −17 libkineto/src/ActivityProfilerController.cpp
+1 −1 libkineto/src/ActivityProfilerController.h
+2 −2 libkineto/src/ApproximateClock.cpp
+12 −10 libkineto/src/Config.cpp
+4 −3 libkineto/src/ConfigLoader.cpp
+15 −8 libkineto/src/CuptiActivityApi.cpp
+1 −0 libkineto/src/CuptiActivityApi.h
+53 −39 libkineto/src/CuptiActivityProfiler.cpp
+3 −3 libkineto/src/CuptiActivityProfiler.h
+1 −1 libkineto/src/CuptiCallbackApi.cpp
+3 −3 libkineto/src/CuptiRangeProfiler.cpp
+3 −3 libkineto/src/CuptiRangeProfilerApi.cpp
+2 −4 libkineto/src/CuptiRangeProfilerConfig.cpp
+1 −1 libkineto/src/DaemonConfigLoader.cpp
+2 −2 libkineto/src/Demangle.cpp
+1 −1 libkineto/src/DeviceProperties.cpp
+3 −3 libkineto/src/EventProfiler.cpp
+2 −1 libkineto/src/EventProfilerController.cpp
+2 −2 libkineto/src/IpcFabricConfigClient.cpp
+2 −5 libkineto/src/Logger.cpp
+3 −0 libkineto/src/RoctracerActivityApi.cpp
+1 −0 libkineto/src/RoctracerActivityApi.h
+1 −1 libkineto/src/RoctracerLogger.h
+5 −6 libkineto/src/ThreadUtil.cpp
+0 −1 libkineto/src/cupti_strings.cpp
+1 −1 libkineto/src/init.cpp
+8 −8 libkineto/src/output_json.cpp
+2 −1 libkineto/src/output_membuf.h
+6 −0 libkineto/src/plugin/xpupti/XpuptiActivityApi.cpp
+9 −0 libkineto/src/plugin/xpupti/XpuptiActivityApi.h
+31 −88 libkineto/test/CMakeLists.txt
+3 −4 libkineto/test/CuptiProfilerApiTest.cu
+8 −6 libkineto/test/LoggerObserverTest.cpp
+3 −1 libkineto/test/PidInfoTest.cpp
+1 −1 libkineto/third_party/dynolog
+1 −1 libkineto/third_party/fmt
+1 −1 libkineto/third_party/googletest
+60 −60 tb_plugin/test/test_profiler.py
+17 −0 tb_plugin/torch_tb_profiler/run.py
Loading