#4252: boost 1.84.0 as submodules

.gitmodules

@@ -28,3 +28,78 @@
 [submodule "tt_metal/third_party/tt_llk_blackhole"]
 	path = tt_metal/third_party/tt_llk_blackhole
 	url = https://github.com/tenstorrent/tt-llk-bh.git
+[submodule "tt_metal/third_party/boost/interprocess"]
+	path = tt_metal/third_party/boost/interprocess
+	url = https://github.com/boostorg/interprocess.git
+[submodule "tt_metal/third_party/boost/core"]
+	path = tt_metal/third_party/boost/core
+	url = https://github.com/boostorg/core.git
+[submodule "tt_metal/third_party/boost/format"]
+	path = tt_metal/third_party/boost/format
+	url = https://github.com/boostorg/format.git
+[submodule "tt_metal/third_party/boost/align"]
+	path = tt_metal/third_party/boost/align
+	url = https://github.com/boostorg/align.git
+[submodule "tt_metal/third_party/boost/container_hash"]
+	path = tt_metal/third_party/boost/container_hash
+	url = https://github.com/boostorg/container_hash.git
+[submodule "tt_metal/third_party/boost/assert"]
+	path = tt_metal/third_party/boost/assert
+	url = https://github.com/boostorg/assert.git
+[submodule "tt_metal/third_party/boost/config"]
+	path = tt_metal/third_party/boost/config
+	url = https://github.com/boostorg/config.git
+[submodule "tt_metal/third_party/boost/detail"]
+	path = tt_metal/third_party/boost/detail
+	url = https://github.com/boostorg/detail.git
+[submodule "tt_metal/third_party/boost/integer"]
+	path = tt_metal/third_party/boost/integer
+	url = https://github.com/boostorg/integer.git
+[submodule "tt_metal/third_party/boost/intrusive"]
+	path = tt_metal/third_party/boost/intrusive
+	url = https://github.com/boostorg/intrusive.git
+[submodule "tt_metal/third_party/boost/move"]
+	path = tt_metal/third_party/boost/move
+	url = https://github.com/boostorg/move.git
+[submodule "tt_metal/third_party/boost/optional"]
+	path = tt_metal/third_party/boost/optional
+	url = https://github.com/boostorg/optional.git
+[submodule "tt_metal/third_party/boost/smart_ptr"]
+	path = tt_metal/third_party/boost/smart_ptr
+	url = https://github.com/boostorg/smart_ptr.git
+[submodule "tt_metal/third_party/boost/static_assert"]
+	path = tt_metal/third_party/boost/static_assert
+	url = https://github.com/boostorg/static_assert.git
+[submodule "tt_metal/third_party/boost/throw_exception"]
+	path = tt_metal/third_party/boost/throw_exception
+	url = https://github.com/boostorg/throw_exception.git
+[submodule "tt_metal/third_party/boost/type_traits"]
+	path = tt_metal/third_party/boost/type_traits
+	url = https://github.com/boostorg/type_traits.git
+[submodule "tt_metal/third_party/boost/unordered"]
+	path = tt_metal/third_party/boost/unordered
+	url = https://github.com/boostorg/unordered.git
+[submodule "tt_metal/third_party/boost/utility"]
+	path = tt_metal/third_party/boost/utility
+	url = https://github.com/boostorg/utility.git
+[submodule "tt_metal/third_party/boost/winapi"]
+	path = tt_metal/third_party/boost/winapi
+	url = https://github.com/boostorg/winapi.git
+[submodule "tt_metal/third_party/boost/predef"]
+	path = tt_metal/third_party/boost/predef
+	url = https://github.com/boostorg/predef.git
+[submodule "tt_metal/third_party/boost/mp11"]
+	path = tt_metal/third_party/boost/mp11
+	url = https://github.com/boostorg/mp11.git
+[submodule "tt_metal/third_party/boost/io"]
+	path = tt_metal/third_party/boost/io
+	url = https://github.com/boostorg/io.git
+[submodule "tt_metal/third_party/boost/preprocessor"]
+	path = tt_metal/third_party/boost/preprocessor
+	url = https://github.com/boostorg/preprocessor.git
+[submodule "tt_metal/third_party/boost/describe"]
+	path = tt_metal/third_party/boost/describe
+	url = https://github.com/boostorg/describe.git
+[submodule "tt_metal/third_party/boost/container"]
+	path = tt_metal/third_party/boost/container
+	url = https://github.com/boostorg/container.git

CMakeLists.txt

@@ -31,7 +31,7 @@ CHECK_COMPILERS()
 ############################################################################################################################
 # Find all required libraries to build
 ############################################################################################################################
-find_package(Boost REQUIRED COMPONENTS thread filesystem system regex)
+# find_package(Boost REQUIRED COMPONENTS thread filesystem system regex)
 find_package(GTest REQUIRED)
 find_package (Python3 COMPONENTS Interpreter Development)
 
@@ -85,8 +85,8 @@ set(CMAKE_INSTALL_DATAROOTDIR "${CMAKE_BINARY_DIR}/tmp/share")
 ############################################################################################################################
 add_library(metal_common_libs INTERFACE)
 target_link_libraries(metal_common_libs INTERFACE
-    dl z pthread atomic stdc++ # system libraries
-    Boost::thread Boost::filesystem Boost::system Boost::regex hwloc    # hwloc has no cmake support, find_package won't find it
+    dl z pthread atomic stdc++ hwloc # system libraries; hwloc has no cmake support, find_package won't find it
+    Boost::interprocess Boost::format Boost::core Boost::container_hash Boost::align
 )
 
 # Note on flags:
@@ -146,6 +146,8 @@ target_precompile_headers(pch_pybinds INTERFACE
 ############################################################################################################################
 # Build subdirectories
 ############################################################################################################################
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tt_metal/third_party/boost)
+
 if($ENV{ENABLE_TRACY})
     include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/tracy.cmake)
 endif()

cmake/umd_device.cmake

@@ -22,7 +22,8 @@ if($ENV{ENABLE_TRACY})
 endif()
 
 # MUST have the RPATH set, or else can't find the tracy lib
-set(LDFLAGS_ "-L${CMAKE_BINARY_DIR}/lib -L/usr/local/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/lib -Wl,-rpath,/usr/local/lib ${CONFIG_LDFLAGS} -ldl -lz -lboost_thread -lboost_filesystem -lboost_system -lboost_regex -lpthread -latomic -lhwloc -lstdc++")
+# set(LDFLAGS_ "-L${CMAKE_BINARY_DIR}/lib -L/usr/local/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/lib -Wl,-rpath,/usr/local/lib ${CONFIG_LDFLAGS} -ldl -lz -lboost_thread -lboost_filesystem -lboost_system -lboost_regex -lpthread -latomic -lhwloc -lstdc++")
+set(LDFLAGS_ "-L${CMAKE_BINARY_DIR}/lib -L/usr/local/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/lib -Wl,-rpath,/usr/local/lib ${CONFIG_LDFLAGS} -ldl -lz -lumd_boost -lpthread -latomic -lhwloc -lstdc++")
 set(SHARED_LIB_FLAGS_ "-shared -fPIC")
 set(STATIC_LIB_FLAGS_ "-fPIC")
 
@@ -56,6 +57,7 @@ ExternalProject_Add(
         LDFLAGS=${LDFLAGS_}
         CXXFLAGS=${CMAKE_CXX_FLAGS_}
 )
+add_dependencies(umd_device umd_boost)
 if($ENV{ENABLE_TRACY})
     add_dependencies(umd_device TracyClient)
 endif()

tt_metal/third_party/boost/CMakeLists.txt

@@ -0,0 +1,34 @@
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/align)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/assert)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/config)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/container)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/container_hash)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/core)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/describe)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/detail)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/format)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/integer)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/interprocess)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/intrusive)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/io)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/move)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/mp11)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/optional)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/predef)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/preprocessor)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/smart_ptr)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/static_assert)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/throw_exception)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/type_traits)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/unordered)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/utility)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/winapi)
+
+add_library(umd_boost SHARED ${CMAKE_CURRENT_SOURCE_DIR}/dummy.cpp)
+target_link_libraries(umd_boost PUBLIC boost_interprocess)
+set_target_properties(umd_boost PROPERTIES
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
+)
+set_target_properties(boost_container PROPERTIES
+    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
+)

tt_metal/third_party/boost/dummy.cpp

@@ -0,0 +1,3 @@
+// SPDX-FileCopyrightText: © 2023 Tenstorrent Inc.
+//
+// SPDX-License-Identifier: Apache-2.0