IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ability to compile samples without API 1.0 headers (#20299)

Browse Source
This commit is contained in:
Ilya Lavrenov 2023-10-08 23:24:28 +04:00 committed by GitHub
parent ffbffed749
commit 142c6a4b67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/cpp/CMakeLists.txt
View File

@ -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)

16
samples/cpp/benchmark_app/main.cpp
View File

@ -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;

2
samples/cpp/benchmark_app/remote_tensors_filling.hpp
View File

@ -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"