Enabled clang format for unit test utils (#19653)

This commit is contained in:
Ilya Churaev 2023-09-06 18:37:12 +04:00 committed by GitHub
parent 94bdaea965
commit d9952b2455
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 165 additions and 134 deletions

View File

@ -14,7 +14,7 @@ addIeTarget(
NAME ${TARGET_NAME}
TYPE STATIC
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
ADD_CPPLINT
ADD_CLANG_FORMAT
DEVELOPER_PACKAGE
tests
LINK_LIBRARIES

View File

@ -3,23 +3,20 @@
//
#include "openvino/op/relu.hpp"
#include "unit_test_utils/mocks/cpp_interfaces/impl/mock_async_infer_request_default.hpp"
#include "unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_thread_safe_default.hpp"
#include "unit_test_utils/mocks/cpp_interfaces/impl/mock_inference_plugin_internal.hpp"
#include "unit_test_utils/mocks/cpp_interfaces/interface/mock_iexecutable_network_internal.hpp"
#include "unit_test_utils/mocks/cpp_interfaces/interface/mock_iinfer_request_internal.hpp"
#include "unit_test_utils/mocks/cpp_interfaces/interface/mock_iinference_plugin.hpp"
#include "unit_test_utils/mocks/cpp_interfaces/interface/mock_ivariable_state_internal.hpp"
#include "unit_test_utils/mocks/cpp_interfaces/mock_task_executor.hpp"
#include "unit_test_utils/mocks/mock_allocator.hpp"
#include "unit_test_utils/mocks/mock_icnn_network.hpp"
#include "unit_test_utils/mocks/mock_iexecutable_network.hpp"
#include "unit_test_utils/mocks/mock_iinfer_request.hpp"
#include "unit_test_utils/mocks/mock_not_empty_icnn_network.hpp"
#include "unit_test_utils/mocks/cpp_interfaces/mock_task_executor.hpp"
#include "unit_test_utils/mocks/cpp_interfaces/impl/mock_async_infer_request_default.hpp"
#include "unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_thread_safe_default.hpp"
#include "unit_test_utils/mocks/cpp_interfaces/impl/mock_inference_plugin_internal.hpp"
#include "unit_test_utils/mocks/cpp_interfaces/interface/mock_iexecutable_network_internal.hpp"
#include "unit_test_utils/mocks/cpp_interfaces/interface/mock_iinfer_request_internal.hpp"
#include "unit_test_utils/mocks/cpp_interfaces/interface/mock_ivariable_state_internal.hpp"
#include "unit_test_utils/mocks/cpp_interfaces/interface/mock_iinference_plugin.hpp"
using namespace InferenceEngine;
void MockNotEmptyICNNNetwork::getOutputsInfo(OutputsDataMap& out) const noexcept {
@ -49,7 +46,8 @@ void MockNotEmptyICNNNetwork::getInputsInfo(InputsDataMap &inputs) const noexcep
std::shared_ptr<ngraph::Function> MockNotEmptyICNNNetwork::getFunction() noexcept {
ngraph::ParameterVector parameters;
parameters.push_back(std::make_shared<ngraph::op::v0::Parameter>(
ov::element::f32, std::vector<ov::Dimension>{INPUT_DIMENSIONS.begin(), INPUT_DIMENSIONS.end()}));
ov::element::f32,
std::vector<ov::Dimension>{INPUT_DIMENSIONS.begin(), INPUT_DIMENSIONS.end()}));
parameters.back()->set_friendly_name(INPUT_BLOB_NAME);
auto relu = std::make_shared<ov::op::v0::Relu>(parameters.back());
relu->set_friendly_name(OUTPUT_BLOB_NAME);
@ -61,7 +59,8 @@ std::shared_ptr<ngraph::Function> MockNotEmptyICNNNetwork::getFunction() noexcep
std::shared_ptr<const ngraph::Function> MockNotEmptyICNNNetwork::getFunction() const noexcept {
ngraph::ParameterVector parameters;
parameters.push_back(std::make_shared<ngraph::op::v0::Parameter>(
ov::element::f32, std::vector<ov::Dimension>{INPUT_DIMENSIONS.begin(), INPUT_DIMENSIONS.end()}));
ov::element::f32,
std::vector<ov::Dimension>{INPUT_DIMENSIONS.begin(), INPUT_DIMENSIONS.end()}));
parameters.back()->set_friendly_name(INPUT_BLOB_NAME);
auto relu = std::make_shared<ov::op::v0::Relu>(parameters.back());
relu->set_friendly_name(OUTPUT_BLOB_NAME);

View File

@ -4,12 +4,12 @@
#pragma once
#include <gmock/gmock.h>
#include <string>
#include <vector>
#include <gmock/gmock.h>
#include <cpp_interfaces/impl/ie_infer_async_request_thread_safe_default.hpp>
#include "cpp_interfaces/impl/ie_infer_async_request_thread_safe_default.hpp"
using namespace InferenceEngine;

View File

@ -3,12 +3,13 @@
//
#pragma once
#include <gmock/gmock.h>
#include <cpp_interfaces/impl/ie_executable_network_thread_safe_default.hpp>
#include <map>
#include <memory>
#include <string>
#include <vector>
#include <memory>
#include <map>
#include <gmock/gmock.h>
#include <cpp_interfaces/impl/ie_executable_network_thread_safe_default.hpp>
using namespace InferenceEngine;

View File

@ -4,26 +4,30 @@
#pragma once
#include <gmock/gmock.h>
#include <cpp_interfaces/interface/ie_iexecutable_network_internal.hpp>
#include <cpp_interfaces/interface/ie_iplugin_internal.hpp>
#include <map>
#include <memory>
#include "ie_icore.hpp"
#include <gmock/gmock.h>
#include <string>
#include <vector>
#include <cpp_interfaces/interface/ie_iplugin_internal.hpp>
#include <cpp_interfaces/interface/ie_iexecutable_network_internal.hpp>
#include "ie_icore.hpp"
#include "openvino/runtime/iplugin.hpp"
class MockInferencePluginInternal : public InferenceEngine::IInferencePlugin {
public:
MOCK_METHOD2(LoadExeNetworkImpl, std::shared_ptr<InferenceEngine::IExecutableNetworkInternal>(
const InferenceEngine::CNNNetwork &, const std::map<std::string, std::string> &));
MOCK_METHOD2(
LoadExeNetworkImpl,
std::shared_ptr<InferenceEngine::IExecutableNetworkInternal>(const InferenceEngine::CNNNetwork&,
const std::map<std::string, std::string>&));
MOCK_METHOD1(AddExtension, void(const std::shared_ptr<InferenceEngine::IExtension>&));
MOCK_METHOD1(SetConfig, void(const std::map<std::string, std::string>&));
std::shared_ptr<InferenceEngine::IExecutableNetworkInternal>
ImportNetwork(std::istream& stream, const std::map <std::string, std::string>&) {
std::shared_ptr<InferenceEngine::IExecutableNetworkInternal> ImportNetwork(
std::istream& stream,
const std::map<std::string, std::string>&) {
return {};
}

View File

@ -4,15 +4,14 @@
#pragma once
#include <gmock/gmock.h>
#include <cpp_interfaces/interface/ie_iexecutable_network_internal.hpp>
#include <map>
#include <string>
#include <vector>
#include <gmock/gmock.h>
#include "ie_input_info.hpp"
#include <cpp_interfaces/interface/ie_iexecutable_network_internal.hpp>
#include "unit_test_utils/mocks/cpp_interfaces/interface/mock_iinfer_request_internal.hpp"
using namespace InferenceEngine;

View File

@ -6,13 +6,12 @@
#include <gmock/gmock.h>
#include <cpp_interfaces/interface/ie_iinfer_request_internal.hpp>
#include <cpp_interfaces/interface/ie_ivariable_state_internal.hpp>
#include <map>
#include <string>
#include <vector>
#include <cpp_interfaces/interface/ie_ivariable_state_internal.hpp>
#include <cpp_interfaces/interface/ie_iinfer_request_internal.hpp>
class MockIInferRequestInternal : public InferenceEngine::IInferRequestInternal {
public:
using InferenceEngine::IInferRequestInternal::IInferRequestInternal;

View File

@ -4,22 +4,28 @@
#pragma once
#include <gmock/gmock.h>
#include <map>
#include <string>
#include <gmock/gmock.h>
#include "cpp_interfaces/interface/ie_iplugin_internal.hpp"
#include "ie_icore.hpp"
class MockIInferencePlugin : public InferenceEngine::IInferencePlugin {
public:
MOCK_METHOD1(AddExtension, void(const std::shared_ptr<InferenceEngine::IExtension>&));
MOCK_METHOD2(LoadNetwork, std::shared_ptr<InferenceEngine::IExecutableNetworkInternal>(
const InferenceEngine::CNNNetwork&, const std::map<std::string, std::string>&));
MOCK_METHOD2(LoadNetwork, ov::SoPtr<InferenceEngine::IExecutableNetworkInternal>(
const std::string&, const std::map<std::string, std::string>&));
MOCK_METHOD2(ImportNetwork, std::shared_ptr<InferenceEngine::IExecutableNetworkInternal>(
const std::string&, const std::map<std::string, std::string>&));
MOCK_METHOD2(
LoadNetwork,
std::shared_ptr<InferenceEngine::IExecutableNetworkInternal>(const InferenceEngine::CNNNetwork&,
const std::map<std::string, std::string>&));
MOCK_METHOD2(LoadNetwork,
ov::SoPtr<InferenceEngine::IExecutableNetworkInternal>(const std::string&,
const std::map<std::string, std::string>&));
MOCK_METHOD2(
ImportNetwork,
std::shared_ptr<InferenceEngine::IExecutableNetworkInternal>(const std::string&,
const std::map<std::string, std::string>&));
MOCK_METHOD1(SetConfig, void(const std::map<std::string, std::string>&));
MOCK_METHOD(void, SetName, (const std::string&), (noexcept));
@ -27,20 +33,27 @@ public:
MOCK_METHOD(void, SetCore, (std::weak_ptr<InferenceEngine::ICore>), (noexcept));
MOCK_METHOD(std::shared_ptr<InferenceEngine::ICore>, GetCore, (), (const, noexcept));
MOCK_METHOD(bool, IsNewAPI, (), (const, noexcept));
MOCK_CONST_METHOD2(GetConfig, InferenceEngine::Parameter(
const std::string&, const std::map<std::string, InferenceEngine::Parameter>&));
MOCK_CONST_METHOD2(GetMetric, InferenceEngine::Parameter(
const std::string&, const std::map<std::string, InferenceEngine::Parameter>&));
MOCK_METHOD1(CreateContext,
std::shared_ptr<InferenceEngine::RemoteContext>(const InferenceEngine::ParamMap&));
MOCK_CONST_METHOD2(GetConfig,
InferenceEngine::Parameter(const std::string&,
const std::map<std::string, InferenceEngine::Parameter>&));
MOCK_CONST_METHOD2(GetMetric,
InferenceEngine::Parameter(const std::string&,
const std::map<std::string, InferenceEngine::Parameter>&));
MOCK_METHOD1(CreateContext, std::shared_ptr<InferenceEngine::RemoteContext>(const InferenceEngine::ParamMap&));
MOCK_METHOD1(GetDefaultContext, std::shared_ptr<InferenceEngine::RemoteContext>(const InferenceEngine::ParamMap&));
MOCK_METHOD3(LoadNetwork, std::shared_ptr<InferenceEngine::IExecutableNetworkInternal>(
const InferenceEngine::CNNNetwork&, const std::map<std::string, std::string>&,
MOCK_METHOD3(LoadNetwork,
std::shared_ptr<InferenceEngine::IExecutableNetworkInternal>(
const InferenceEngine::CNNNetwork&,
const std::map<std::string, std::string>&,
const std::shared_ptr<InferenceEngine::RemoteContext>&));
MOCK_METHOD2(ImportNetwork, std::shared_ptr<InferenceEngine::IExecutableNetworkInternal>(
std::istream&, const std::map<std::string, std::string>&));
MOCK_METHOD3(ImportNetwork, std::shared_ptr<InferenceEngine::IExecutableNetworkInternal>(
std::istream&, const std::shared_ptr<InferenceEngine::RemoteContext>&,
MOCK_METHOD2(
ImportNetwork,
std::shared_ptr<InferenceEngine::IExecutableNetworkInternal>(std::istream&,
const std::map<std::string, std::string>&));
MOCK_METHOD3(ImportNetwork,
std::shared_ptr<InferenceEngine::IExecutableNetworkInternal>(
std::istream&,
const std::shared_ptr<InferenceEngine::RemoteContext>&,
const std::map<std::string, std::string>&));
MOCK_CONST_METHOD2(QueryNetwork,
InferenceEngine::QueryNetworkResult(const InferenceEngine::CNNNetwork&,

View File

@ -6,11 +6,10 @@
#include <gmock/gmock.h>
#include <cpp_interfaces/interface/ie_ivariable_state_internal.hpp>
#include <string>
#include <vector>
#include <cpp_interfaces/interface/ie_ivariable_state_internal.hpp>
class MockIVariableStateInternal : public InferenceEngine::IVariableStateInternal {
public:
MockIVariableStateInternal() : InferenceEngine::IVariableStateInternal{"MockIVariableStateInternal"} {}

View File

@ -4,9 +4,9 @@
#pragma once
#include <memory>
#include <gmock/gmock.h>
#include <memory>
#include <threading/ie_itask_executor.hpp>
class MockTaskExecutor : public InferenceEngine::ITaskExecutor {

View File

@ -5,10 +5,7 @@
#ifdef _WIN32
# include <windows.h>
BOOL APIENTRY DllMain(HMODULE hModule,
DWORD ul_reason_for_call,
LPVOID lpReserved
) {
BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
switch (ul_reason_for_call) {
case DLL_PROCESS_ATTACH:
case DLL_THREAD_ATTACH:

View File

@ -34,22 +34,34 @@ class MockICNNNetwork final : public InferenceEngine::ICNNNetwork {
MOCK_METHOD(InferenceEngine::InputInfo::Ptr, getInput, (const std::string& inputName), (const, noexcept));
MOCK_METHOD(size_t, layerCount, (), (const, noexcept));
MOCK_METHOD(const std::string&, getName, (), (const, noexcept));
MOCK_METHOD(InferenceEngine::StatusCode, addOutput,
(const std::string &, size_t, InferenceEngine::ResponseDesc*), (noexcept));
MOCK_METHOD(InferenceEngine::StatusCode, getLayerByName,
MOCK_METHOD(InferenceEngine::StatusCode,
addOutput,
(const std::string&, size_t, InferenceEngine::ResponseDesc*),
(noexcept));
MOCK_METHOD(InferenceEngine::StatusCode,
getLayerByName,
(const char*, std::shared_ptr<InferenceEngine::CNNLayer>&, InferenceEngine::ResponseDesc*),
(const, noexcept));
MOCK_METHOD(InferenceEngine::StatusCode, setBatchSize,
(const size_t size, InferenceEngine::ResponseDesc*), (noexcept));
MOCK_METHOD(InferenceEngine::StatusCode,
setBatchSize,
(const size_t size, InferenceEngine::ResponseDesc*),
(noexcept));
MOCK_METHOD(size_t, getBatchSize, (), (const, noexcept));
MOCK_METHOD(void, getInputShapes, (InferenceEngine::ICNNNetwork::InputShapes&), (const, noexcept));
MOCK_METHOD(InferenceEngine::StatusCode, reshape,
MOCK_METHOD(InferenceEngine::StatusCode,
reshape,
(const InferenceEngine::ICNNNetwork::InputShapes&, InferenceEngine::ResponseDesc*),
(const, noexcept));
MOCK_METHOD(InferenceEngine::StatusCode, serialize,
(const std::string &, const std::string &, InferenceEngine::ResponseDesc*), (const, noexcept));
MOCK_METHOD(InferenceEngine::StatusCode, serialize,
(std::ostream &, std::ostream &, InferenceEngine::ResponseDesc*), (const, noexcept));
MOCK_METHOD(InferenceEngine::StatusCode, serialize,
(std::ostream &, InferenceEngine::Blob::Ptr &, InferenceEngine::ResponseDesc*), (const, noexcept));
MOCK_METHOD(InferenceEngine::StatusCode,
serialize,
(const std::string&, const std::string&, InferenceEngine::ResponseDesc*),
(const, noexcept));
MOCK_METHOD(InferenceEngine::StatusCode,
serialize,
(std::ostream&, std::ostream&, InferenceEngine::ResponseDesc*),
(const, noexcept));
MOCK_METHOD(InferenceEngine::StatusCode,
serialize,
(std::ostream&, InferenceEngine::Blob::Ptr&, InferenceEngine::ResponseDesc*),
(const, noexcept));
};

View File

@ -28,14 +28,19 @@ public:
MOCK_METHOD(StatusCode, Export, (const std::string&, ResponseDesc*), (noexcept));
MOCK_METHOD(StatusCode, Export, (std::ostream&, ResponseDesc*), (noexcept));
MOCK_METHOD(StatusCode, GetExecGraphInfo, (ICNNNetwork::Ptr&, ResponseDesc*), (noexcept));
MOCK_METHOD(StatusCode, SetConfig,
((const std::map<std::string, Parameter> &config), ResponseDesc *resp), (noexcept));
MOCK_METHOD(StatusCode, GetConfig,
(const std::string &name, Parameter &result, ResponseDesc *resp), (const, noexcept));
MOCK_METHOD(StatusCode, GetMetric,
(const std::string &name, Parameter &result, ResponseDesc *resp), (const, noexcept));
MOCK_METHOD(StatusCode, GetContext,
(RemoteContext::Ptr &pContext, ResponseDesc *resp), (const, noexcept));
MOCK_METHOD(StatusCode,
SetConfig,
((const std::map<std::string, Parameter>& config), ResponseDesc* resp),
(noexcept));
MOCK_METHOD(StatusCode,
GetConfig,
(const std::string& name, Parameter& result, ResponseDesc* resp),
(const, noexcept));
MOCK_METHOD(StatusCode,
GetMetric,
(const std::string& name, Parameter& result, ResponseDesc* resp),
(const, noexcept));
MOCK_METHOD(StatusCode, GetContext, (RemoteContext::Ptr & pContext, ResponseDesc* resp), (const, noexcept));
};
IE_SUPPRESS_DEPRECATED_END

View File

@ -28,11 +28,12 @@ public:
MOCK_METHOD(StatusCode, SetUserData, (void*, ResponseDesc*), (noexcept));
MOCK_METHOD(StatusCode, SetCompletionCallback, (IInferRequest::CompletionCallback), (noexcept));
MOCK_METHOD(StatusCode, Infer, (ResponseDesc*), (noexcept));
MOCK_METHOD(StatusCode, GetPerformanceCounts,
((std::map<std::string, InferenceEngineProfileInfo> &), ResponseDesc*), (const, noexcept));
MOCK_METHOD(StatusCode,
GetPerformanceCounts,
((std::map<std::string, InferenceEngineProfileInfo>&), ResponseDesc*),
(const, noexcept));
MOCK_METHOD(StatusCode, GetBlob, (const char*, Blob::Ptr&, ResponseDesc*), (noexcept));
MOCK_METHOD(StatusCode, GetPreProcess,
(const char*, const PreProcessInfo**, ResponseDesc*), (const, noexcept));
MOCK_METHOD(StatusCode, GetPreProcess, (const char*, const PreProcessInfo**, ResponseDesc*), (const, noexcept));
MOCK_METHOD(StatusCode, SetBlob, (const char*, const Blob::Ptr&, ResponseDesc*), (noexcept));
MOCK_METHOD(StatusCode, Cancel, (ResponseDesc*), (noexcept));
};

View File

@ -6,8 +6,8 @@
#include <gmock/gmock.h>
#include <string>
#include <memory>
#include <string>
#include <vector>
#include "ie_icnn_network.hpp"
@ -37,12 +37,15 @@ public:
MOCK_METHOD(size_t, getBatchSize, (), (const, noexcept));
MOCK_METHOD(void, getInputShapes, (ICNNNetwork::InputShapes&), (const, noexcept));
MOCK_METHOD(StatusCode, reshape, (const ICNNNetwork::InputShapes&, ResponseDesc*), (noexcept));
MOCK_METHOD(StatusCode, serialize,
(const std::string &, const std::string &, InferenceEngine::ResponseDesc*), (const, noexcept));
MOCK_METHOD(StatusCode, serialize,
(std::ostream &, std::ostream &, InferenceEngine::ResponseDesc*), (const, noexcept));
MOCK_METHOD(StatusCode, serialize,
(std::ostream &, Blob::Ptr &, InferenceEngine::ResponseDesc*), (const, noexcept));
MOCK_METHOD(StatusCode,
serialize,
(const std::string&, const std::string&, InferenceEngine::ResponseDesc*),
(const, noexcept));
MOCK_METHOD(StatusCode,
serialize,
(std::ostream&, std::ostream&, InferenceEngine::ResponseDesc*),
(const, noexcept));
MOCK_METHOD(StatusCode, serialize, (std::ostream&, Blob::Ptr&, InferenceEngine::ResponseDesc*), (const, noexcept));
};
IE_SUPPRESS_DEPRECATED_END

View File

@ -22,4 +22,3 @@ public:
};
} // namespace ov