Gcc13 (#3538)

* enabling compilation with gcc13
Co-authored-by: Copilot <[email protected]>

---------

Co-authored-by: mzegla <[email protected]>
Co-authored-by: Copilot <[email protected]>

Author: 3 people

.bazelrc

@@ -102,7 +102,6 @@ build:linux --cxxopt=-fstack-clash-protection
 build:linux --cxxopt=-Wformat
 build:linux --cxxopt=-Wformat-security
 build:linux --cxxopt=-Werror=format-security
-
 # TODO: Add equivalent windows flag
 build:linux --force_pic
 

BUILD.bazel

@@ -53,7 +53,7 @@ cc_library(
                 "@azure//:storage",
                 "@cpprest//:sdk",
                 "@boost//:boost",
-                "@com_github_googleapis_google_cloud_cpp//google/cloud/storage:storage_client",],
+                "@google_cloud_cpp//:storage",],
             "//:disable_cloud": []
             })
          + select({

Dockerfile.ubuntu

@@ -27,8 +27,6 @@ ENV DEBIAN_FRONTEND=noninteractive
 ARG BASE_IMAGE
 RUN apt-get update && apt-get install --no-install-recommends -y \
             build-essential \
-            gcc-9 \
-            g++-9 \
             make \
             cmake \
             automake \
@@ -45,8 +43,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
             pkg-config \
             wget \
             zlib1g-dev && \
-            update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9 && \
-            update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9 && \
             apt-get clean && \
             rm -rf /var/lib/apt/lists/*
 

WORKSPACE

@@ -525,25 +525,33 @@ new_local_repository(
 
 # Google Cloud SDK
 http_archive(
-    name = "com_github_googleapis_google_cloud_cpp",
-    sha256 = "a370bcf2913717c674a7250c4a310250448ffeb751b930be559a6f1887155f3b",
-    strip_prefix = "google-cloud-cpp-0.21.0",
-    url = "https://github.com/googleapis/google-cloud-cpp/archive/v0.21.0.tar.gz",
-    repo_mapping = {"@com_github_curl_curl" : "@curl"}
+    name = "google_cloud_cpp",
+    sha256 = "629cbfcc5bd581d38277ba8fa94a5b6591af1e0f6af0dab6d1d9ed796bf48b61",
+    strip_prefix = "google-cloud-cpp-2.39.0",
+    url = "https://github.com/googleapis/google-cloud-cpp/archive/v2.39.0.tar.gz",
 )
 
-load("@com_github_googleapis_google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_deps")
-google_cloud_cpp_deps()
+load("@google_cloud_cpp//bazel:workspace0.bzl", "gl_cpp_workspace0")
 
-load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
-switched_rules_by_language(
-    name = "com_google_googleapis_imports",
-    cc = True,  # C++ support is only "Partially implemented", roll our own.
-    grpc = True,
-)
+gl_cpp_workspace0()
+
+load("@google_cloud_cpp//bazel:workspace1.bzl", "gl_cpp_workspace1")
+
+gl_cpp_workspace1()
+
+load("@google_cloud_cpp//bazel:workspace2.bzl", "gl_cpp_workspace2")
+
+gl_cpp_workspace2()
+
+load("@google_cloud_cpp//bazel:workspace4.bzl", "gl_cpp_workspace4")
+
+gl_cpp_workspace4()
+
+load("@google_cloud_cpp//bazel:workspace5.bzl", "gl_cpp_workspace5")
+
+gl_cpp_workspace5()
 
-load("@com_github_googleapis_google_cloud_cpp_common//bazel:google_cloud_cpp_common_deps.bzl", "google_cloud_cpp_common_deps")
-google_cloud_cpp_common_deps()
+# grpc
 
 load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
 grpc_deps()

src/BUILD

@@ -1215,7 +1215,7 @@ ovms_cc_library(
             "gcsfilesystem.cpp",
     ],
     deps = [
-        "@com_github_googleapis_google_cloud_cpp//google/cloud/storage:storage_client",
+        "@google_cloud_cpp//:storage",
         "libovmsfilesystem",
         "libovmslogging",
         "libovmsstring_utils",

src/kfs_frontend/serialization.hpp

@@ -31,6 +31,11 @@ Status serializeTensorToTensorProto(
     ::KFSResponse::InferOutputTensor& responseOutput,
     const std::shared_ptr<const TensorInfo>& servableOutput,
     ov::Tensor& tensor);
+Status serializeTensorToTensorProtoRaw(
+    ::KFSResponse::InferOutputTensor& responseOutput,
+    std::string* rawOutputContents,
+    const std::shared_ptr<const TensorInfo>& servableOutput,
+    ov::Tensor& tensor);
 
 template <typename T>
 Status serializePredictResponse(

src/metric_registry.hpp

@@ -17,7 +17,7 @@
 
 #include <memory>
 #include <string>
-
+#include <stdexcept>
 #include <prometheus/registry.h>
 
 namespace ovms {

src/model.cpp

@@ -117,11 +117,11 @@ const std::shared_ptr<ModelInstance> Model::getDefaultModelInstance() const {
 std::shared_ptr<ovms::ModelInstance> Model::modelInstanceFactory(const std::string& modelName, const model_version_t modelVersion, ov::Core& ieCore, MetricRegistry* registry, const MetricConfig* metricConfig) {
     if (isStateful()) {
         SPDLOG_DEBUG("Creating new stateful model instance - model name: {}; model version: {};", modelName, modelVersion);
-        return std::move(std::static_pointer_cast<ModelInstance>(
-            std::make_shared<StatefulModelInstance>(modelName, modelVersion, ieCore, registry, metricConfig, this->globalSequencesViewer)));
+        return std::static_pointer_cast<ModelInstance>(
+            std::make_shared<StatefulModelInstance>(modelName, modelVersion, ieCore, registry, metricConfig, this->globalSequencesViewer));
     } else {
         SPDLOG_DEBUG("Creating new model instance - model name: {}; model version: {};", modelName, modelVersion);
-        return std::move(std::make_shared<ModelInstance>(modelName, modelVersion, ieCore, registry, metricConfig));
+        return std::make_shared<ModelInstance>(modelName, modelVersion, ieCore, registry, metricConfig);
     }
 }
 

src/python/python_executor_calculator.cc

@@ -231,8 +231,8 @@ class PythonExecutorCalculator : public CalculatorBase {
 
                 std::vector<py::object> pyInputs;
                 prepareInputs(cc, &pyInputs);
-                py::object executeResult = std::move(nodeResources->ovmsPythonModel->attr("execute")(pyInputs));
-                handleExecutionResult(cc, std::move(executeResult));
+                py::object executeResult = nodeResources->ovmsPythonModel->attr("execute")(pyInputs);
+                handleExecutionResult(cc, executeResult);
             }
         } catch (const UnexpectedOutputTensorError& e) {
             LOG(INFO) << "Error occurred during node " << cc->NodeName() << " execution: " << e.what();

src/stringutils.hpp

@@ -18,6 +18,8 @@
 #include <optional>
 #include <string>
 #include <vector>
+#include <cstdint>
+
 namespace ovms {
 
 std::string joins(const std::vector<std::string>& listOfStrings, const std::string delimiter);