fix rt_info meta parse race condition (#19196)
* fix a possible race condition Signed-off-by: fishbell <bell.song@intel.com> * clang Signed-off-by: fishbell <bell.song@intel.com> * reimpl Signed-off-by: fishbell <bell.song@intel.com> * add cases Signed-off-by: fishbell <bell.song@intel.com> * implement test in 2.0 Signed-off-by: fishbell <bell.song@intel.com> * clean up unchanged files Signed-off-by: fishbell <bell.song@intel.com> * add pragma once Signed-off-by: fishbell <bell.song@intel.com> --------- Signed-off-by: fishbell <bell.song@intel.com>
This commit is contained in:
yanlan song
GitHub
@@ -614,18 +614,15 @@ private:
|
||||
}
|
||||
|
||||
void parse() const {
|
||||
// Thread safety is implemented on ov::Model level
|
||||
if (m_parsed)
|
||||
return;
|
||||
const pugi::xml_node& node = m_meta.child(m_name.c_str());
|
||||
m_parsed_map = parse_node(node);
|
||||
|
||||
m_parsed = true;
|
||||
std::call_once(m_oc, [this]() {
|
||||
const pugi::xml_node& node = m_meta.child(m_name.c_str());
|
||||
m_parsed_map = parse_node(node);
|
||||
});
|
||||
}
|
||||
pugi::xml_document m_meta;
|
||||
const std::string m_name;
|
||||
mutable ov::AnyMap m_parsed_map;
|
||||
mutable bool m_parsed{false};
|
||||
mutable std::once_flag m_oc;
|
||||
};
|
||||
|
||||
void XmlDeserializer::read_meta_data(const std::shared_ptr<ov::Model>& model, const pugi::xml_node& meta_section) {
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
// Copyright (C) 2018-2023 Intel Corporation
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
//
|
||||
|
||||
#include <behavior/ov_plugin/core_threading.hpp>
|
||||
|
||||
namespace {
|
||||
const Params paramsStreams[] = {
|
||||
std::tuple<Device, Config>{ ov::test::utils::DEVICE_CPU, {{ov::num_streams(ov::streams::AUTO)}}},
|
||||
};
|
||||
} // namespace
|
||||
|
||||
INSTANTIATE_TEST_SUITE_P(CPU_Streams, CoreThreadingTestsWithCacheEnabled,
|
||||
testing::Combine(testing::ValuesIn(paramsStreams),
|
||||
testing::Values(20),
|
||||
testing::Values(10)),
|
||||
CoreThreadingTestsWithCacheEnabled::getTestCaseName);
|
||||
@@ -0,0 +1,295 @@
|
||||
// Copyright (C) 2018-2023 Intel Corporation
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
//
|
||||
#pragma once
|
||||
|
||||
#include "openvino/runtime/properties.hpp"
|
||||
#include <gtest/gtest.h>
|
||||
#include <thread>
|
||||
#include <atomic>
|
||||
#include <mutex>
|
||||
#include <chrono>
|
||||
#include <functional_test_utils/skip_tests_config.hpp>
|
||||
#include "base/ov_behavior_test_utils.hpp"
|
||||
|
||||
using Device = std::string;
|
||||
using Config = ov::AnyMap;
|
||||
using Params = std::tuple<Device, Config>;
|
||||
|
||||
class CoreThreadingTestsBase {
|
||||
public:
|
||||
static void runParallel(std::function<void(void)> func,
|
||||
const unsigned int iterations = 100,
|
||||
const unsigned int threadsNum = 8) {
|
||||
std::vector<std::thread> threads(threadsNum);
|
||||
|
||||
for (auto & thread : threads) {
|
||||
thread = std::thread([&](){
|
||||
for (unsigned int i = 0; i < iterations; ++i) {
|
||||
func();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
for (auto & thread : threads) {
|
||||
if (thread.joinable())
|
||||
thread.join();
|
||||
}
|
||||
}
|
||||
|
||||
void safePluginUnregister(ov::Core & core, const std::string& deviceName) {
|
||||
try {
|
||||
core.unload_plugin(deviceName);
|
||||
} catch (const ov::Exception & ex) {
|
||||
// if several threads unload plugin at once, the first thread does this
|
||||
// while all others will throw an exception that plugin is not registered
|
||||
ASSERT_STR_CONTAINS(ex.what(), "name is not registered in the");
|
||||
}
|
||||
}
|
||||
|
||||
Config config;
|
||||
};
|
||||
|
||||
//
|
||||
// Parameterized tests with number of parallel threads, iterations
|
||||
//
|
||||
|
||||
using Threads = unsigned int;
|
||||
using Iterations = unsigned int;
|
||||
|
||||
using CoreThreadingParams = std::tuple<Params, Threads, Iterations>;
|
||||
|
||||
class CoreThreadingTestsWithCacheEnabled : public testing::WithParamInterface<CoreThreadingParams>,
|
||||
public ov::test::behavior::OVPluginTestBase,
|
||||
public CoreThreadingTestsBase {
|
||||
public:
|
||||
void SetUp() override {
|
||||
SKIP_IF_CURRENT_TEST_IS_DISABLED();
|
||||
std::tie(target_device, config) = std::get<0>(GetParam());
|
||||
numThreads = std::get<1>(GetParam());
|
||||
numIterations = std::get<2>(GetParam());
|
||||
auto hash = std::hash<std::string>()(::testing::UnitTest::GetInstance()->current_test_info()->name());
|
||||
std::stringstream ss;
|
||||
ss << std::this_thread::get_id();
|
||||
cache_path = "threading_test" + std::to_string(hash) + "_"
|
||||
+ ss.str() + "_" + GetTimestamp() + "_cache";
|
||||
}
|
||||
|
||||
void TearDown() override {
|
||||
ov::test::utils::removeFilesWithExt(cache_path, "blob");
|
||||
std::remove(cache_path.c_str());
|
||||
}
|
||||
|
||||
static std::string getTestCaseName(testing::TestParamInfo<CoreThreadingParams> obj) {
|
||||
unsigned int numThreads, numIterations;
|
||||
std::string deviceName;
|
||||
Config config;
|
||||
std::tie(deviceName, config) = std::get<0>(obj.param);
|
||||
std::replace(deviceName.begin(), deviceName.end(), ':', '.');
|
||||
numThreads = std::get<1>(obj.param);
|
||||
numIterations = std::get<2>(obj.param);
|
||||
char separator('_');
|
||||
std::ostringstream result;
|
||||
result << "targetDevice=" << deviceName << separator;
|
||||
result << "config=";
|
||||
for (auto& confItem : config) {
|
||||
result << confItem.first << "=" << confItem.second.as<std::string>() << separator;
|
||||
}
|
||||
result << "numThreads=" << numThreads << separator;
|
||||
result << "numIter=" << numIterations;
|
||||
return result.str();
|
||||
}
|
||||
|
||||
|
||||
protected:
|
||||
unsigned int numIterations;
|
||||
unsigned int numThreads;
|
||||
std::string cache_path;
|
||||
std::shared_ptr<ov::Model> model;
|
||||
void SetupModel() {
|
||||
ov::Core core;
|
||||
std::string ir_with_meta = R"V0G0N(
|
||||
<net name="Network" version="11">
|
||||
<layers>
|
||||
<layer name="in1" type="Parameter" id="0" version="opset1">
|
||||
<data element_type="f32" shape="1,3,22,22"/>
|
||||
<output>
|
||||
<port id="0" precision="FP32">
|
||||
<dim>1</dim>
|
||||
<dim>3</dim>
|
||||
<dim>22</dim>
|
||||
<dim>22</dim>
|
||||
</port>
|
||||
</output>
|
||||
</layer>
|
||||
<layer name="activation" id="1" type="ReLU" version="opset1">
|
||||
<input>
|
||||
<port id="1" precision="FP32">
|
||||
<dim>1</dim>
|
||||
<dim>3</dim>
|
||||
<dim>22</dim>
|
||||
<dim>22</dim>
|
||||
</port>
|
||||
</input>
|
||||
<output>
|
||||
<port id="2" precision="FP32">
|
||||
<dim>1</dim>
|
||||
<dim>3</dim>
|
||||
<dim>22</dim>
|
||||
<dim>22</dim>
|
||||
</port>
|
||||
</output>
|
||||
</layer>
|
||||
<layer name="output" type="Result" id="2" version="opset1">
|
||||
<input>
|
||||
<port id="0" precision="FP32">
|
||||
<dim>1</dim>
|
||||
<dim>3</dim>
|
||||
<dim>22</dim>
|
||||
<dim>22</dim>
|
||||
</port>
|
||||
</input>
|
||||
</layer>
|
||||
</layers>
|
||||
<edges>
|
||||
<edge from-layer="1" from-port="2" to-layer="2" to-port="0"/>
|
||||
<edge from-layer="0" from-port="0" to-layer="1" to-port="1"/>
|
||||
</edges>
|
||||
<meta_data>
|
||||
<MO_version value="TestVersion"/>
|
||||
<Runtime_version value="TestVersion"/>
|
||||
<cli_parameters>
|
||||
<input_shape value="[1, 3, 22, 22]"/>
|
||||
<transform value=""/>
|
||||
<use_new_frontend value="False"/>
|
||||
</cli_parameters>
|
||||
</meta_data>
|
||||
<framework_meta>
|
||||
<batch value="1"/>
|
||||
<chunk_size value="16"/>
|
||||
</framework_meta>
|
||||
<quantization_parameters>
|
||||
<config>{
|
||||
'compression': {
|
||||
'algorithms': [
|
||||
{
|
||||
'name': 'DefaultQuantization',
|
||||
'params': {
|
||||
'num_samples_for_tuning': 2000,
|
||||
'preset': 'performance',
|
||||
'stat_subset_size': 300,
|
||||
'use_layerwise_tuning': false
|
||||
}
|
||||
}
|
||||
],
|
||||
'dump_intermediate_model': true,
|
||||
'target_device': 'ANY'
|
||||
},
|
||||
'engine': {
|
||||
'models': [
|
||||
{
|
||||
'name': 'bert-small-uncased-whole-word-masking-squad-0001',
|
||||
'launchers': [
|
||||
{
|
||||
'framework': 'openvino',
|
||||
'adapter': {
|
||||
'type': 'bert_question_answering',
|
||||
'start_token_logits_output': 'output_s',
|
||||
'end_token_logits_output': 'output_e'
|
||||
},
|
||||
'inputs': [
|
||||
{
|
||||
'name': 'input_ids',
|
||||
'type': 'INPUT',
|
||||
'value': 'input_ids'
|
||||
},
|
||||
{
|
||||
'name': 'attention_mask',
|
||||
'type': 'INPUT',
|
||||
'value': 'input_mask'
|
||||
},
|
||||
{
|
||||
'name': 'token_type_ids',
|
||||
'type': 'INPUT',
|
||||
'value': 'segment_ids'
|
||||
}
|
||||
],
|
||||
'device': 'cpu'
|
||||
}
|
||||
],
|
||||
'datasets': [
|
||||
{
|
||||
'name': 'squad_v1_1_msl384_mql64_ds128_lowercase',
|
||||
'annotation_conversion': {
|
||||
'converter': 'squad',
|
||||
'testing_file': 'PATH',
|
||||
'max_seq_length': 384,
|
||||
'max_query_length': 64,
|
||||
'doc_stride': 128,
|
||||
'lower_case': true,
|
||||
'vocab_file': 'PATH'
|
||||
},
|
||||
'reader': {
|
||||
'type': 'annotation_features_extractor',
|
||||
'features': [
|
||||
'input_ids',
|
||||
'input_mask',
|
||||
'segment_ids'
|
||||
]
|
||||
},
|
||||
'postprocessing': [
|
||||
{
|
||||
'type': 'extract_answers_tokens',
|
||||
'max_answer': 30,
|
||||
'n_best_size': 20
|
||||
}
|
||||
],
|
||||
'metrics': [
|
||||
{
|
||||
'name': 'F1',
|
||||
'type': 'f1',
|
||||
'reference': 0.9157
|
||||
},
|
||||
{
|
||||
'name': 'EM',
|
||||
'type': 'exact_match',
|
||||
'reference': 0.8504
|
||||
}
|
||||
],
|
||||
'_command_line_mapping': {
|
||||
'testing_file': 'PATH',
|
||||
'vocab_file': [
|
||||
'PATH'
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
'stat_requests_number': null,
|
||||
'eval_requests_number': null,
|
||||
'type': 'accuracy_checker'
|
||||
}
|
||||
}</config>
|
||||
<version value="invalid version"/>
|
||||
<cli_params value="{'quantize': None, 'preset': None, 'model': None, 'weights': None, 'name': None, 'engine': None, 'ac_config': None, 'max_drop': None, 'evaluate': False, 'output_dir': 'PATH', 'direct_dump': True, 'log_level': 'INFO', 'pbar': False, 'stream_output': False, 'keep_uncompressed_weights': False, 'data_source': None}"/>
|
||||
</quantization_parameters>
|
||||
</net>
|
||||
)V0G0N";
|
||||
ov::Tensor weights = {};
|
||||
model = core.read_model(ir_with_meta, weights);
|
||||
OPENVINO_ASSERT(model);
|
||||
}
|
||||
};
|
||||
|
||||
// tested function: set_property, compile_model
|
||||
TEST_P(CoreThreadingTestsWithCacheEnabled, smoke_compilemodel_cache_enabled) {
|
||||
ov::Core core;
|
||||
SetupModel();
|
||||
core.set_property(target_device, config);
|
||||
core.set_property(ov::cache_dir(cache_path));
|
||||
runParallel([&] () {
|
||||
(void)core.compile_model(model, target_device);
|
||||
}, numIterations, numThreads);
|
||||
core.set_property(ov::cache_dir(""));
|
||||
}
|
||||
Reference in New Issue
Block a user