#8129: Build UMD with CMake

tenstorrent · Jun 3, 2024 · 977f4b0 · 977f4b0
1 parent 04e80e7
commit 977f4b0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 105 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -151,9 +151,7 @@ if($ENV{ENABLE_TRACY})
     include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/tracy.cmake)
 endif()
 
-# Build umd_device
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/umd_device.cmake)
-
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tt_metal/third_party/umd)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tt_metal/hw)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tt_metal)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tt_eager)

diff --git a/cmake/umd_device.cmake b/cmake/umd_device.cmake
diff --git a/tt_metal/CMakeLists.txt b/tt_metal/CMakeLists.txt
@@ -17,13 +17,8 @@ set(TT_METAL_OBJECTS
 )
 
 add_library(tt_metal ${TT_METAL_OBJECTS})
-if(BUILD_SHARED_LIBS)
-    target_link_libraries(tt_metal PUBLIC device metal_common_libs)
-    add_dependencies(tt_metal umd_device)
-else()
-    target_link_libraries(tt_metal PUBLIC ${UMD_STATIC_LIB} metal_common_libs)
-    add_dependencies(tt_metal umd_static_lib_target)
-endif()
+target_link_libraries(tt_metal PUBLIC device metal_common_libs)
+add_dependencies(tt_metal umd_device)
 
 target_link_libraries(tt_metal PUBLIC compiler_flags linker_flags metal_header_directories yaml-cpp $<$<BOOL:$ENV{ENABLE_TRACY}>:TracyClient>)  # linker_flags = -rdynamic if tracy enabled
 target_link_directories(tt_metal PUBLIC ${CMAKE_BINARY_DIR}/lib)    # required so tt_metal can find device library

diff --git a/tt_metal/third_party/umd b/tt_metal/third_party/umd