Unvendor nlohmann json (#15956)

Bring json in from CPM package manager.
tenstorrent · Dec 13, 2024 · 8d1206f · 8d1206f
1 parent b314a49
commit 8d1206f
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 27,559 deletions.
diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
@@ -91,3 +91,9 @@ CPMAddPackage(NAME range-v3 GITHUB_REPOSITORY ericniebler/range-v3 GIT_TAG 0.12.
 ############################################################################################################################
 
 CPMAddPackage(NAME pybind11 GITHUB_REPOSITORY pybind/pybind11 GIT_TAG b8f28551cc3a98ea9fbfc15c05b513c8f2d23e84)
+
+############################################################################################################################
+# nlohmann/json : https://github.com/nlohmann/json
+############################################################################################################################
+
+CPMAddPackage(NAME json GITHUB_REPOSITORY nlohmann/json GIT_TAG v3.9.1)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -6,6 +6,7 @@ target_link_libraries(
     INTERFACE
         pthread
         gmock_main
+        nlohmann_json::nlohmann_json
         magic_enum
         fmt::fmt-header-only
         span

diff --git a/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_common.hpp b/tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_common.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "tt_metal/third_party/json/json.hpp"
+#include <nlohmann/json.hpp>
 #include "tt_metal/common/core_coord.hpp"
 
 static inline std::string to_string(pkt_dest_size_choices_t choice) {

diff --git a/tests/ttnn/unit_tests/gtests/test_graph_query_op_constraints.cpp b/tests/ttnn/unit_tests/gtests/test_graph_query_op_constraints.cpp
@@ -18,7 +18,7 @@
 #include "impl/event/event.hpp"
 #include "impl/program/program.hpp"
 #include "tests/tt_metal/tt_metal/common/dispatch_fixture.hpp"
-#include "third_party/json/json.hpp"
+#include <nlohmann/json.hpp>
 #include "tt_metal/common/logger.hpp"
 #include "ttnn/device.hpp"
 #include "ttnn/graph/graph_operation_queries.hpp"

diff --git a/tt_metal/common/CMakeLists.txt b/tt_metal/common/CMakeLists.txt
@@ -15,6 +15,7 @@ target_link_libraries(common PRIVATE yaml-cpp::yaml-cpp)
 target_link_libraries(
     common
     PUBLIC
+        nlohmann_json::nlohmann_json
         magic_enum
         fmt::fmt-header-only
         span

diff --git a/tt_metal/common/core_coord.hpp b/tt_metal/common/core_coord.hpp
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include "third_party/json/json.hpp"
+#include <nlohmann/json.hpp>
 #include "umd/device/tt_xy_pair.h"
 #include "tt_metal/tt_stl/reflection.hpp"
 #include "tt_metal/tt_stl/span.hpp"

diff --git a/tt_metal/impl/buffers/buffer.hpp b/tt_metal/impl/buffers/buffer.hpp
@@ -25,7 +25,7 @@
 #include "umd/device/types/xy_pair.h"
 #include "tt_metal/tt_stl/concepts.hpp"
 #include "tt_metal/common/assert.hpp"
-#include "third_party/json/json.hpp"
+#include <nlohmann/json.hpp>
 
 #include "llrt/hal.hpp"