#13556: Unvendor magic_enum and upgrade to latest release (v0.9.6) (#…

…13557) * #13556: Unvendor magic_enum and upgrade to latest release (v0.9.6) * #13556: Use <> to designate it's third-party
tenstorrent · Oct 9, 2024 · 2f09f89 · 2f09f89
1 parent facce1f
commit 2f09f89
Show file tree

Hide file tree

Showing 40 changed files with 41 additions and 1,526 deletions.
diff --git a/.github/workflows/build-artifact.yaml b/.github/workflows/build-artifact.yaml
@@ -62,6 +62,7 @@ jobs:
   build-artifact:
     needs: build-docker-image
     if: always()
+    timeout-minutes: 30
     strategy:
       matrix:
         arch: ${{ fromJson(inputs.arch || '["grayskull", "wormhole_b0", "blackhole"]') }}

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -55,3 +55,9 @@ CPMAddPackage(
   GITHUB_REPOSITORY boost-ext/reflect
   GIT_TAG v1.1.1
 )
+
+CPMAddPackage(
+  NAME magic_enum
+  GITHUB_REPOSITORY Neargye/magic_enum
+  GIT_TAG v0.9.6
+)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -2,7 +2,7 @@
 enable_testing()
 include(GoogleTest)
 add_library(test_common_libs INTERFACE)
-target_link_libraries(test_common_libs INTERFACE pthread gtest gtest_main)
+target_link_libraries(test_common_libs INTERFACE pthread gtest gtest_main magic_enum)
 
 if(TT_METAL_BUILD_TESTS)
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tt_metal/tt_metal)
@@ -12,4 +12,3 @@ if(TTNN_BUILD_TESTS)
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tt_eager) # this should go away and be replaced with link to ttnn
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ttnn/unit_tests/gtests)
 endif(TTNN_BUILD_TESTS)
-
diff --git a/tests/tt_eager/ops/test_bcast_op.cpp b/tests/tt_eager/ops/test_bcast_op.cpp
@@ -6,7 +6,7 @@
 #include "ttnn/tensor/tensor.hpp"
 #include "ttnn/operations/data_movement/bcast/bcast.hpp"
 #include "common/constants.hpp"
-#include "third_party/magic_enum/magic_enum.hpp"
+#include <magic_enum.hpp>
 #include <ttnn/operations/numpy/functions.hpp>
 
 #include <algorithm>

diff --git a/tests/tt_eager/ops/test_sfpu.cpp b/tests/tt_eager/ops/test_sfpu.cpp
@@ -8,7 +8,7 @@
 #include <cmath>
 #include <sstream>
 
-#include "third_party/magic_enum/magic_enum.hpp"
+#include <magic_enum.hpp>
 
 #include "tt_metal/host_api.hpp"
 #include "tt_metal/detail/tt_metal.hpp"

diff --git a/tests/tt_metal/tt_metal/unit_tests_common/CMakeLists.txt b/tests/tt_metal/tt_metal/unit_tests_common/CMakeLists.txt
@@ -29,7 +29,7 @@ set(UNIT_TESTS_COMMON_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/watcher/test_link_training.cpp
 )
 add_library(unit_tests_common_o OBJECT ${UNIT_TESTS_COMMON_SRC})
-target_link_libraries(unit_tests_common_o PUBLIC compiler_flags metal_header_directories gtest gtest_main)
+target_link_libraries(unit_tests_common_o PUBLIC compiler_flags metal_header_directories gtest gtest_main magic_enum)
 target_include_directories(unit_tests_common_o PUBLIC
     ${UMD_HOME}
     ${PROJECT_SOURCE_DIR}

diff --git a/tt_metal/CMakeLists.txt b/tt_metal/CMakeLists.txt
@@ -23,10 +23,9 @@ set(TT_METAL_OBJECTS
 
 add_library(tt_metal ${TT_METAL_OBJECTS})
 
-target_link_libraries(tt_metal PUBLIC metal_header_directories umd_device metal_common_libs)
+target_link_libraries(tt_metal PUBLIC metal_header_directories umd_device metal_common_libs magic_enum)
 
 target_precompile_headers(tt_metal PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/third_party/magic_enum/magic_enum.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/third_party/tracy/public/tracy/Tracy.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/third_party/fmt/fmt/core.h
     ${CMAKE_CURRENT_SOURCE_DIR}/third_party/fmt/fmt/format.h

diff --git a/tt_metal/common/CMakeLists.txt b/tt_metal/common/CMakeLists.txt
@@ -8,7 +8,7 @@ set(COMMON_SRCS
 
 add_library(common OBJECT ${COMMON_SRCS})
 target_link_libraries(common PRIVATE yaml-cpp::yaml-cpp)
-target_link_libraries(common PUBLIC compiler_flags metal_header_directories)
+target_link_libraries(common PUBLIC compiler_flags metal_header_directories magic_enum)
 
 target_include_directories(common PUBLIC
     ${UMD_HOME}

diff --git a/tt_metal/common/tt_backend_api_types.cpp b/tt_metal/common/tt_backend_api_types.cpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "tt_backend_api_types.hpp"
-#include "third_party/magic_enum/magic_enum.hpp"
+#include <magic_enum.hpp>
 
 std::string tt::get_string(tt::ARCH arch) {
     switch (arch) {

diff --git a/tt_metal/impl/allocator/allocator.cpp b/tt_metal/impl/allocator/allocator.cpp
@@ -4,7 +4,7 @@
 
 #include "tt_metal/impl/allocator/allocator.hpp"
 
-#include "third_party/magic_enum/magic_enum.hpp"
+#include <magic_enum.hpp>
 #include "tt_metal/common/math.hpp"
 #include "tt_metal/detail/util.hpp"
 #include "tt_metal/hostdevcommon/common_runtime_address_map.h"

diff --git a/tt_metal/impl/dispatch/command_queue_interface.hpp b/tt_metal/impl/dispatch/command_queue_interface.hpp
@@ -13,7 +13,7 @@
 #include "tt_metal/llrt/llrt.hpp"
 #include "tt_metal/llrt/hal.hpp"
 
-#include "third_party/magic_enum/magic_enum.hpp"
+#include <magic_enum.hpp>
 
 using namespace tt::tt_metal;
 

diff --git a/tt_metal/impl/dispatch/data_collection.cpp b/tt_metal/impl/dispatch/data_collection.cpp
@@ -7,7 +7,7 @@
 #include "tt_metal/impl/kernels/kernel.hpp"
 #include "tt_metal/common/core_coord.h"
 
-#include "third_party/magic_enum/magic_enum.hpp"
+#include <magic_enum.hpp>
 
 using namespace tt;
 

diff --git a/tt_metal/programming_examples/eltwise_binary/eltwise_binary.cpp b/tt_metal/programming_examples/eltwise_binary/eltwise_binary.cpp
@@ -11,7 +11,7 @@
 
 #include "common/bfloat16.hpp"
 
-#include "third_party/magic_enum/magic_enum.hpp"
+#include <magic_enum.hpp>
 
 using namespace tt;
 using namespace tt::tt_metal;

diff --git a/tt_metal/programming_examples/matmul_common/bmm_op.hpp b/tt_metal/programming_examples/matmul_common/bmm_op.hpp
@@ -15,7 +15,7 @@
 #include "tt_metal/common/bfloat16.hpp"
 
 #include "third_party/umd/device/tt_xy_pair.h"
-#include "third_party/magic_enum/magic_enum.hpp"
+#include <magic_enum.hpp>
 
 #include "tt_metal/common/work_split.hpp"
 

diff --git a/tt_metal/third_party/magic_enum/LICENSE b/tt_metal/third_party/magic_enum/LICENSE
diff --git a/tt_metal/third_party/magic_enum/LICENSE.txt b/tt_metal/third_party/magic_enum/LICENSE.txt