Add yyjson support.

LLNL · Oct 19, 2024 · f568d35 · f568d35
1 parent fa0f8d3
commit f568d35
Show file tree

Hide file tree

Showing 13 changed files with 434 additions and 96 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -40,6 +40,11 @@ option(ENABLE_FORTRAN     "Build Fortran Support"       OFF)
 option(ENABLE_MPI         "Build MPI Support"           OFF)
 option(ENABLE_OPENMP      "Build OpenMP Support"        OFF)
 
+option(USE_SYSTEM_YYJSON "Use yyjson as a replacement for rapidjson." OFF)
+if(${USE_SYSTEM_YYJSON})
+    add_compile_definitions(USE_YYJSON)
+endif()
+
 # Add another option that provides extra 
 # control over conduit tests for cases where 
 # conduit is brought in as a submodule

diff --git a/src/cmake/Setup3rdParty.cmake b/src/cmake/Setup3rdParty.cmake
@@ -27,9 +27,15 @@ endif()
 ################################
 # Setup includes for RapidJSON
 ################################
-include(cmake/thirdparty/SetupRapidJSON.cmake)
-message(STATUS "Using RapidJSON Include: ${RAPIDJSON_INCLUDE_DIR}")
-include_directories(${RAPIDJSON_INCLUDE_DIR})
+if(${USE_SYSTEM_YYJSON})
+    find_package(yyjson REQUIRED)
+    link_libraries(yyjson::yyjson)
+    include_directories(thirdparty_builtin/yyjson)
+else()
+    include(cmake/thirdparty/SetupRapidJSON.cmake)
+    message(STATUS "Using RapidJSON Include: ${RAPIDJSON_INCLUDE_DIR}")
+    include_directories(${RAPIDJSON_INCLUDE_DIR})
+endif()
 
 ################################
 # Setup and build libb64

diff --git a/src/libs/conduit/CMakeLists.txt b/src/libs/conduit/CMakeLists.txt
@@ -66,6 +66,7 @@ set(conduit_headers
     ${CMAKE_CURRENT_BINARY_DIR}/conduit_config.h
     conduit_config.hpp
     ${CMAKE_CURRENT_BINARY_DIR}/conduit_bitwidth_style_types.h
+    conduit_json.hpp
     )
 
 #

diff --git a/src/libs/conduit/conduit_generator.cpp b/src/libs/conduit/conduit_generator.cpp
diff --git a/src/libs/conduit/conduit_json.hpp b/src/libs/conduit/conduit_json.hpp
@@ -0,0 +1,13 @@
+#ifndef CONDUIT_JSON_HPP
+#define CONDUIT_JSON_HPP
+
+#ifdef USE_YYJSON
+  #include "conduit_yyjson.h"
+  #define conduit_json conduit_yyjson
+#else
+  #include "rapidjson/document.h"
+  #include "rapidjson/error/en.h"
+  #define conduit_json conduit_rapidjson
+#endif
+
+#endif
diff --git a/src/tests/conduit/t_conduit_node.cpp b/src/tests/conduit/t_conduit_node.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 #include "gtest/gtest.h"
-#include "rapidjson/document.h"
+#include "conduit_json.hpp"
 using namespace conduit;
 
 //-----------------------------------------------------------------------------
@@ -198,7 +198,7 @@ TEST(conduit_node, simple_schema)
 
     std::string res = n.schema().to_json();
     std::cout << res;
-    conduit_rapidjson::Document d;
+    conduit_json::Document d;
     d.Parse<0>(res.c_str());
 
     EXPECT_TRUE(d.HasMember("a"));

diff --git a/src/tests/conduit/t_conduit_node_set.cpp b/src/tests/conduit/t_conduit_node_set.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 #include "gtest/gtest.h"
-#include "rapidjson/document.h"
+#include "conduit_json.hpp"
 using namespace conduit;
 
 //-----------------------------------------------------------------------------

diff --git a/src/tests/conduit/t_conduit_node_to_array.cpp b/src/tests/conduit/t_conduit_node_to_array.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 #include "gtest/gtest.h"
-#include "rapidjson/document.h"
+#include "conduit_json.hpp"
 using namespace conduit;
 
 // TODO(JRC): Figure out if there's any better way to facilitate these conversions

diff --git a/src/tests/conduit/t_conduit_node_type_dispatch.cpp b/src/tests/conduit/t_conduit_node_type_dispatch.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 #include "gtest/gtest.h"
-#include "rapidjson/document.h"
+#include "conduit_json.hpp"
 using namespace conduit;
 using namespace conduit::utils;
 

diff --git a/src/tests/conduit/t_conduit_node_update.cpp b/src/tests/conduit/t_conduit_node_update.cpp
@@ -13,7 +13,7 @@
 
 #include <iostream>
 #include "gtest/gtest.h"
-#include "rapidjson/document.h"
+#include "conduit_json.hpp"
 using namespace conduit;
 
 //-----------------------------------------------------------------------------

diff --git a/src/tests/docs/t_conduit_docs_tutorial_basics.cpp b/src/tests/docs/t_conduit_docs_tutorial_basics.cpp
@@ -15,7 +15,7 @@
 
 #include <iostream>
 #include "gtest/gtest.h"
-#include "rapidjson/document.h"
+#include "conduit_json.hpp"
 
 using namespace conduit;
 

diff --git a/src/tests/thirdparty/t_rapidjson_smoke.cpp b/src/tests/thirdparty/t_rapidjson_smoke.cpp
@@ -8,15 +8,15 @@
 ///
 //-----------------------------------------------------------------------------
 
-#include "rapidjson/document.h"
+#include "conduit_json.hpp"
 #include "gtest/gtest.h"
 
 //-----------------------------------------------------------------------------
-TEST(rapidjson_smoke, basic_use)
+TEST(json_smoke, basic_use)
 {
     const char json[] = "{ \"hello\" : \"world\" }";
 
-    conduit_rapidjson::Document d;
+    conduit_json::Document d;
     d.Parse<0>(json);
 
     ASSERT_STREQ(d["hello"].GetString(),"world");