Added NGRAPH_JSON_ENABLE to conditionally enable code/features relying on…

Added NGRAPH_JSON_ENABLE to conditionally enable code/features relying on external JSON libraries (#2821)

CMakeLists.txt

@@ -166,6 +166,7 @@ option(NGRAPH_LIB_VERSIONING_ENABLE "Enable shared library versioning" FALSE)
 option(NGRAPH_PYTHON_BUILD_ENABLE "Enable build nGraph python package wheel" FALSE)
 option(NGRAPH_PLAIDML_ENABLE "Enable the PlaidML backend" ${PLAIDML_FOUND})
 option(NGRAPH_DISTRIBUTED_ENABLE "Enable distributed training using MLSL/OpenMPI" OFF)
+option(NGRAPH_JSON_ENABLE "Enable JSON based serialization and tracing features" TRUE)
 
 if (NGRAPH_CPU_ENABLE
         AND
@@ -202,6 +203,10 @@ if (NGRAPH_ONNX_IMPORT_ENABLE)
     option(NGRAPH_ONNXIFI_ENABLE "Enable ONNX Interface for Framework Integration" TRUE)
 endif()
 
+if (NOT NGRAPH_JSON_ENABLE)
+    set(NGRAPH_TOOLS_ENABLE FALSE)
+endif()
+
 macro (NORMALIZE_BOOL VAL)
     if (${VAL})
         set(${VAL} ON)
@@ -228,6 +233,7 @@ NORMALIZE_BOOL(NGRAPH_LIB_VERSIONING_ENABLE)
 NORMALIZE_BOOL(NGRAPH_PYTHON_BUILD_ENABLE)
 NORMALIZE_BOOL(NGRAPH_USE_PREBUILT_LLVM)
 NORMALIZE_BOOL(NGRAPH_PLAIDML_ENABLE)
+NORMALIZE_BOOL(NGRAPH_JSON_ENABLE)
 
 message(STATUS "NGRAPH_UNIT_TEST_ENABLE:        ${NGRAPH_UNIT_TEST_ENABLE}")
 message(STATUS "NGRAPH_TOOLS_ENABLE:            ${NGRAPH_TOOLS_ENABLE}")
@@ -248,6 +254,7 @@ message(STATUS "NGRAPH_PYTHON_BUILD_ENABLE:     ${NGRAPH_PYTHON_BUILD_ENABLE}")
 message(STATUS "NGRAPH_USE_PREBUILT_LLVM:       ${NGRAPH_USE_PREBUILT_LLVM}")
 message(STATUS "NGRAPH_PLAIDML_ENABLE:          ${NGRAPH_PLAIDML_ENABLE}")
 message(STATUS "NGRAPH_DISTRIBUTED_ENABLE:      ${NGRAPH_DISTRIBUTED_ENABLE}")
+message(STATUS "NGRAPH_JSON_ENABLE:             ${NGRAPH_JSON_ENABLE}")
 
 #-----------------------------------------------------------------------------------------------
 # Installation logic...
@@ -452,7 +459,10 @@ if (NGRAPH_ONNX_IMPORT_ENABLE)
 endif()
 
 include(cmake/external_gtest.cmake)
-include(cmake/external_json.cmake)
+if(NGRAPH_JSON_ENABLE)
+    add_definitions(-DNGRAPH_JSON_ENABLE)
+    include(cmake/external_json.cmake)
+endif()
 if(NGRAPH_CPU_ENABLE OR NGRAPH_GENERIC_CPU_ENABLE)
     include(cmake/external_eigen.cmake)
 endif()

src/ngraph/CMakeLists.txt

@@ -60,8 +60,6 @@ set (SRC
     dimension.cpp
     dimension.hpp
     except.hpp
-    event_tracing.hpp
-    event_tracing.cpp
     file_util.cpp
     file_util.hpp
     function.cpp
@@ -372,8 +370,6 @@ set (SRC
     runtime/performance_counter.hpp
     runtime/tensor.cpp
     runtime/tensor.hpp
-    serializer.cpp
-    serializer.hpp
     shape.cpp
     shape.hpp
     shape_util.cpp
@@ -412,6 +408,9 @@ set(SRC ${SRC}
     runtime/hybrid/pass/memory_layout.hpp
     )
 
+if(NGRAPH_JSON_ENABLE)
+    list(APPEND SRC serializer.cpp serializer.hpp event_tracing.cpp event_tracing.hpp)
+endif()
 
 if(NGRAPH_DISTRIBUTED_ENABLE)
     list(APPEND SRC distributed.cpp distributed.hpp)
@@ -461,7 +460,9 @@ if(NGRAPH_LIB_VERSIONING_ENABLE)
         VERSION ${NGRAPH_VERSION}
         SOVERSION ${NGRAPH_API_VERSION})
 endif()
-target_link_libraries(ngraph PRIVATE libjson)
+if(NGRAPH_JSON_ENABLE)
+    target_link_libraries(ngraph PRIVATE libjson)
+endif()
 target_compile_definitions(ngraph PUBLIC NGRAPH_VERSION="${NGRAPH_VERSION}")
 
 if (LINUX)

src/ngraph/pass/serialize.cpp

@@ -18,9 +18,11 @@
 
 #include "ngraph/file_util.hpp"
 #include "ngraph/pass/serialize.hpp"
-#include "ngraph/serializer.hpp"
 #include "ngraph/util.hpp"
+#ifdef NGRAPH_JSON_ENABLE
+#include "ngraph/serializer.hpp"
 #include "nlohmann/json.hpp"
+#endif
 
 using namespace std;
 using namespace ngraph;
@@ -32,8 +34,10 @@ pass::Serialization::Serialization(const string& name)
 
 bool pass::Serialization::run_on_module(vector<shared_ptr<Function>>& functions)
 {
+#ifdef NGRAPH_JSON_ENABLE
     // serializing the outermost functions
     // also implicitly serializes any inner functions
     serialize(m_name, functions.at(0), 4);
+#endif
     return false;
 }

src/ngraph/runtime/cpu/CMakeLists.txt

@@ -197,7 +197,10 @@ if (NGRAPH_CPU_ENABLE)
     endif()
 
     add_dependencies(cpu_backend libmkldnn ext_eigen)
-    target_link_libraries(cpu_backend PUBLIC ngraph libmkldnn libmkl libeigen libjson libtbb)
+    target_link_libraries(cpu_backend PUBLIC ngraph libmkldnn libmkl libeigen libtbb)
+    if (NGRAPH_JSON_ENABLE)
+        target_link_libraries(cpu_backend PUBLIC libjson)
+    endif()
     if (NOT NGRAPH_DEX_ONLY)
         target_link_libraries(cpu_backend PUBLIC codegen)
     endif()

src/ngraph/runtime/cpu/cpu_debugger.cpp

@@ -21,7 +21,6 @@
 #include "ngraph/runtime/cpu/cpu_external_function.hpp"
 #include "ngraph/runtime/cpu/cpu_runtime_context.hpp"
 #include "ngraph/runtime/cpu/cpu_tensor_view.hpp"
-#include "ngraph/runtime/cpu/cpu_tracing.hpp"
 
 using namespace std;
 using namespace ngraph;

src/ngraph/runtime/cpu/cpu_tracing.cpp

@@ -19,6 +19,7 @@
 
 #include "cpu_tracing.hpp"
 
+#ifdef NGRAPH_JSON_ENABLE
 void ngraph::runtime::cpu::to_json(nlohmann::json& json, const TraceEvent& event)
 {
     std::map<std::string, std::string> args;
@@ -76,3 +77,16 @@ bool ngraph::runtime::cpu::IsTracingEnabled()
     static bool enabled = (std::getenv("NGRAPH_CPU_TRACING") != nullptr);
     return enabled;
 }
+#else
+void ngraph::runtime::cpu::GenerateTimeline(const std::vector<OpAttributes>& op_attrs,
+                                            int64_t* op_durations,
+                                            const std::string& file_name)
+{
+    return;
+}
+
+bool ngraph::runtime::cpu::IsTracingEnabled()
+{
+    return false;
+}
+#endif

src/ngraph/runtime/cpu/cpu_tracing.hpp

@@ -21,7 +21,9 @@
 #include <vector>
 
 #include "ngraph/runtime/cpu/cpu_external_function.hpp"
+#ifdef NGRAPH_JSON_ENABLE
 #include "nlohmann/json.hpp"
+#endif
 
 namespace ngraph
 {
@@ -65,8 +67,9 @@ namespace ngraph
                 {
                 }
             };
-
+#ifdef NGRAPH_JSON_ENABLE
             void to_json(nlohmann::json& json, const TraceEvent& event);
+#endif
 
             void GenerateTimeline(const std::vector<OpAttributes>& op_attrs,
                                   int64_t* op_durations,

test/CMakeLists.txt

@@ -39,11 +39,9 @@ set(SRC
     control_dependencies.cpp
     coordinate.cpp
     copy.cpp
-    core.cpp
     cpio.cpp
     cse.cpp
     element_type.cpp
-    event_tracing.cpp
     file_util.cpp
     includes.cpp
     input_output_assign.cpp
@@ -62,7 +60,6 @@ set(SRC
     provenance.cpp
     reshape_elimination.cpp
     reshape_sinking.cpp
-    serialize.cpp
     shape.cpp
     specialize_shapes.cpp
     tensor.cpp
@@ -71,6 +68,10 @@ set(SRC
     zero_dim_tensor_elimination.cpp
 )
 
+if(NGRAPH_JSON_ENABLE)
+    list(APPEND SRC core.cpp event_tracing.cpp serialize.cpp)
+endif()
+
 if(NOT WIN32 AND NGRAPH_TOOLS_ENABLE)
     list(APPEND SRC tools.cpp)
 endif()
@@ -229,7 +230,10 @@ if(NGRAPH_DISTRIBUTED_ENABLE)
 endif()
 
 target_link_libraries(unit-test PRIVATE ngraph_test_util)
-target_link_libraries(unit-test PRIVATE ngraph libgtest libjson)
+target_link_libraries(unit-test PRIVATE ngraph libgtest)
+if (NGRAPH_JSON_ENABLE)
+    target_link_libraries(unit-test PRIVATE libjson)
+endif()
 if(NOT WIN32)
     target_link_libraries(unit-test PRIVATE pthread)
 endif()

test/autodiff.in.cpp

@@ -875,7 +875,7 @@ NGRAPH_TEST(${BACKEND_NAME}, backwards_batchmatmul_tensor2_tensor2)
 }
 #endif
 
-#if defined(AUTODIFF_BACKEND_CPU)
+#if defined(AUTODIFF_BACKEND_CPU) && defined(NGRAPH_JSON_ENABLE)
 NGRAPH_TEST(${BACKEND_NAME}, backwards_batchmatmultranspose_tensor2_tensor2)
 {
     auto backend = runtime::Backend::create("${BACKEND_NAME}");

test/backend_broadcast.in.cpp

@@ -462,6 +462,7 @@ NGRAPH_TEST(${BACKEND_NAME}, broadcast_matrix_2)
                                   MIN_FLOAT_TOLERANCE_BITS));
 }
 
+#ifdef NGRAPH_JSON_ENABLE
 NGRAPH_TEST(${BACKEND_NAME}, constant_broadcast)
 {
     const string js =
@@ -538,3 +539,4 @@ NGRAPH_TEST(${BACKEND_NAME}, constant_broadcast)
 
     // If this compiles it works
 }
+#endif

test/backend_test.in.cpp

@@ -6074,10 +6074,12 @@ NGRAPH_TEST(${BACKEND_NAME}, batch_norm_bprop_n4c3h2w2)
     auto df = make_shared<Function>(NodeVector{dinput, dgamma, dbeta},
                                     ParameterVector{mean, var, input, gamma, beta, C});
 
+#ifdef NGRAPH_JSON_ENABLE
     // roundtrip serialization
     string js = serialize(df, 4);
     istringstream in(js);
     df = deserialize(in);
+#endif
 
     shared_ptr<runtime::Tensor> _dinput = backend->create_tensor(element::f32, shape_r);
     shared_ptr<runtime::Tensor> _dgamma = backend->create_tensor(element::f32, gamma_shape);

test/control_dependencies.cpp

@@ -35,7 +35,6 @@
 #include "ngraph/runtime/cpu/pass/cpu_fusion.hpp"
 #include "ngraph/serializer.hpp"
 #include "ngraph/util.hpp"
-#include "nlohmann/json.hpp"
 #include "util/all_close.hpp"
 #include "util/autodiff/backprop_function.hpp"
 #include "util/autodiff/numeric_compare.hpp"
@@ -164,6 +163,7 @@ TEST(control_dependencies, clone_function_cdop_abs)
     }
 }
 
+#ifdef NGRAPH_JSON_ENABLE
 TEST(control_dependencies, serialize_cdop)
 {
     auto A = make_shared<op::Parameter>(element::f32, Shape{});
@@ -209,3 +209,4 @@ TEST(control_dependencies, serialize_cdop_abs)
         ASSERT_TRUE(std::dynamic_pointer_cast<op::Abs>(ccdep));
     }
 }
+#endif

test/core_fusion.cpp

@@ -37,7 +37,6 @@
 #include "ngraph/pattern/op/skip.hpp"
 #include "ngraph/serializer.hpp"
 #include "ngraph/util.hpp"
-#include "nlohmann/json.hpp"
 #include "util/all_close.hpp"
 #include "util/autodiff/backprop_function.hpp"
 #include "util/matcher.hpp"
@@ -61,6 +60,7 @@ TEST(core_fusion, core_fusion_pass_basic)
     ASSERT_NE(std::dynamic_pointer_cast<op::Relu>(graph->get_argument(0)), nullptr);
 }
 
+#ifdef NGRAPH_JSON_ENABLE
 TEST(core_fusion, sigmoid_fprop_fusion)
 {
     pass::Manager pass_manager;
@@ -74,6 +74,20 @@ TEST(core_fusion, sigmoid_fprop_fusion)
     ASSERT_EQ(ccg, 1);
 }
 
+TEST(core_fusion, sigmoid_bprop_fusion)
+{
+    const string json_path = file_util::path_join(SERIALIZED_ZOO, "mxnet/Graph_fprop_sigmoid.json");
+    const string json_string = file_util::read_file_to_string(json_path);
+    stringstream ss(json_string);
+    shared_ptr<Function> func = ngraph::deserialize(ss);
+    auto df = autodiff::backprop_function(func);
+    auto backend = runtime::Backend::create("CPU");
+    backend->compile(df);
+    size_t ccg = count_ops_of_type<op::SigmoidBackprop>(df);
+    ASSERT_EQ(ccg, 1);
+}
+#endif
+
 TEST(core_fusion, sigmoid_fprop_fusion_no_broadcast)
 {
     auto make_function = []() {
@@ -121,19 +135,6 @@ TEST(core_fusion, sigmoid_fprop_fusion_no_broadcast2)
     ASSERT_EQ(ccg, 0);
 }
 
-TEST(core_fusion, sigmoid_bprop_fusion)
-{
-    const string json_path = file_util::path_join(SERIALIZED_ZOO, "mxnet/Graph_fprop_sigmoid.json");
-    const string json_string = file_util::read_file_to_string(json_path);
-    stringstream ss(json_string);
-    shared_ptr<Function> func = ngraph::deserialize(ss);
-    auto df = autodiff::backprop_function(func);
-    auto backend = runtime::Backend::create("CPU");
-    backend->compile(df);
-    size_t ccg = count_ops_of_type<op::SigmoidBackprop>(df);
-    ASSERT_EQ(ccg, 1);
-}
-
 TEST(core_fusion, reshape_broadcast)
 {
     auto generate_func = []() {

test/cpu_test.cpp

@@ -41,7 +41,6 @@
 #include "ngraph/runtime/cpu/op/convert_layout.hpp"
 #include "ngraph/serializer.hpp"
 #include "ngraph/util.hpp"
-#include "nlohmann/json.hpp"
 #include "util/all_close.hpp"
 #include "util/all_close_f.hpp"
 #include "util/autodiff/backprop_function.hpp"

test/gpu_fusion.cpp

@@ -128,6 +128,7 @@ TEST(gpu_fusion, rnn_fprop_1_lstm_cell)
 }
 #endif
 
+#ifdef NGRAPH_JSON_ENABLE
 TEST(gpu_fusion, fuse_lstm_cells)
 {
     pass::Manager pass_manager;
@@ -182,6 +183,7 @@ TEST(DISABLED_gpu_fusion, fuse_1_layer_rnn)
         EXPECT_EQ(node->get_num_timesteps(), node->get_src_sequence_length());
     }
 }
+#endif
 
 TEST(gpu_fusion, lstm_analytic)
 {
@@ -419,6 +421,7 @@ TEST(gpu_fusion, fuse_2_layer_rnn_1lstm_analytic)
     EXPECT_TRUE(test::all_close(std::vector<float>{ct_val_second}, read_vector<float>(result_ct)));
 }
 
+#ifdef NGRAPH_JSON_ENABLE
 TEST(gpu_fusion, rnn_fusion_inter_vs_gpu_1lstm_cell)
 {
     const std::string file_name("mxnet/1_lstm_cell_forward.json");
@@ -528,3 +531,4 @@ TEST(gpu_fusion, fuse_rnn_across_2layer_1timestep)
         EXPECT_TRUE(test::all_close(gpu_results.at(1), int_results.at(1), 1.0e-4f, 1.0e-4f));
     }
 }
+#endif

test/reshape_elimination.cpp

@@ -36,7 +36,6 @@
 #include "ngraph/serializer.hpp"
 #include "ngraph/util.hpp"
 #include "ngraph/util.hpp"
-#include "nlohmann/json.hpp"
 #include "util/all_close.hpp"
 #include "util/matcher.hpp"
 #include "util/random.hpp"
@@ -45,6 +44,7 @@
 using namespace ngraph;
 using namespace std;
 
+#ifdef NGRAPH_JSON_ENABLE
 TEST(reshape_elimination, remove_reshape)
 {
     pass::Manager pass_manager;
@@ -86,6 +86,7 @@ TEST(reshape_elimination, bn_bprop_rewrite)
     size_t count_after = count_ops_of_type<op::Reshape>(func);
     ASSERT_TRUE(count_after < count_before);
 }
+#endif
 
 TEST(reshape_elimination, dot_transpose_to_dot_w_transpose_args)
 {

test/reshape_sinking.cpp

@@ -37,7 +37,6 @@
 #include "ngraph/pass/visualize_tree.hpp"
 #include "ngraph/serializer.hpp"
 #include "ngraph/util.hpp"
-#include "nlohmann/json.hpp"
 #include "util/all_close.hpp"
 #include "util/autodiff/backprop_function.hpp"
 #include "util/autodiff/numeric_compare.hpp"
@@ -111,6 +110,7 @@ TEST(reshape_sinking, broadcast_swimming)
     ASSERT_EQ(add->get_argument(1), conv);
 }
 
+#ifdef NGRAPH_JSON_ENABLE
 TEST(reshape_sinking, mnist_conv)
 {
     const string json_path = file_util::path_join(SERIALIZED_ZOO, "tf_conv_mnist_nhwc.json");
@@ -130,6 +130,7 @@ TEST(reshape_sinking, mnist_conv)
     size_t before_after = count_ops_of_type<op::Reshape>(func);
     ASSERT_LE(before_after, before_count);
 }
+#endif
 
 TEST(reshape_sinking, nasnet_pooladd)
 {

test/util/test_tools.cpp

@@ -302,6 +302,7 @@ string
     return ss.str();
 }
 
+#ifdef NGRAPH_JSON_ENABLE
 std::shared_ptr<Function> make_function_from_file(const std::string& file_name)
 {
     const string json_path = file_util::path_join(SERIALIZED_ZOO, file_name);
@@ -310,3 +311,4 @@ std::shared_ptr<Function> make_function_from_file(const std::string& file_name)
     shared_ptr<Function> func = ngraph::deserialize(ss);
     return func;
 }
+#endif

test/util/test_tools.hpp

@@ -40,7 +40,9 @@ namespace ngraph
 
 bool validate_list(const std::list<std::shared_ptr<ngraph::Node>>& nodes);
 std::shared_ptr<ngraph::Function> make_test_graph();
+#ifdef NGRAPH_JSON_ENABLE
 std::shared_ptr<ngraph::Function> make_function_from_file(const std::string& file_name);
+#endif
 
 template <typename T>
 void copy_data(std::shared_ptr<ngraph::runtime::Tensor> tv, const std::vector<T>& data)