From db8a0d5cdb8fdee9f8d021edf5683c150452be43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bojan=20Ro=C5=A1ko?= <156314064+broskoTT@users.noreply.github.com> Date: Tue, 26 Nov 2024 16:00:30 +0100 Subject: [PATCH] Revert "Make uv and nng private and static (#323)" (#336) This reverts commit 0a41bf5d0db7f49de4e12b193cf0246f825d68f6. ### Issue No issue ### Description This change broke tt-metal build. post commit workflow failing: https://github.com/tenstorrent/tt-metal/actions/runs/12031721201 post commit workflow on this branch: https://github.com/tenstorrent/tt-metal/actions/runs/12032379476/job/33545486354 blackhole post-commit failing: https://github.com/tenstorrent/tt-metal/actions/runs/12031811999 blackhole post-commit on this branch: https://github.com/tenstorrent/tt-metal/actions/runs/12032509241 ### List of the changes - git revert 0a41bf5d0db7f49de4e12b193cf0246f825d68f6 ### Testing see description ### API Changes - --- cmake/dependencies.cmake | 10 ++-------- device/CMakeLists.txt | 5 +++-- tests/CMakeLists.txt | 1 - 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 14c9aed5..96ebbaf5 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -56,6 +56,7 @@ function(fetch_dependencies) GITHUB_REPOSITORY nanomsg/nng GIT_TAG v1.8.0 OPTIONS + "BUILD_SHARED_LIBS ON" "NNG_TESTS OFF" "NNG_TOOLS OFF" ) @@ -96,14 +97,7 @@ function(fetch_dependencies) ############################################################################################################################ # libuv (for process management) ############################################################################################################################ - CPMAddPackage( - NAME libuv - GITHUB_REPOSITORY libuv/libuv - GIT_TAG v1.48.0 - OPTIONS - "LIBUV_BUILD_TESTS OFF" - "LIBUV_BUILD_SHARED OFF" - ) + CPMAddPackage(NAME libuv GITHUB_REPOSITORY libuv/libuv GIT_TAG v1.48.0 OPTIONS "LIBUV_BUILD_TESTS OFF") ############################################################################################################################ # fmt : https://github.com/fmtlib/fmt diff --git a/device/CMakeLists.txt b/device/CMakeLists.txt index a21d7d81..499e521e 100644 --- a/device/CMakeLists.txt +++ b/device/CMakeLists.txt @@ -41,15 +41,16 @@ target_include_directories( ) # flatbuffers is public - exposed to tt_metal by tt_simulation_device_generated.h +# nng is public - exposed to tt_metal by tt_simulation_host.hpp target_link_libraries( device PUBLIC + nng flatbuffers + uv PRIVATE hwloc - nng rt - uv_a Boost::interprocess fmt::fmt-header-only yaml-cpp::yaml-cpp diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index bbc47fcd..91d2e917 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -13,7 +13,6 @@ target_link_libraries( gtest pthread fmt::fmt-header-only - nng ) target_include_directories( test_common