From dcddf11c193acbff57c829e4b9bd63cb8b1427e4 Mon Sep 17 00:00:00 2001 From: Michal Kulakowski Date: Mon, 24 Nov 2025 13:17:00 +0100 Subject: [PATCH 1/5] Remove pragmas --- src/BUILD | 7 +++++-- src/capi_frontend/capi.cpp | 5 +---- src/config_export_module/BUILD | 1 + src/config_export_module/config_export.cpp | 5 +---- src/customloaderconfig.hpp | 5 +---- src/graph_export/BUILD | 1 + src/graph_export/graph_export.cpp | 5 +---- src/http_frontend/http_graph_executor_impl.hpp | 5 +---- src/json_parser.cpp | 5 +---- src/json_parser.hpp | 5 +---- src/llm/servable.cpp | 5 +++-- src/mediapipe_internal/mediapipegraphconfig.hpp | 5 +---- src/metric_config.cpp | 5 +---- src/metric_config.hpp | 5 +---- src/modelconfig.hpp | 5 +---- src/modelmanager.cpp | 5 +---- src/modelmanager.hpp | 5 +---- src/rest_parser.hpp | 5 +---- src/rest_utils.cpp | 5 +---- src/test/get_mediapipe_graph_metadata_response_test.cpp | 2 +- src/test/get_model_metadata_response_test.cpp | 2 +- src/test/get_pipeline_metadata_response_test.cpp | 2 +- src/test/kfs_rest_test.cpp | 2 +- src/test/llm/max_model_length_test.cpp | 2 +- src/utils/rapidjson_utils.cpp | 5 +---- 25 files changed, 31 insertions(+), 73 deletions(-) diff --git a/src/BUILD b/src/BUILD index d4aba5c0bb..3e5a30051b 100644 --- a/src/BUILD +++ b/src/BUILD @@ -341,6 +341,7 @@ ovms_cc_library( "libovms_execution_context", "libovmslogging", "libovmsmetrics", + "//src/port:rapidjson_document", ], visibility = ["//visibility:public",], ) @@ -361,6 +362,7 @@ ovms_cc_library( srcs = ["modelinstanceunloadguard.cpp",], deps = [ "modelinstance_h", + "//src/port:rapidjson_document", ], visibility = ["//visibility:public",], ) @@ -1156,6 +1158,7 @@ ovms_cc_library( "@com_github_tencent_rapidjson//:rapidjson", "//src/port:rapidjson_stringbuffer", "//src/port:rapidjson_writer", + "//src/port:rapidjson_document", "cpp_headers", "libovms_module", "libovmslogging", @@ -2239,9 +2242,9 @@ ovms_cc_library( ], srcs = ["json_parser.cpp"], deps = ["cpp_headers", - "@com_github_tencent_rapidjson//:rapidjson", "//third_party:openvino", - "libovmslogging"], + "libovmslogging", + "//src/port:rapidjson_document"], visibility = ["//visibility:public"], ) diff --git a/src/capi_frontend/capi.cpp b/src/capi_frontend/capi.cpp index 97694d938d..45bd411103 100644 --- a/src/capi_frontend/capi.cpp +++ b/src/capi_frontend/capi.cpp @@ -18,14 +18,11 @@ #include #include #include -#pragma warning(push) -#pragma warning(disable : 6313) -#include +#include "src/port/rapidjson_document.hpp" #include #include #include "src/port/rapidjson_stringbuffer.hpp" #include "src/port/rapidjson_writer.hpp" -#pragma warning(pop) #include "../dags/pipeline.hpp" #include "../dags/pipelinedefinition.hpp" diff --git a/src/config_export_module/BUILD b/src/config_export_module/BUILD index 2cd0094bc4..d8bfe52aaa 100644 --- a/src/config_export_module/BUILD +++ b/src/config_export_module/BUILD @@ -27,6 +27,7 @@ ovms_cc_library( "//src:libovmslocalfilesystem", "//src:libovmslogging", "//src:libovmsschema", + "//src/port:rapidjson_document", ], visibility = ["//visibility:public",], ) diff --git a/src/config_export_module/config_export.cpp b/src/config_export_module/config_export.cpp index 8e2e449564..b2162aebb5 100644 --- a/src/config_export_module/config_export.cpp +++ b/src/config_export_module/config_export.cpp @@ -15,13 +15,10 @@ //***************************************************************************** #include "config_export.hpp" -#pragma warning(push) -#pragma warning(disable : 6313) -#include +#include "src/port/rapidjson_document.hpp" #include #include #include -#pragma warning(pop) #include "../capi_frontend/server_settings.hpp" #include "src/filesystem.hpp" diff --git a/src/customloaderconfig.hpp b/src/customloaderconfig.hpp index 2bf5eee2ed..ecfe74730d 100644 --- a/src/customloaderconfig.hpp +++ b/src/customloaderconfig.hpp @@ -16,13 +16,10 @@ #pragma once #include -#pragma warning(push) -#pragma warning(disable : 6313) -#include +#include "src/port/rapidjson_document.hpp" #include #include "src/port/rapidjson_stringbuffer.hpp" #include "src/port/rapidjson_writer.hpp" -#pragma warning(pop) #include #include "filesystem.hpp" diff --git a/src/graph_export/BUILD b/src/graph_export/BUILD index 47dc407a1e..064736c882 100644 --- a/src/graph_export/BUILD +++ b/src/graph_export/BUILD @@ -34,6 +34,7 @@ ovms_cc_library( "@ovms//src:libovms_version", "//src/port:rapidjson_stringbuffer", "//src/port:rapidjson_writer", + "//src/port:rapidjson_document", ] + select({ "//:not_disable_mediapipe": [ "@mediapipe//mediapipe/framework/port:parse_text_proto", diff --git a/src/graph_export/graph_export.cpp b/src/graph_export/graph_export.cpp index 41d7f9fabb..8375e316b4 100644 --- a/src/graph_export/graph_export.cpp +++ b/src/graph_export/graph_export.cpp @@ -21,14 +21,11 @@ #include #include -#pragma warning(push) -#pragma warning(disable : 6313) -#include +#include "src/port/rapidjson_document.hpp" #include "src/port/rapidjson_stringbuffer.hpp" #include "src/port/rapidjson_writer.hpp" #include #include -#pragma warning(pop) #include "../capi_frontend/server_settings.hpp" #include "../config.hpp" diff --git a/src/http_frontend/http_graph_executor_impl.hpp b/src/http_frontend/http_graph_executor_impl.hpp index 9846b10158..431ded152b 100644 --- a/src/http_frontend/http_graph_executor_impl.hpp +++ b/src/http_frontend/http_graph_executor_impl.hpp @@ -18,10 +18,7 @@ #include #include #include -#pragma warning(push) -#pragma warning(disable : 6313) -#include -#pragma warning(pop) +#include "src/port/rapidjson_document.hpp" #include "../http_payload.hpp" #include "../mediapipe_internal/packettypes.hpp" diff --git a/src/json_parser.cpp b/src/json_parser.cpp index 762abd7e9c..efbe5be168 100644 --- a/src/json_parser.cpp +++ b/src/json_parser.cpp @@ -19,10 +19,7 @@ #include #include -#pragma warning(push) -#pragma warning(disable : 6313) -#include -#pragma warning(pop) +#include "src/port/rapidjson_document.hpp" #include "logging.hpp" #include "status.hpp" diff --git a/src/json_parser.hpp b/src/json_parser.hpp index 84fcec315c..4ed5385efe 100644 --- a/src/json_parser.hpp +++ b/src/json_parser.hpp @@ -20,10 +20,7 @@ #include #include -#pragma warning(push) -#pragma warning(disable : 6313) -#include -#pragma warning(pop) +#include "src/port/rapidjson_document.hpp" using plugin_config_t = std::map; diff --git a/src/llm/servable.cpp b/src/llm/servable.cpp index 9e84667ba9..102cc0aafe 100644 --- a/src/llm/servable.cpp +++ b/src/llm/servable.cpp @@ -23,11 +23,12 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #include "mediapipe/framework/calculator_graph.h" -#include -#include #pragma GCC diagnostic pop #pragma warning(pop) +#include "src/port/rapidjson_document.hpp" +#include + #include "../config.hpp" #include "../http_payload.hpp" #include "../logging.hpp" diff --git a/src/mediapipe_internal/mediapipegraphconfig.hpp b/src/mediapipe_internal/mediapipegraphconfig.hpp index 2e4f3d428e..7210c74b58 100644 --- a/src/mediapipe_internal/mediapipegraphconfig.hpp +++ b/src/mediapipe_internal/mediapipegraphconfig.hpp @@ -16,10 +16,7 @@ #pragma once #include -#pragma warning(push) -#pragma warning(disable : 6313) -#include -#pragma warning(pop) +#include "src/port/rapidjson_document.hpp" namespace ovms { diff --git a/src/metric_config.cpp b/src/metric_config.cpp index 8583d71207..c730ac5b38 100644 --- a/src/metric_config.cpp +++ b/src/metric_config.cpp @@ -18,13 +18,10 @@ #include #include #include -#pragma warning(push) -#pragma warning(disable : 6313) -#include +#include "src/port/rapidjson_document.hpp" #include #include "src/port/rapidjson_stringbuffer.hpp" #include "src/port/rapidjson_writer.hpp" -#pragma warning(pop) #include #include "logging.hpp" diff --git a/src/metric_config.hpp b/src/metric_config.hpp index f867125694..7864bf564a 100644 --- a/src/metric_config.hpp +++ b/src/metric_config.hpp @@ -18,10 +18,7 @@ #include #include #include -#pragma warning(push) -#pragma warning(disable : 6313) -#include -#pragma warning(pop) +#include "src/port/rapidjson_document.hpp" namespace ovms { diff --git a/src/modelconfig.hpp b/src/modelconfig.hpp index 55b5174db2..45fb70e8d0 100644 --- a/src/modelconfig.hpp +++ b/src/modelconfig.hpp @@ -24,10 +24,7 @@ #include #include #include -#pragma warning(push) -#pragma warning(disable : 6313) -#include -#pragma warning(pop) +#include "src/port/rapidjson_document.hpp" #include "anonymous_input_name.hpp" #include "layout_configuration.hpp" diff --git a/src/modelmanager.cpp b/src/modelmanager.cpp index 45978027ff..a8e3c972c0 100644 --- a/src/modelmanager.cpp +++ b/src/modelmanager.cpp @@ -34,13 +34,10 @@ #endif #include -#pragma warning(push) -#pragma warning(disable : 6313) -#include +#include "src/port/rapidjson_document.hpp" #include #include #include -#pragma warning(pop) #include #include "cleaner_utils.hpp" diff --git a/src/modelmanager.hpp b/src/modelmanager.hpp index 25822d7ccc..88b436de90 100644 --- a/src/modelmanager.hpp +++ b/src/modelmanager.hpp @@ -27,10 +27,7 @@ #include #include -#pragma warning(push) -#pragma warning(disable : 6313) -#include -#pragma warning(pop) +#include "src/port/rapidjson_document.hpp" #include #include diff --git a/src/rest_parser.hpp b/src/rest_parser.hpp index d729eff985..03f4391745 100644 --- a/src/rest_parser.hpp +++ b/src/rest_parser.hpp @@ -18,10 +18,7 @@ #include #include #include -#pragma warning(push) -#pragma warning(disable : 6313) -#include -#pragma warning(pop) +#include "src/port/rapidjson_document.hpp" #include #pragma GCC diagnostic push diff --git a/src/rest_utils.cpp b/src/rest_utils.cpp index 8d65fe8ee5..930ff9afbc 100644 --- a/src/rest_utils.cpp +++ b/src/rest_utils.cpp @@ -18,13 +18,10 @@ #include #include #include -#pragma warning(push) -#pragma warning(disable : 6313) -#include +#include "src/port/rapidjson_document.hpp" #include #include #include -#pragma warning(pop) #include #pragma warning(push) diff --git a/src/test/get_mediapipe_graph_metadata_response_test.cpp b/src/test/get_mediapipe_graph_metadata_response_test.cpp index 4b70491273..34e7e7fe0f 100644 --- a/src/test/get_mediapipe_graph_metadata_response_test.cpp +++ b/src/test/get_mediapipe_graph_metadata_response_test.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include "../port/rapidjson_document.hpp" #if (MEDIAPIPE_DISABLE == 0) #include "../mediapipe_internal/mediapipegraphdefinition.hpp" diff --git a/src/test/get_model_metadata_response_test.cpp b/src/test/get_model_metadata_response_test.cpp index 71d9b40617..2ff21f4115 100644 --- a/src/test/get_model_metadata_response_test.cpp +++ b/src/test/get_model_metadata_response_test.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include "../port/rapidjson_document.hpp" #include "../get_model_metadata_impl.hpp" #include "../modelmanager.hpp" diff --git a/src/test/get_pipeline_metadata_response_test.cpp b/src/test/get_pipeline_metadata_response_test.cpp index ce65a1f55a..061db43ff0 100644 --- a/src/test/get_pipeline_metadata_response_test.cpp +++ b/src/test/get_pipeline_metadata_response_test.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include "../port/rapidjson_document.hpp" #include "../dags/pipelinedefinition.hpp" #include "../get_model_metadata_impl.hpp" diff --git a/src/test/kfs_rest_test.cpp b/src/test/kfs_rest_test.cpp index cede07567f..959db47c86 100644 --- a/src/test/kfs_rest_test.cpp +++ b/src/test/kfs_rest_test.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include "../port/rapidjson_document.hpp" #include #include "../config.hpp" diff --git a/src/test/llm/max_model_length_test.cpp b/src/test/llm/max_model_length_test.cpp index b48290c539..d03b4c39ad 100644 --- a/src/test/llm/max_model_length_test.cpp +++ b/src/test/llm/max_model_length_test.cpp @@ -15,7 +15,7 @@ //***************************************************************************** #include #include -#include +#include "../port/rapidjson_document.hpp" #include diff --git a/src/utils/rapidjson_utils.cpp b/src/utils/rapidjson_utils.cpp index e41dd08b9b..0b5a8270ed 100644 --- a/src/utils/rapidjson_utils.cpp +++ b/src/utils/rapidjson_utils.cpp @@ -17,12 +17,9 @@ #include -#pragma warning(push) -#pragma warning(disable : 6313) -#include +#include "../port/rapidjson_document.hpp" #include "src/port/rapidjson_stringbuffer.hpp" #include "src/port/rapidjson_writer.hpp" -#pragma warning(pop) namespace ovms { std::string documentToString(const rapidjson::Document& doc) { From 652952ad6908f8cd70d4311babc53457137c496b Mon Sep 17 00:00:00 2001 From: Michal Kulakowski Date: Mon, 24 Nov 2025 13:52:46 +0100 Subject: [PATCH 2/5] fix --- src/test/llm/max_model_length_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/llm/max_model_length_test.cpp b/src/test/llm/max_model_length_test.cpp index d03b4c39ad..77602299d8 100644 --- a/src/test/llm/max_model_length_test.cpp +++ b/src/test/llm/max_model_length_test.cpp @@ -15,7 +15,7 @@ //***************************************************************************** #include #include -#include "../port/rapidjson_document.hpp" +#include "../../port/rapidjson_document.hpp" #include From fec6bcde3195c41674555d216fcbeeb9b0b91565 Mon Sep 17 00:00:00 2001 From: Michal Kulakowski Date: Mon, 24 Nov 2025 14:17:02 +0100 Subject: [PATCH 3/5] fix --- src/config_export_module/BUILD | 1 + src/config_export_module/config_export.cpp | 5 +++-- src/graph_export/BUILD | 1 + src/graph_export/graph_export.cpp | 2 +- src/llm/BUILD | 1 + src/llm/servable.cpp | 2 +- src/modelmanager.cpp | 2 +- src/port/BUILD | 7 +++++++ src/rest_utils.cpp | 2 +- 9 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/config_export_module/BUILD b/src/config_export_module/BUILD index d8bfe52aaa..069dada98c 100644 --- a/src/config_export_module/BUILD +++ b/src/config_export_module/BUILD @@ -28,6 +28,7 @@ ovms_cc_library( "//src:libovmslogging", "//src:libovmsschema", "//src/port:rapidjson_document", + "//src/port:rapidjson_prettywriter", ], visibility = ["//visibility:public",], ) diff --git a/src/config_export_module/config_export.cpp b/src/config_export_module/config_export.cpp index b2162aebb5..a41721506c 100644 --- a/src/config_export_module/config_export.cpp +++ b/src/config_export_module/config_export.cpp @@ -15,10 +15,11 @@ //***************************************************************************** #include "config_export.hpp" -#include "src/port/rapidjson_document.hpp" + +#include "src/port/rapidjson_prettywriter.hpp" #include #include -#include +#include "src/port/rapidjson_document.hpp" #include "../capi_frontend/server_settings.hpp" #include "src/filesystem.hpp" diff --git a/src/graph_export/BUILD b/src/graph_export/BUILD index 064736c882..f3d73eb991 100644 --- a/src/graph_export/BUILD +++ b/src/graph_export/BUILD @@ -35,6 +35,7 @@ ovms_cc_library( "//src/port:rapidjson_stringbuffer", "//src/port:rapidjson_writer", "//src/port:rapidjson_document", + "//src/port:rapidjson_prettywriter", ] + select({ "//:not_disable_mediapipe": [ "@mediapipe//mediapipe/framework/port:parse_text_proto", diff --git a/src/graph_export/graph_export.cpp b/src/graph_export/graph_export.cpp index 8375e316b4..69cf4001d3 100644 --- a/src/graph_export/graph_export.cpp +++ b/src/graph_export/graph_export.cpp @@ -25,7 +25,7 @@ #include "src/port/rapidjson_stringbuffer.hpp" #include "src/port/rapidjson_writer.hpp" #include -#include +#include "src/port/rapidjson_prettywriter.hpp" #include "../capi_frontend/server_settings.hpp" #include "../config.hpp" diff --git a/src/llm/BUILD b/src/llm/BUILD index d89f9999f5..2f0e1d4d10 100644 --- a/src/llm/BUILD +++ b/src/llm/BUILD @@ -218,6 +218,7 @@ ovms_cc_library( "//third_party:openvino", "@mediapipe//mediapipe/framework:calculator_framework", "@com_github_tencent_rapidjson//:rapidjson", + "//src/port:rapidjson_prettywriter", "//src:libmodelconfigjsonparser", "//src:libovmslogging", "//src:libovmsstatus", diff --git a/src/llm/servable.cpp b/src/llm/servable.cpp index 102cc0aafe..36643b2a1d 100644 --- a/src/llm/servable.cpp +++ b/src/llm/servable.cpp @@ -27,7 +27,7 @@ #pragma warning(pop) #include "src/port/rapidjson_document.hpp" -#include +#include "src/port/rapidjson_prettywriter.hpp" #include "../config.hpp" #include "../http_payload.hpp" diff --git a/src/modelmanager.cpp b/src/modelmanager.cpp index a8e3c972c0..e30973f040 100644 --- a/src/modelmanager.cpp +++ b/src/modelmanager.cpp @@ -37,7 +37,7 @@ #include "src/port/rapidjson_document.hpp" #include #include -#include +#include "src/port/rapidjson_prettywriter.hpp" #include #include "cleaner_utils.hpp" diff --git a/src/port/BUILD b/src/port/BUILD index 9ae1907ef1..bf380315e2 100644 --- a/src/port/BUILD +++ b/src/port/BUILD @@ -36,6 +36,13 @@ ovms_cc_library( visibility = ["//visibility:public",], ) +ovms_cc_library( + name = "rapidjson_prettywriter", + hdrs = ["rapidjson_prettywriter.hpp"], + deps = ["@com_github_tencent_rapidjson//:rapidjson"], + visibility = ["//visibility:public",], +) + ovms_cc_library( name = "dr_audio", hdrs = ["dr_audio.hpp"], diff --git a/src/rest_utils.cpp b/src/rest_utils.cpp index 930ff9afbc..a359434fb2 100644 --- a/src/rest_utils.cpp +++ b/src/rest_utils.cpp @@ -21,7 +21,7 @@ #include "src/port/rapidjson_document.hpp" #include #include -#include +#include "src/port/rapidjson_prettywriter.hpp" #include #pragma warning(push) From 0a8aaee35492a9bbabaa30562bc2fe924540ec0a Mon Sep 17 00:00:00 2001 From: Michal Kulakowski Date: Mon, 24 Nov 2025 14:29:50 +0100 Subject: [PATCH 4/5] style --- src/config_export_module/config_export.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/config_export_module/config_export.cpp b/src/config_export_module/config_export.cpp index a41721506c..f7285132a7 100644 --- a/src/config_export_module/config_export.cpp +++ b/src/config_export_module/config_export.cpp @@ -15,7 +15,6 @@ //***************************************************************************** #include "config_export.hpp" - #include "src/port/rapidjson_prettywriter.hpp" #include #include From 1f08f7e4fb4c7a37346f3e8333b9a22e9b7c1d50 Mon Sep 17 00:00:00 2001 From: Michal Kulakowski Date: Mon, 24 Nov 2025 14:40:48 +0100 Subject: [PATCH 5/5] fix --- src/port/rapidjson_prettywriter.hpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/port/rapidjson_prettywriter.hpp diff --git a/src/port/rapidjson_prettywriter.hpp b/src/port/rapidjson_prettywriter.hpp new file mode 100644 index 0000000000..16dd6dd80c --- /dev/null +++ b/src/port/rapidjson_prettywriter.hpp @@ -0,0 +1,21 @@ +#pragma once +//***************************************************************************** +// Copyright 2025 Intel Corporation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +//***************************************************************************** + +#pragma warning(push) +#pragma warning(disable : 6313) +#include +#pragma warning(pop)