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

Fixed clang format for plugin files with version (#18546)

Browse Source
This commit is contained in:
Ilya Churaev 2023-07-14 10:41:38 +04:00 committed by GitHub
parent 4c49040ce6
commit cba84fd763
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/developer_package/plugins/plugins.cmake
View File

@ -103,7 +103,7 @@ function(ov_add_plugin)
endforeach()
if (OV_PLUGIN_ADD_CLANG_FORMAT)
add_clang_format_target(${OV_PLUGIN_NAME}_clang FOR_TARGETS ${OV_PLUGIN_NAME})
add_clang_format_target(${OV_PLUGIN_NAME}_clang FOR_SOURCES ${OV_PLUGIN_SOURCES})
else()
add_cpplint_target(${OV_PLUGIN_NAME}_cpplint FOR_TARGETS ${OV_PLUGIN_NAME} CUSTOM_FILTERS ${custom_filter})
endif()

69
src/plugins/hetero/src/plugin.cpp
View File

@ -2,66 +2,56 @@
// SPDX-License-Identifier: Apache-2.0
//
#include "itt.hpp"
#include "plugin.hpp"
#include "compiled_model.hpp"
#include <memory>
#include <vector>
#include <map>
#include <string>
#include <utility>
#include <fstream>
#include <map>
#include <memory>
#include <string>
#include <unordered_set>
#include <utility>
#include <vector>
#include "openvino/runtime/device_id_parser.hpp"
#include "openvino/runtime/properties.hpp"
#include "openvino/runtime/internal_properties.hpp"
#include "openvino/util/common_util.hpp"
#include "compiled_model.hpp"
#include "ie/ie_plugin_config.hpp"
#include "itt.hpp"
#include "openvino/runtime/device_id_parser.hpp"
#include "openvino/runtime/internal_properties.hpp"
#include "openvino/runtime/properties.hpp"
#include "openvino/util/common_util.hpp"
#include "properties.hpp"
ov::hetero::Plugin::Plugin() {
set_device_name("HETERO");
}
std::shared_ptr<ov::ICompiledModel> ov::hetero::Plugin::compile_model(
const std::shared_ptr<const ov::Model>& model,
const ov::AnyMap& properties) const {
std::shared_ptr<ov::ICompiledModel> ov::hetero::Plugin::compile_model(const std::shared_ptr<const ov::Model>& model,
const ov::AnyMap& properties) const {
OV_ITT_SCOPED_TASK(itt::domains::Hetero, "Plugin::compile_model");
auto config = Configuration{properties, m_cfg};
auto compiled_model = std::make_shared<CompiledModel>(
model->clone(),
shared_from_this(),
config);
auto compiled_model = std::make_shared<CompiledModel>(model->clone(), shared_from_this(), config);
return compiled_model;
}
std::shared_ptr<ov::ICompiledModel> ov::hetero::Plugin::compile_model(const std::shared_ptr<const ov::Model>& model,
const ov::AnyMap& properties,
const ov::RemoteContext& context) const {
const ov::AnyMap& properties,
const ov::RemoteContext& context) const {
OPENVINO_NOT_IMPLEMENTED;
}
std::shared_ptr<ov::ICompiledModel> ov::hetero::Plugin::import_model(std::istream& model,
const ov::RemoteContext& context,
const ov::AnyMap& properties) const {
const ov::RemoteContext& context,
const ov::AnyMap& properties) const {
OPENVINO_NOT_IMPLEMENTED;
}
std::shared_ptr<ov::ICompiledModel> ov::hetero::Plugin::import_model(std::istream& model,
const ov::AnyMap& properties) const {
OV_ITT_SCOPED_TASK(itt::domains::Hetero, "Plugin::import_model");
auto config = Configuration{properties, m_cfg};
auto compiled_model = std::make_shared<CompiledModel>(
model,
shared_from_this(),
config,
true);
auto compiled_model = std::make_shared<CompiledModel>(model, shared_from_this(), config, true);
return compiled_model;
}
@ -84,8 +74,9 @@ ov::SupportedOpsMap ov::hetero::Plugin::query_model(const std::shared_ptr<const
OPENVINO_ASSERT(model, "OpenVINO Model is empty!");
Configuration full_config{properties, m_cfg};
DeviceProperties properties_per_device = get_properties_per_device(full_config.device_priorities, full_config.get_device_properties());
Configuration full_config{properties, m_cfg};
DeviceProperties properties_per_device =
get_properties_per_device(full_config.device_priorities, full_config.get_device_properties());
std::map<std::string, ov::SupportedOpsMap> query_results;
for (const auto& it : properties_per_device) {
@ -120,8 +111,7 @@ ov::Any ov::hetero::Plugin::get_property(const std::string& name, const ov::AnyM
const auto& default_ro_properties = []() {
std::vector<ov::PropertyName> ro_properties{ov::supported_properties,
ov::device::full_name,
ov::device::capabilities
};
ov::device::capabilities};
return ro_properties;
};
const auto& default_rw_properties = []() {
@ -180,13 +170,10 @@ ov::Any ov::hetero::Plugin::caching_device_properties(const std::string& device_
std::vector<ov::AnyMap> result = {};
for (const auto& device_name : device_names) {
ov::AnyMap properties = {};
auto supported_properties =
get_core()->get_property(device_name, ov::supported_properties);
auto supported_internal_properties =
get_core()->get_property(device_name, ov::internal::supported_properties);
auto supported_properties = get_core()->get_property(device_name, ov::supported_properties);
auto supported_internal_properties = get_core()->get_property(device_name, ov::internal::supported_properties);
if (ov::util::contains(supported_internal_properties, ov::internal::caching_properties)) {
auto caching_properties =
get_core()->get_property(device_name, ov::internal::caching_properties);
auto caching_properties = get_core()->get_property(device_name, ov::internal::caching_properties);
for (const auto& property_name : caching_properties) {
properties[property_name] = get_core()->get_property(device_name, std::string(property_name), {});
}

2
src/plugins/template/src/plugin.cpp
View File

@ -14,8 +14,8 @@
#include "remote_context.hpp"
#include "template/properties.hpp"
#include "transformations/common_optimizations/common_optimizations.hpp"
#include "transformations/fp16_compression/convert_compression_only_to_legacy.hpp"
#include "transformations/control_flow/unroll_if.hpp"
#include "transformations/fp16_compression/convert_compression_only_to_legacy.hpp"
#include "transformations/fp16_compression/mark_decompression_convert_constant_folding.hpp"
#include "transformations/op_conversions/convert_reduce_to_pooling.hpp"