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

Fixed loading old extensions inside the OpenVINO (#13543)

Browse Source
This commit is contained in:
Ilya Churaev
2022-10-20 07:04:57 +04:00
committed by GitHub
parent b7d956b2df
commit 44bbfefacd
2 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/inference/src/ie_core.cpp
View File

@@ -1995,11 +1995,35 @@ void Core::add_extension(const ie::IExtensionPtr& extension) {
}
void Core::add_extension(const std::string& library_path) {
add_extension(ov::detail::load_extensions(library_path));
try {
add_extension(ov::detail::load_extensions(library_path));
} catch (const std::runtime_error&) {
try {
// Try to load legacy extension
const auto extension_ptr = std::make_shared<InferenceEngine::Extension>(library_path);
OPENVINO_SUPPRESS_DEPRECATED_START
add_extension(extension_ptr);
OPENVINO_SUPPRESS_DEPRECATED_END
} catch (const std::runtime_error&) {
throw ov::Exception("Cannot add extension. Cannot find entry point to the extension library");
}
}
}
#ifdef OPENVINO_ENABLE_UNICODE_PATH_SUPPORT
void Core::add_extension(const std::wstring& library_path) {
add_extension(ov::detail::load_extensions(library_path));
try {
add_extension(ov::detail::load_extensions(library_path));
} catch (const std::runtime_error&) {
try {
// Try to load legacy extension
const auto extension_ptr = std::make_shared<InferenceEngine::Extension>(library_path);
OPENVINO_SUPPRESS_DEPRECATED_START
add_extension(extension_ptr);
OPENVINO_SUPPRESS_DEPRECATED_END
} catch (const std::runtime_error&) {
throw ov::Exception("Cannot add extension. Cannot find entry point to the extension library");
}
}
}
#endif

29
src/tests/functional/inference_engine/ov_extension_test.cpp
View File

@@ -10,13 +10,14 @@
#include <utility>
#include <vector>
#include "common_test_utils/test_common.hpp"
#include "common_test_utils/file_utils.hpp"
#include "openvino/util/file_util.hpp"
#include "common_test_utils/test_common.hpp"
#include "ie_iextension.h"
#include "ngraph/op/op.hpp"
#include "openvino/core/except.hpp"
#include "openvino/core/op_extension.hpp"
#include "openvino/runtime/core.hpp"
#include "openvino/util/file_util.hpp"
using namespace testing;
using namespace InferenceEngine;
@@ -176,7 +177,17 @@ namespace {
std::string getOVExtensionPath() {
return ov::util::make_plugin_library_name(CommonTestUtils::getExecutableDirectory(),
std::string("openvino_template_extension") + IE_BUILD_POSTFIX);
std::string("openvino_template_extension") + IE_BUILD_POSTFIX);
}
std::string getOldExtensionPath() {
return ov::util::make_plugin_library_name(CommonTestUtils::getExecutableDirectory(),
std::string("template_extension") + IE_BUILD_POSTFIX);
}
std::string getIncorrectExtensionPath() {
return ov::util::make_plugin_library_name(CommonTestUtils::getExecutableDirectory(),
std::string("incorrect") + IE_BUILD_POSTFIX);
}
} // namespace
@@ -334,3 +345,15 @@ TEST_F(OVExtensionTests, ReshapeIRWithSeveralNewOps) {
core.add_extension<CustomNewIdentity, CustomReLU>();
test_two_op();
}
TEST_F(OVExtensionTests, load_new_extension) {
EXPECT_NO_THROW(core.add_extension(getOVExtensionPath()));
}
TEST_F(OVExtensionTests, load_old_extension) {
EXPECT_NO_THROW(core.add_extension(getOldExtensionPath()));
}
TEST_F(OVExtensionTests, load_incorrect_extension) {
EXPECT_THROW(core.add_extension(getIncorrectExtensionPath()), ov::Exception);
}