Skip to content

Commit

Permalink
[conformanceAPI] Remove outdated test (openvinotoolkit#18323)
Browse files Browse the repository at this point in the history
* [ov_api_conformance] Remove outdated test

* move import export
  • Loading branch information
sbalandi authored Jan 24, 2024
1 parent b32ad2b commit e5ca6a3
Show file tree
Hide file tree
Showing 21 changed files with 266 additions and 3,671 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//

#include "behavior/ov_plugin/core_integration.hpp"
#include <openvino/runtime/properties.hpp>

#include "behavior/ov_plugin/core_integration_sw.hpp"
#include "behavior/ov_plugin/query_model.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//

#include "behavior/ov_executable_network/exec_network_base.hpp"
#include "behavior/compiled_model/compiled_model_base.hpp"

using namespace ov::test::behavior;
namespace {
Expand All @@ -14,10 +14,10 @@ auto autoBatchConfigs = []() {
{ov::auto_batch_timeout.name(), "0"}}};
};

INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests,
OVExecutableNetworkBaseTest,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_BATCH),
::testing::ValuesIn(autoBatchConfigs())),
OVExecutableNetworkBaseTest::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVCompiledModelBaseTest,
::testing::Combine(
::testing::Values(ov::test::utils::DEVICE_BATCH),
::testing::ValuesIn(autoBatchConfigs())),
OVCompiledModelBaseTest::getTestCaseName);

} // namespace
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//

#include "behavior/ov_executable_network/properties.hpp"
#include "behavior/compiled_model/properties.hpp"

using namespace ov::test::behavior;

Expand All @@ -14,10 +14,10 @@ const std::vector<ov::AnyMap> auto_batch_inproperties = {
};

INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests,
OVCompiledModelPropertiesIncorrectTests,
OVClassCompiledModelPropertiesIncorrectTests,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_BATCH),
::testing::ValuesIn(auto_batch_inproperties)),
OVCompiledModelPropertiesIncorrectTests::getTestCaseName);
OVClassCompiledModelPropertiesIncorrectTests::getTestCaseName);

const std::vector<ov::AnyMap> auto_batch_properties = {
{{ov::device::priorities.name(), std::string(ov::test::utils::DEVICE_TEMPLATE) + "(4)"}},
Expand All @@ -28,9 +28,9 @@ const std::vector<ov::AnyMap> auto_batch_properties = {
};

INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests,
OVCompiledModelPropertiesTests,
OVClassCompiledModelPropertiesTests,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_BATCH),
::testing::ValuesIn(auto_batch_properties)),
OVCompiledModelPropertiesTests::getTestCaseName);
OVClassCompiledModelPropertiesTests::getTestCaseName);

} // namespace
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
//

#include "behavior/compiled_model/properties.hpp"
#include "behavior/compiled_model/properties_hetero.hpp"

#include "behavior/ov_executable_network/get_metric.hpp"
#include "openvino/runtime/properties.hpp"
#include "openvino/runtime/system_conf.hpp"

Expand Down Expand Up @@ -162,55 +162,47 @@ INSTANTIATE_TEST_SUITE_P(smoke_HETERO_OVClassCompileModelWithCorrectPropertiesTe
// OV CompiledModel Get RO Property
//

INSTANTIATE_TEST_SUITE_P(
smoke_OVClassExecutableNetworkGetMetricTest, OVClassExecutableNetworkGetMetricTest_SUPPORTED_CONFIG_KEYS,
::testing::Values("CPU", "HETERO:CPU"));

INSTANTIATE_TEST_SUITE_P(
smoke_OVClassExecutableNetworkGetMetricTest, OVClassExecutableNetworkGetMetricTest_SUPPORTED_METRICS,
::testing::Values("CPU", "HETERO:CPU"));
//
// Executable Network GetMetric
//

INSTANTIATE_TEST_SUITE_P(
smoke_OVClassExecutableNetworkGetMetricTest, OVClassExecutableNetworkGetMetricTest_NETWORK_NAME,
smoke_OVClassCompiledModelGetPropertyTest, OVClassCompiledModelGetPropertyTest,
::testing::Values("CPU", "HETERO:CPU"));

INSTANTIATE_TEST_SUITE_P(
smoke_OVClassExecutableNetworkGetMetricTest, OVClassExecutableNetworkGetMetricTest_OPTIMAL_NUMBER_OF_INFER_REQUESTS,
::testing::Values("CPU", "HETERO:CPU"));
const std::vector<std::tuple<std::string, std::pair<ov::AnyMap, std::string>>> GetMetricTest_ExecutionDevice_CPU = {
{"CPU", std::make_pair(ov::AnyMap{}, "CPU")}};

INSTANTIATE_TEST_SUITE_P(
smoke_OVClassExecutableNetworkGetMetricTest, OVClassExecutableNetworkGetMetricTest_ThrowsUnsupported,
::testing::Values("CPU", "HETERO:CPU"));
smoke_OVClassCompiledModelGetPropertyTest, OVClassCompiledModelGetPropertyTest_EXEC_DEVICES,
::testing::ValuesIn(GetMetricTest_ExecutionDevice_CPU));

//
// OV CompiledModel GetProperty / SetProperty
//

INSTANTIATE_TEST_SUITE_P(
smoke_OVClassExecutableNetworkGetConfigTest, OVClassExecutableNetworkGetConfigTest,
smoke_OVClassCompiledModelGetIncorrectPropertyTest, OVClassCompiledModelGetIncorrectPropertyTest,
::testing::Values("CPU", "HETERO:CPU"));

INSTANTIATE_TEST_SUITE_P(
smoke_OVClassCompiledModelGetConfigTest, OVClassCompiledModelGetConfigTest,
::testing::Values("CPU"));

INSTANTIATE_TEST_SUITE_P(
smoke_OVClassExecutableNetworkSetConfigTest, OVClassExecutableNetworkSetConfigTest,
smoke_OVClassCompiledModelSetIncorrectConfigTest, OVClassCompiledModelSetIncorrectConfigTest,
::testing::Values("CPU"));

//
// Hetero OV CompiledModel Get RO Property
//

INSTANTIATE_TEST_SUITE_P(
smoke_OVClassHeteroExecutableNetworkGetMetricTest, OVClassHeteroExecutableNetworkGetMetricTest_SUPPORTED_CONFIG_KEYS,
smoke_OVClassHeteroExecutableNetworkGetMetricTest, OVClassHeteroCompiledModelGetMetricTest_SUPPORTED_CONFIG_KEYS,
::testing::Values("CPU"));

INSTANTIATE_TEST_SUITE_P(
smoke_OVClassHeteroExecutableNetworkGetMetricTest, OVClassHeteroExecutableNetworkGetMetricTest_SUPPORTED_METRICS,
smoke_OVClassHeteroExecutableNetworkGetMetricTest, OVClassHeteroCompiledModelGetMetricTest_TARGET_FALLBACK,
::testing::Values("CPU"));

INSTANTIATE_TEST_SUITE_P(
smoke_OVClassHeteroExecutableNetworkGetMetricTest, OVClassHeteroExecutableNetworkGetMetricTest_NETWORK_NAME,
::testing::Values("CPU"));

INSTANTIATE_TEST_SUITE_P(
smoke_OVClassHeteroExecutableNetworkGetMetricTest, OVClassHeteroExecutableNetworkGetMetricTest_TARGET_FALLBACK,
::testing::Values("CPU"));
} // namespace
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//

#include <openvino/runtime/properties.hpp>
#include "behavior/ov_plugin/query_model.hpp"
#include "openvino/runtime/core.hpp"

Expand All @@ -10,7 +11,8 @@ using namespace ov::test::behavior;
namespace {

// IE Class Query model
INSTANTIATE_TEST_SUITE_P(smoke_OVClassQueryModelTest, OVClassQueryModelTest,
::testing::Values("CPU"));

INSTANTIATE_TEST_SUITE_P(smoke_OVClassQueryModelTest, OVClassQueryModelTest, ::testing::Values("CPU"));


} // namespace
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
// SPDX-License-Identifier: Apache-2.0
//

#include "behavior/ov_executable_network/exec_graph_info.hpp"
#include "behavior/compiled_model/import_export.hpp"

#include "behavior/ov_plugin/properties_tests.hpp"

namespace {
using ov::test::behavior::OVExecGraphUniqueNodeNames;
using ov::test::behavior::OVCompiledModelGraphUniqueNodeNamesTest;

INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, OVExecGraphUniqueNodeNames,
INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, OVCompiledModelGraphUniqueNodeNamesTest,
::testing::Combine(
::testing::Values(ov::element::f32),
::testing::Values(ov::Shape{1, 2, 5, 5}),
::testing::Values(ov::test::utils::DEVICE_GPU)),
OVExecGraphUniqueNodeNames::getTestCaseName);
OVCompiledModelGraphUniqueNodeNamesTest::getTestCaseName);
} // namespace
Original file line number Diff line number Diff line change
Expand Up @@ -2,99 +2,19 @@
// SPDX-License-Identifier: Apache-2.0
//

#include "behavior/ov_plugin/core_integration.hpp"

#include "behavior/ov_plugin/core_integration_sw.hpp"
#include "behavior/ov_plugin/properties_tests.hpp"
#include "behavior/ov_plugin/query_model.hpp"

using namespace ov::test::behavior;

namespace {

INSTANTIATE_TEST_SUITE_P(smoke_OVClassBasicTestP, OVClassBasicTestP,
::testing::Values(std::make_pair(std::string("openvino_intel_gpu_plugin"), std::string(ov::test::utils::DEVICE_GPU))));

INSTANTIATE_TEST_SUITE_P(smoke_OVClassNetworkTestP, OVClassNetworkTestP,
::testing::Values(std::string(ov::test::utils::DEVICE_GPU)));

//
// OV Class GetMetric
//

INSTANTIATE_TEST_SUITE_P(
nightly_OVClassGetMetricTest, OVClassGetMetricTest_SUPPORTED_CONFIG_KEYS,
::testing::Values(std::string(ov::test::utils::DEVICE_GPU),
std::string(ov::test::utils::DEVICE_HETERO),
std::string(ov::test::utils::DEVICE_BATCH))
);

INSTANTIATE_TEST_SUITE_P(
nightly_OVClassGetMetricTest, OVClassGetMetricTest_SUPPORTED_METRICS,
::testing::Values(std::string(ov::test::utils::DEVICE_GPU),
std::string(ov::test::utils::DEVICE_HETERO),
std::string(ov::test::utils::DEVICE_BATCH))
);

INSTANTIATE_TEST_SUITE_P(
nightly_OVClassGetMetricTest, OVClassGetMetricTest_AVAILABLE_DEVICES,
::testing::Values(std::string(ov::test::utils::DEVICE_GPU))
);

INSTANTIATE_TEST_SUITE_P(
nightly_OVClassGetMetricTest, OVClassGetMetricTest_FULL_DEVICE_NAME,
::testing::Values(std::string(ov::test::utils::DEVICE_GPU),
std::string(ov::test::utils::DEVICE_HETERO),
std::string(ov::test::utils::DEVICE_BATCH))
);

INSTANTIATE_TEST_SUITE_P(
nightly_OVClassGetMetricTest, OVClassGetMetricTest_OPTIMIZATION_CAPABILITIES,
::testing::Values(std::string(ov::test::utils::DEVICE_GPU))
);
INSTANTIATE_TEST_SUITE_P(smoke_OVClassModelTestP, OVClassModelTestP,
::testing::Values(std::string(ov::test::utils::DEVICE_GPU)));

INSTANTIATE_TEST_SUITE_P(
nightly_OVClassGetMetricTest, OVClassGetMetricTest_DEVICE_GOPS,
::testing::Values(std::string(ov::test::utils::DEVICE_GPU))
);

INSTANTIATE_TEST_SUITE_P(
nightly_OVClassGetMetricTest, OVClassGetMetricTest_DEVICE_TYPE,
::testing::Values(std::string(ov::test::utils::DEVICE_GPU))
);

INSTANTIATE_TEST_SUITE_P(
nightly_OVClassGetMetricTest, OVClassGetMetricTest_RANGE_FOR_ASYNC_INFER_REQUESTS,
::testing::Values(std::string(ov::test::utils::DEVICE_GPU))
);

INSTANTIATE_TEST_SUITE_P(
nightly_OVClassGetMetricTest, OVClassGetMetricTest_RANGE_FOR_STREAMS,
::testing::Values(std::string(ov::test::utils::DEVICE_GPU))
);

INSTANTIATE_TEST_SUITE_P(
nightly_OVClassGetMetricTest, OVClassGetMetricTest_ThrowUnsupported,
::testing::Values(std::string(ov::test::utils::DEVICE_GPU),
std::string(ov::test::utils::DEVICE_HETERO),
std::string(ov::test::utils::DEVICE_BATCH))
);

INSTANTIATE_TEST_SUITE_P(
nightly_OVClassGetConfigTest, OVClassGetConfigTest_ThrowUnsupported,
::testing::Values(std::string(ov::test::utils::DEVICE_GPU),
std::string(ov::test::utils::DEVICE_HETERO),
std::string(ov::test::utils::DEVICE_BATCH))
);

INSTANTIATE_TEST_SUITE_P(
nightly_OVClassGetAvailableDevices, OVClassGetAvailableDevices,
::testing::Values(std::string(ov::test::utils::DEVICE_GPU))
);

// IE Class Common tests with <pluginName, target_device params>
//
INSTANTIATE_TEST_SUITE_P(nightly_OVClassModelTestP, OVClassModelTestP, ::testing::Values("GPU"));
INSTANTIATE_TEST_SUITE_P(nightly_OVClassModelOptionalTestP, OVClassModelOptionalTestP, ::testing::Values("GPU"));
INSTANTIATE_TEST_SUITE_P(nightly_OVClassModelOptionalTestP, OVClassModelOptionalTestP,
::testing::Values(std::string(ov::test::utils::DEVICE_GPU)));

// Several devices case
INSTANTIATE_TEST_SUITE_P(nightly_OVClassSeveralDevicesTest,
Expand All @@ -109,10 +29,6 @@ INSTANTIATE_TEST_SUITE_P(nightly_OVClassSeveralDevicesTest,
OVClassSeveralDevicesTestDefaultCore,
::testing::Values(std::vector<std::string>({"GPU.0", "GPU.1"})));

// Set config for all GPU devices

INSTANTIATE_TEST_SUITE_P(nightly_OVClassSetGlobalConfigTest, OVClassSetGlobalConfigTest, ::testing::Values("GPU"));

// IE Class Query network

INSTANTIATE_TEST_SUITE_P(smoke_OVClassQueryModelTest, OVClassQueryModelTest, ::testing::Values("GPU"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,21 @@ class OVClassSetDevicePriorityConfigPropsTest : public OVPluginTestBase,
}
};

class OVClassSeveralDevicesTests : public OVPluginTestBase,
public OVClassNetworkTest,
public ::testing::WithParamInterface<std::vector<std::string>> {
public:
std::vector<std::string> target_devices;

void SetUp() override {
target_device = ov::test::utils::DEVICE_MULTI;
SKIP_IF_CURRENT_TEST_IS_DISABLED()
APIBaseTest::SetUp();
OVClassNetworkTest::SetUp();
target_devices = GetParam();
}
};

#define SKIP_IF_NOT_IMPLEMENTED(...) \
{ \
try { \
Expand Down
Loading

0 comments on commit e5ca6a3

Please sign in to comment.