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

Removed IE API version print (#5502)

Browse Source
This commit is contained in:
Ilya Lavrenov
2021-05-04 20:43:04 +03:00
committed by GitHub
parent f93c5e09aa
commit 49c9f2e6b0
4 changed files with 3 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
inference-engine/ie_bridges/c/src/ie_c_api.cpp
+1 -3
View File
@@ -203,9 +203,7 @@ void parameter2IEparam(const IE::Parameter param, ie_param_t *ie_param) {
ie_version_t ie_c_api_version(void) {
auto version = IE::GetInferenceEngineVersion();
std::string version_str = std::to_string(version->apiVersion.major) + ".";
version_str += std::to_string(version->apiVersion.minor) + ".";
version_str += version->buildNumber;
std::string version_str = version->buildNumber;
ie_version_t version_res;
std::unique_ptr<char[]> ver(new char[version_str.length() + 1]);
inference-engine/ie_bridges/c/tests/ie_c_api_test.cpp
+1 -3
View File
@@ -93,9 +93,7 @@ size_t find_device(ie_available_devices_t avai_devices, const char *device_name)
TEST(ie_c_api_version, apiVersion) {
ie_version_t version = ie_c_api_version();
auto ver = InferenceEngine::GetInferenceEngineVersion();
std::string ver_str = std::to_string(ver->apiVersion.major) + ".";
ver_str += std::to_string(ver->apiVersion.minor) + ".";
ver_str += ver->buildNumber;
std::string ver_str = ver->buildNumber;
EXPECT_EQ(strcmp(version.api_version, ver_str.c_str()), 0);
ie_version_free(&version);
inference-engine/ie_bridges/python/src/openvino/inference_engine/ie_api_impl.cpp
+1 -4
View File
@@ -456,10 +456,7 @@ IE_SUPPRESS_DEPRECATED_END
std::string InferenceEnginePython::get_version() {
auto version = InferenceEngine::GetInferenceEngineVersion();
std::string version_str = std::to_string(version->apiVersion.major) + ".";
version_str += std::to_string(version->apiVersion.minor) + ".";
version_str += version->buildNumber;
return version_str;
return version->buildNumber;
}
InferenceEnginePython::IECore::IECore(const std::string& xmlConfigFile) {
inference-engine/samples/common/utils/include/samples/common.hpp
-69
View File
@@ -87,24 +87,6 @@ inline std::string fileExt(const std::string& filename) {
return filename.substr(pos + 1);
}
static UNUSED std::ostream& operator<<(std::ostream& os, const InferenceEngine::Version* version) {
os << "\n\tAPI version ............ ";
if (nullptr == version) {
os << "UNKNOWN";
} else {
os << version->apiVersion.major << "." << version->apiVersion.minor;
if (nullptr != version->buildNumber) {
os << "\n\t"
<< "Build .................. " << version->buildNumber;
}
if (nullptr != version->description) {
os << "\n\t"
<< "Description ....... " << version->description;
}
}
return os;
}
inline std::ostream& operator<<(std::ostream& os, const InferenceEngine::Version& version) {
os << "\t" << version.description << " version ......... ";
os << version.apiVersion.major << "." << version.apiVersion.minor;
@@ -124,57 +106,6 @@ inline std::ostream& operator<<(std::ostream& os, const std::map<std::string, In
return os;
}
static UNUSED std::vector<std::vector<size_t>> blobToImageOutputArray(InferenceEngine::TBlob<float>::Ptr output, size_t* pWidth, size_t* pHeight,
size_t* pChannels) {
std::vector<std::vector<size_t>> outArray;
size_t W = 0, C = 0, H = 0;
auto outputDims = output->getTensorDesc().getDims();
if (outputDims.size() == 3) {
C = outputDims.at(0);
H = outputDims.at(1);
W = outputDims.at(2);
} else if (outputDims.size() == 4) {
C = outputDims.at(1);
H = outputDims.at(2);
W = outputDims.at(3);
} else if (outputDims.size() == 5) {
C = outputDims.at(1);
H = outputDims.at(3);
W = outputDims.at(4);
} else {
IE_THROW() << "Output blob has unsupported layout " << output->getTensorDesc().getLayout();
}
// Get classes
const float* outData = output->data();
for (unsigned h = 0; h < H; h++) {
std::vector<size_t> row;
for (unsigned w = 0; w < W; w++) {
float max_value = outData[h * W + w];
size_t index = 0;
for (size_t c = 1; c < C; c++) {
size_t dataIndex = c * H * W + h * W + w;
if (outData[dataIndex] > max_value) {
index = c;
max_value = outData[dataIndex];
}
}
row.push_back(index);
}
outArray.push_back(row);
}
if (pWidth != nullptr)
*pWidth = W;
if (pHeight != nullptr)
*pHeight = H;
if (pChannels != nullptr)
*pChannels = C;
return outArray;
}
/**
* @class Color
* @brief A Color class stores channels of a given color