Merge branch 'master' into river/cpu_plugin_api_2.0

maxnick · Oct 9, 2023 · ae27dee · ae27dee
2 parents 75a647a + 142c6a4
commit ae27dee
Show file tree

Hide file tree

Showing 28 changed files with 605 additions and 543 deletions.
diff --git a/.github/workflows/linux_conditional_compilation.yml b/.github/workflows/linux_conditional_compilation.yml
@@ -124,7 +124,7 @@ jobs:
             -DENABLE_CPPLINT=OFF \
             -DENABLE_NCC_STYLE=OFF \
             -DENABLE_INTEL_GNA=OFF \
-            -DCMAKE_COMPILE_WARNING_AS_ERROR=OFF \
+            -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \
             -DENABLE_PROFILING_ITT=ON \
             -DSELECTIVE_BUILD=COLLECT \
             -DCMAKE_C_COMPILER_LAUNCHER=${{ env.CMAKE_C_COMPILER_LAUNCHER }} \

diff --git a/.github/workflows/linux_riscv.yml b/.github/workflows/linux_riscv.yml
@@ -85,7 +85,6 @@ jobs:
 
           python3 -m venv ${OPENVINO_BUILD_DIR}/env
           source ${OPENVINO_BUILD_DIR}/env/bin/activate
-          python3 -m pip install -r ${OPENVINO_REPO}/src/bindings/python/requirements.txt
           python3 -m pip install -r ${OPENVINO_REPO}/src/bindings/python/wheel/requirements-dev.txt
           python3 -m pip install -r ${OPENVINO_REPO}/src/bindings/python/src/compatibility/openvino/requirements-dev.txt
           python3 -m pip install conan
@@ -151,9 +150,7 @@ jobs:
             -DPYTHON_MODULE_EXTENSION=$(riscv64-linux-gnu-python3-config --extension-suffix) \
             -DPYBIND11_PYTHON_EXECUTABLE_LAST=${OPENVINO_BUILD_DIR}/env/bin/python3.10 \
             -DENABLE_TESTS=ON \
-            -DTHREADING=SEQ \
             -DENABLE_PYTHON_PACKAGING=ON \
-            -DENABLE_SYSTEM_TBB=ON \
             -DENABLE_SYSTEM_PROTOBUF=ON \
             -DENABLE_SYSTEM_SNAPPY=ON \
             -DENABLE_SYSTEM_PUGIXML=ON \

diff --git a/cmake/features.cmake b/cmake/features.cmake
@@ -73,7 +73,14 @@ ie_dependent_option (ENABLE_PKGCONFIG_GEN "Enable openvino.pc pkg-config file ge
 #
 
 # "OneDNN library based on OMP or TBB or Sequential implementation: TBB|OMP|SEQ"
-set(THREADING "TBB" CACHE STRING "Threading")
+if(RISCV64)
+    # oneDNN does not support non-SEQ for RISC-V architecture
+    set(THREADING_DEFAULT "SEQ")
+else()
+    set(THREADING_DEFAULT "TBB")
+endif()
+
+set(THREADING "${THREADING_DEFAULT}" CACHE STRING "Threading")
 set_property(CACHE THREADING PROPERTY STRINGS "TBB" "TBB_AUTO" "OMP" "SEQ")
 list (APPEND IE_OPTIONS THREADING)
 if (NOT THREADING STREQUAL "TBB" AND

diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
@@ -214,7 +214,9 @@ macro(ie_add_sample)
     find_package(Threads REQUIRED)
 
     find_package(OpenVINO REQUIRED COMPONENTS Runtime)
-    if(c_sample)
+
+    # Conan does not generate openvino::runtime::c target
+    if(c_sample AND TARGET openvino::runtime::c)
         set(ov_link_libraries openvino::runtime::c)
     else()
         set(ov_link_libraries openvino::runtime)

diff --git a/samples/cpp/benchmark_app/main.cpp b/samples/cpp/benchmark_app/main.cpp
@@ -19,9 +19,6 @@
 #    define WAS_OV_LIBRARY_DEFINED
 #endif
 
-#include "gna/gna_config.hpp"
-#include "gpu/gpu_config.hpp"
-
 #ifdef WAS_OV_LIBRARY_DEFINED
 #    undef IN_OV_COMPONENT
 #    undef WAS_OV_LIBRARY_DEFINED
@@ -314,11 +311,11 @@ int main(int argc, char* argv[]) {
             // Override config if command line parameter is specified
             if (!config.count("GPU"))
                 config["GPU"] = {};
-            config["GPU"][CONFIG_KEY(CONFIG_FILE)] = FLAGS_c;
+            config["GPU"]["CONFIG_FILE"] = FLAGS_c;
         }
-        if (config.count("GPU") && config.at("GPU").count(CONFIG_KEY(CONFIG_FILE))) {
-            auto ext = config.at("GPU").at(CONFIG_KEY(CONFIG_FILE)).as<std::string>();
-            core.set_property("GPU", {{CONFIG_KEY(CONFIG_FILE), ext}});
+        if (config.count("GPU") && config.at("GPU").count("CONFIG_FILE")) {
+            auto ext = config.at("GPU").at("CONFIG_FILE").as<std::string>();
+            core.set_property("GPU", {{"CONFIG_FILE", ext}});
             slog::info << "GPU extensions are loaded: " << ext << slog::endl;
         }
         OPENVINO_SUPPRESS_DEPRECATED_END
@@ -846,9 +843,8 @@ int main(int argc, char* argv[]) {
                     slog::info << "  " << item.first << ": " << slog::endl;
                     for (auto& item2 : item.second.as<ov::AnyMap>()) {
                         OPENVINO_SUPPRESS_DEPRECATED_START
-                        if (item2.first == ov::supported_properties ||
-                            item2.first == METRIC_KEY(SUPPORTED_CONFIG_KEYS) ||
-                            item2.first == METRIC_KEY(SUPPORTED_METRICS))
+                        if (item2.first == ov::supported_properties || item2.first == "SUPPORTED_CONFIG_KEYS)" ||
+                            item2.first == "SUPPORTED_METRICS")
                             continue;
                         OPENVINO_SUPPRESS_DEPRECATED_END
                         slog::info << "    " << item2.first << ": " << item2.second.as<std::string>() << slog::endl;

diff --git a/samples/cpp/benchmark_app/remote_tensors_filling.hpp b/samples/cpp/benchmark_app/remote_tensors_filling.hpp
@@ -6,7 +6,7 @@
 
 #if defined(HAVE_GPU_DEVICE_MEM_SUPPORT)
 #    define HAVE_DEVICE_MEM_SUPPORT
-#    include <gpu/gpu_context_api_ocl.hpp>
+#    include "openvino/runtime/intel_gpu/ocl/ocl_wrapper.hpp"
 #endif
 #include "utils.hpp"