Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
michalkulakowski committed Jan 27, 2025
1 parent c891cad commit e3da189
Show file tree
Hide file tree
Showing 33 changed files with 47 additions and 36 deletions.
4 changes: 3 additions & 1 deletion src/cli_parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,15 @@ void CLIParser::parse(int argc, char** argv) {
exit(3);
#endif
}

#pragma warning(push)
#pragma warning(disable : 4129)
if (result->count("version")) {
std::string project_name(PROJECT_NAME);
std::string project_version(PROJECT_VERSION);
std::cout << project_name + " " + project_version << std::endl;
std::cout << "OpenVINO backend " << OPENVINO_NAME << std::endl;
std::cout << "Bazel build flags: " << BAZEL_BUILD_FLAGS << std::endl;
#pragma warning(pop)
#ifdef __linux__
exit(EX_OK);
#elif _WIN32
Expand Down
2 changes: 1 addition & 1 deletion src/dags/entry_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "nodesession.hpp"

#pragma warning(push)
#pragma warning(disable : 4624 6001 6385 6386 6326)
#pragma warning(disable : 4624 6001 6385 6386 6326 6011)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wall"
#include "tensorflow/core/framework/tensor.h"
Expand Down
2 changes: 0 additions & 2 deletions src/dags/entry_node.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ class EntryNode : public Node {
throw std::logic_error("This node cannot have dependency");
}

Status isInputBinary(const std::string& name, bool& isBinary) const;

const Status validate();
};

Expand Down
2 changes: 1 addition & 1 deletion src/dags/exit_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <string>
#include <utility>
#pragma warning(push)
#pragma warning(disable : 4624 6001 6385 6386 6326)
#pragma warning(disable : 4624 6001 6385 6386 6326 6011)
#include "../capi_frontend/inferenceresponse.hpp"
#include "../logging.hpp"
#include "../ov_utils.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/dags/nodesessionmetadata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ std::string NodeSessionMetadata::createSessionKey(const std::set<std::string>& i
}
std::stringstream ss;
size_t j = 0;
for (size_t i = sessionsLevels.size() - 1; i >= 0; --i, ++j) {
for (int32_t i = sessionsLevels.size() - 1; i >= 0; --i, ++j) {
if ((ignoredNodeNames.size() > 0) &&
(ignoredNodeNames.size() > j) &&
(sessionsLevels.size() >= ignoredNodeNames.size()) &&
Expand Down
3 changes: 3 additions & 0 deletions src/dags/pipelinedefinition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,10 @@ Status PipelineDefinition::create(std::unique_ptr<Pipeline>& pipeline,
Pipeline::connect(*dependencyNode, *dependantNode, pair.second);
}
}
#pragma warning(push)
#pragma warning(disable : 6011)
pipeline = std::make_unique<Pipeline>(*entry, *exit, *this->reporter, pipelineName);
#pragma warning(pop)
for (auto& kv : nodes) {
pipeline->push(std::move(kv.second));
}
Expand Down
2 changes: 1 addition & 1 deletion src/deserialization.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <openvino/openvino.hpp>

#pragma warning(push)
#pragma warning(disable : 4624 6001 6385 6386 6326)
#pragma warning(disable : 4624 6001 6385 6386 6326 6011)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wall"
Expand Down
2 changes: 1 addition & 1 deletion src/embeddings/embeddings_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <variant>

#pragma warning(push)
#pragma warning(disable : 4005 4309 6001 6386)
#pragma warning(disable : 4005 4309 6001 6386 6011)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include "mediapipe/framework/port/canonical_errors.h"
Expand Down
2 changes: 1 addition & 1 deletion src/embeddings/embeddings_api.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <vector>

#pragma warning(push)
#pragma warning(disable : 6001 6385 6386)
#pragma warning(disable : 6001 6385 6386 6011)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include "mediapipe/framework/port/canonical_errors.h"
Expand Down
2 changes: 1 addition & 1 deletion src/get_model_metadata_impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <string>

#pragma warning(push)
#pragma warning(disable : 4624 6001 6385 6386 6326)
#pragma warning(disable : 4624 6001 6385 6386 6326 6011)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wall"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
Expand Down
2 changes: 1 addition & 1 deletion src/http_frontend/http_graph_executor_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <string>
#include <utility>
#pragma warning(push)
#pragma warning(disable : 4005 4309 6001 6385 6386 6326)
#pragma warning(disable : 4005 4309 6001 6385 6386 6326 6011 6294 6201)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include "mediapipe/framework/calculator_graph.h"
Expand Down
2 changes: 1 addition & 1 deletion src/http_frontend/http_graph_executor_impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "../mediapipe_internal/packettypes.hpp"
#include "../status.hpp"
#pragma warning(push)
#pragma warning(disable : 4005 4324 4309 6001 6385 6386 6326)
#pragma warning(disable : 4005 4324 4309 6001 6385 6386 6326 6011)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wall"
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
Expand Down
5 changes: 4 additions & 1 deletion src/kfs_frontend/kfs_graph_executor_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "../tfs_frontend/tfs_utils.hpp"

#pragma warning(push)
#pragma warning(disable : 6385 6386 6326)
#pragma warning(disable : 6385 6386 6326 6011 6294 6201 4309)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include "mediapipe/framework/calculator_graph.h"
Expand All @@ -43,7 +43,10 @@
#include "mediapipe/framework/formats/tensor.h"
#include "mediapipe/framework/port/status.h"
#pragma GCC diagnostic pop
#pragma warning(push)
#pragma warning(disable : 6269 6294 6201)
#include "opencv2/opencv.hpp"
#pragma warning(pop)

#if (PYTHON_DISABLE == 0)
#pragma warning(push)
Expand Down
2 changes: 1 addition & 1 deletion src/kfs_frontend/kfs_graph_executor_impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "../mediapipe_internal/packettypes.hpp"
#include "kfs_grpc_inference_service.hpp"
#pragma warning(push)
#pragma warning(disable : 6001 6385 6386 6326)
#pragma warning(disable : 6001 6385 6386 6326 6011 4309)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wall"
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
Expand Down
4 changes: 3 additions & 1 deletion src/llm/apis/openai_completions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@
#include "openai_completions.hpp"

#include <cmath>

#pragma warning(push)
#pragma warning(disable : 6269 6294 6201)
#include <opencv2/opencv.hpp>
#pragma warning(pop)
#pragma warning(push)
#pragma warning(disable : 6313)
#include <rapidjson/stringbuffer.h>
Expand Down
2 changes: 1 addition & 1 deletion src/llm/http_llm_calculator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <string>

#pragma warning(push)
#pragma warning(disable : 4005 4309 6001 6385 6386 6326)
#pragma warning(disable : 4005 4309 6001 6385 6386 6326 6011 4309 6246)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include "mediapipe/framework/calculator_framework.h"
Expand Down
2 changes: 1 addition & 1 deletion src/llm/llmnoderesources.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "../status.hpp"

#pragma warning(push)
#pragma warning(disable : 4005 4309 6001 6385 6386 6326)
#pragma warning(disable : 4005 4309 6001 6385 6386 6326 6011 4309)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include "mediapipe/framework/calculator_graph.h"
Expand Down
2 changes: 1 addition & 1 deletion src/llm/llmnoderesources.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <openvino/openvino.hpp>

#pragma warning(push)
#pragma warning(disable : 4005 4309 6001 6385 6386 6326)
#pragma warning(disable : 4005 4309 6001 6385 6386 6326 6011 4309)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include "mediapipe/framework/calculator_graph.h"
Expand Down
2 changes: 1 addition & 1 deletion src/llm/text_processor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <utility>

#pragma warning(push)
#pragma warning(disable : 4005 4309 6001 6385 6386 6326)
#pragma warning(disable : 4005 4309 6001 6385 6386 6326 6011 4309 6246)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include "mediapipe/framework/calculator_framework.h"
Expand Down
2 changes: 1 addition & 1 deletion src/mediapipe_internal/mediapipegraphdefinition.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include "../tensorinfo.hpp"

#pragma warning(push)
#pragma warning(disable : 4005 4309 6001 6385 6386 6326)
#pragma warning(disable : 4005 4309 6001 6385 6386 6326 6011 4309)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include "mediapipe/framework/calculator_graph.h"
Expand Down
2 changes: 1 addition & 1 deletion src/mediapipe_internal/mediapipegraphexecutor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <vector>

#pragma warning(push)
#pragma warning(disable : 4324 6001 6385 6386 6326)
#pragma warning(disable : 4324 6001 6385 6386 6326 6011 4309)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include "mediapipe/framework/calculator_graph.h"
Expand Down
2 changes: 1 addition & 1 deletion src/mediapipe_internal/mediapipegraphexecutor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "../profiler.hpp"
#include "../status.hpp"
#pragma warning(push)
#pragma warning(disable : 4324 6001 6385 6386 6326)
#pragma warning(disable : 4324 6001 6385 6386 6326 6011 4309)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include "mediapipe/framework/calculator_graph.h"
Expand Down
2 changes: 1 addition & 1 deletion src/prediction_service.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <spdlog/spdlog.h>

#pragma warning(push)
#pragma warning(disable : 4624 6001 4324 6385 6386 6326)
#pragma warning(disable : 4624 6001 4324 6385 6386 6326 6011)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wall"
#include "tensorflow/core/framework/tensor.h"
Expand Down
2 changes: 1 addition & 1 deletion src/python/pytensor_ovtensor_converter_calculator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <openvino/openvino.hpp>

#pragma warning(push)
#pragma warning(disable : 4005 4018 4309 4018 6001 6385 6386 6326)
#pragma warning(disable : 4005 4018 4309 4018 6001 6385 6386 6326 6011 4309 6246)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include "mediapipe/framework/calculator_framework.h"
Expand Down
2 changes: 1 addition & 1 deletion src/python/python_executor_calculator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "src/python/ovms_py_tensor.hpp"

#pragma warning(push)
#pragma warning(disable : 4005 6001 6385 6386 6326)
#pragma warning(disable : 4005 6001 6385 6386 6326 6011 6246)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include "mediapipe/framework/calculator_framework.h"
Expand Down
2 changes: 1 addition & 1 deletion src/python/pythonnoderesources.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "../status.hpp"

#pragma warning(push)
#pragma warning(disable : 4309 4005 6011 6326 6385 6246 6386 6326)
#pragma warning(disable : 4309 4005 6011 6326 6385 6246 6386 6326 6011)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include "mediapipe/framework/calculator_graph.h"
Expand Down
2 changes: 1 addition & 1 deletion src/python/pythonnoderesources.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#pragma warning(pop)

#pragma warning(push)
#pragma warning(disable : 4309 4005 6001 6011 6326 6385 6246 6386 6326)
#pragma warning(disable : 4309 4005 6001 6011 6326 6385 6246 6386 6326 6011)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include "mediapipe/framework/calculator_graph.h"
Expand Down
2 changes: 1 addition & 1 deletion src/rest_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <spdlog/spdlog.h>

#pragma warning(push)
#pragma warning(disable : 6001 4324 6385 6386)
#pragma warning(disable : 6001 4324 6385 6386 6011)
#include "absl/strings/escaping.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wall"
Expand Down
4 changes: 2 additions & 2 deletions src/schema.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -476,14 +476,14 @@ Status validateJsonAgainstSchema(rapidjson::Document& json, const char* schema,
if (!json.Accept(validator)) {
rapidjson::StringBuffer sb;
validator.GetInvalidSchemaPointer().StringifyUriFragment(sb);
std::string schema = sb.GetString();
std::string invalidatingSchema = sb.GetString();
std::string keyword = validator.GetInvalidSchemaKeyword();
sb.Clear();
validator.GetInvalidDocumentPointer().StringifyUriFragment(sb);
std::string key = sb.GetString();

std::string errorMsg = "JSON schema parse error:";
errorMsg += schema;
errorMsg += invalidatingSchema;
errorMsg += ". Keyword:";
errorMsg += keyword;
errorMsg += " Key: ";
Expand Down
2 changes: 1 addition & 1 deletion src/serialization.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <spdlog/spdlog.h>

#pragma warning(push)
#pragma warning(disable : 4624 6001 6385 6386 6326)
#pragma warning(disable : 4624 6001 6385 6386 6326 6011)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wall"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
Expand Down
5 changes: 4 additions & 1 deletion src/tensor_conversion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "tensor_conversion.hpp"

#pragma warning(push)
#pragma warning(disable : 4624 6001 6385 6386 6326)
#pragma warning(disable : 4624 6001 6385 6386 6326 6011)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wall"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
Expand All @@ -36,7 +36,10 @@
#include "capi_frontend/inferencetensor.hpp"
#include "kfs_frontend/kfs_utils.hpp"
#include "logging.hpp"
#pragma warning(push)
#pragma warning(disable : 6269 6294 6201)
#include "opencv2/opencv.hpp"
#pragma warning(pop)
#include "profiler.hpp"
#include "status.hpp"
#include "tfs_frontend/tfs_utils.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/tfs_frontend/tfs_utils.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <string>

#pragma warning(push)
#pragma warning(disable : 4624 6001 6385 6386 6326)
#pragma warning(disable : 4624 6001 6385 6386 6326 6011)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wall"
Expand Down
6 changes: 3 additions & 3 deletions src/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef SRC_VERSION_HPP_
#define SRC_VERSION_HPP_
#define PROJECT_NAME "OpenVINO Model Server"
#define PROJECT_VERSION "REPLACE_PROJECT_VERSION"
#define OPENVINO_NAME "REPLACE_OPENVINO_NAME"
#define BAZEL_BUILD_FLAGS "REPLACE_BAZEL_BUILD_FLAGS"
#define PROJECT_VERSION "2025.0.2b5c6c42"
#define OPENVINO_NAME "2025.0.0.dev20250116"
#define BAZEL_BUILD_FLAGS "--config=windows --action_env OpenVINO_DIR=C:\opt/openvino/runtime/cmake"
#endif // SRC_VERSION_HPP_"

0 comments on commit e3da189

Please sign in to comment.