Guozhong/add hint cumulative throughput (#10727)

* mod docs/_static/images/dataset.png and docs/_static/images/inputs.png

* add new hint cumulative_throughput

* clang format properties.hpp

* add set properties and get properties test case for CUMULATIVE_THROUGHPUT

* reset docs/_static/images/dataset.png and docs/_static/images/inputs.png

* reset docs/_static/images/dataset.png and docs/_static/images/inputs.png

* reset dataset.png and inputs.png

* reset dataset.png and inputs.png

* remove test value cumulative_throughput from gpuplugin and cpuplugin testcase

* rollback dataset.png and inputs.png to 41818a377
This commit is contained in:
guozhong wang authored and GitHub committed 2022-03-16 09:56:05 +08:00
1 parent 4f6dcc1d32
commit 8c9c592fcf
5 files changed
+14 -4

No files matched your search

@@ -72,11 +72,13 @@ struct PerfHintsConfig {
* @return configuration value
*/
static std::string CheckPerformanceHintValue(const std::string& val) {
if (val == PluginConfigParams::LATENCY || val == PluginConfigParams::THROUGHPUT || val == "")
if (val == PluginConfigParams::LATENCY || val == PluginConfigParams::THROUGHPUT ||
val == PluginConfigParams::CUMULATIVE_THROUGHPUT || val == "")
return val;
else
IE_THROW() << "Wrong value for property key " << PluginConfigParams::KEY_PERFORMANCE_HINT
<< ". Expected only " << PluginConfigParams::LATENCY << "/" << PluginConfigParams::THROUGHPUT;
<< ". Expected only " << PluginConfigParams::LATENCY << "/" << PluginConfigParams::THROUGHPUT
<< "/" << PluginConfigParams::CUMULATIVE_THROUGHPUT;
}
/**
@@ -268,6 +268,7 @@ DECLARE_CONFIG_VALUE(MODEL_PRIORITY_LOW);
DECLARE_CONFIG_KEY(PERFORMANCE_HINT);
DECLARE_CONFIG_VALUE(LATENCY);
DECLARE_CONFIG_VALUE(THROUGHPUT);
DECLARE_CONFIG_VALUE(CUMULATIVE_THROUGHPUT);
/**
* @brief (Optional) config key that backs the (above) Performance Hints
* by giving additional information on how many inference requests the application will be keeping in flight
@@ -283,6 +283,7 @@ enum class PerformanceMode {
UNDEFINED = -1,
LATENCY = 1,
THROUGHPUT = 2,
CUMULATIVE_THROUGHPUT = 3,
};
/** @cond INTERNAL */
@@ -294,6 +295,8 @@ inline std::ostream& operator<<(std::ostream& os, const PerformanceMode& perform
return os << "LATENCY";
case PerformanceMode::THROUGHPUT:
return os << "THROUGHPUT";
case PerformanceMode::CUMULATIVE_THROUGHPUT:
return os << "CUMULATIVE_THROUGHPUT";
default:
throw ov::Exception{"Unsupported performance mode hint"};
}
@@ -306,6 +309,8 @@ inline std::istream& operator>>(std::istream& is, PerformanceMode& performance_m
performance_mode = PerformanceMode::LATENCY;
} else if (str == "THROUGHPUT") {
performance_mode = PerformanceMode::THROUGHPUT;
} else if (str == "CUMULATIVE_THROUGHPUT") {
performance_mode = PerformanceMode::CUMULATIVE_THROUGHPUT;
} else if (str == "") {
performance_mode = PerformanceMode::UNDEFINED;
} else {
@@ -25,7 +25,8 @@ INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVPropertiesTests,
const std::vector<ov::AnyMap> multi_Auto_properties = {
{ov::device::priorities(CommonTestUtils::DEVICE_CPU), ov::hint::performance_mode(ov::hint::PerformanceMode::UNDEFINED)},
{ov::device::priorities(CommonTestUtils::DEVICE_CPU), ov::hint::performance_mode(ov::hint::PerformanceMode::THROUGHPUT)},
{ov::device::priorities(CommonTestUtils::DEVICE_CPU), ov::hint::performance_mode(ov::hint::PerformanceMode::LATENCY)}
{ov::device::priorities(CommonTestUtils::DEVICE_CPU), ov::hint::performance_mode(ov::hint::PerformanceMode::LATENCY)},
{ov::device::priorities(CommonTestUtils::DEVICE_CPU), ov::hint::performance_mode(ov::hint::PerformanceMode::CUMULATIVE_THROUGHPUT)},
};
INSTANTIATE_TEST_SUITE_P(smoke_AutoMultiBehaviorTests, OVPropertiesTests,
@@ -25,7 +25,8 @@ INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVPropertiesTests,
const std::vector<ov::AnyMap> auto_multi_properties = {
{ov::device::priorities(CommonTestUtils::DEVICE_GPU), ov::hint::performance_mode(ov::hint::PerformanceMode::UNDEFINED)},
{ov::device::priorities(CommonTestUtils::DEVICE_GPU), ov::hint::performance_mode(ov::hint::PerformanceMode::THROUGHPUT)},
{ov::device::priorities(CommonTestUtils::DEVICE_GPU), ov::hint::performance_mode(ov::hint::PerformanceMode::LATENCY)}
{ov::device::priorities(CommonTestUtils::DEVICE_GPU), ov::hint::performance_mode(ov::hint::PerformanceMode::LATENCY)},
{ov::device::priorities(CommonTestUtils::DEVICE_GPU), ov::hint::performance_mode(ov::hint::PerformanceMode::CUMULATIVE_THROUGHPUT)},
};
INSTANTIATE_TEST_SUITE_P(smoke_AutoMultiBehaviorTests, OVPropertiesTests,