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

[GPU] Fixed Ireq preproc conversion tests (#8198)

Browse Source
This commit is contained in:
Vladimir Paramuzov 2021-10-27 15:18:44 +03:00 committed by GitHub
parent 8b20ccc6c8
commit 6dd788ed21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
inference-engine/src/cldnn_engine/cldnn_infer_request.cpp
View File

@ -285,7 +285,7 @@ void CLDNNInferRequest::SetBlob(const std::string& name, const Blob::Ptr& data)
// Stores the given blob as ROI blob. It will be used to fill in network input
// during pre-processing
if (_inputs[name]->is<gpu::ClBlob>()) {
Blob::Ptr inputHostBlob = create_input_host_blob(desc);
Blob::Ptr inputHostBlob = create_host_blob(desc);
inputHostBlob->allocate();
_inputs[name] = inputHostBlob;
}
@ -626,8 +626,8 @@ void CLDNNInferRequest::wait_dynamic() {
// ---------------------------- internal utils --------- ----------------------------------- //
// ----------------------------------------------------------------------------------------- //
Blob::Ptr CLDNNInferRequest::create_input_host_blob(const TensorDesc& desc, uint8_t* mem_ptr) {
OV_ITT_SCOPED_TASK(itt::domains::CLDNNPlugin, "CLDNNInferRequest::create_input_host_blob");
Blob::Ptr CLDNNInferRequest::create_host_blob(const TensorDesc& desc, uint8_t* mem_ptr) {
OV_ITT_SCOPED_TASK(itt::domains::CLDNNPlugin, "CLDNNInferRequest::create_host_blob");
const Precision& p = desc.getPrecision();
switch (p) {
@ -677,37 +677,7 @@ Blob::Ptr CLDNNInferRequest::create_input_host_blob(const TensorDesc& desc, uint
else
return make_shared_blob<uint8_t>(desc);
default:
IE_THROW(NotImplemented) << "The plugin does not support input " << p.name() << " precision";
}
}
Blob::Ptr CLDNNInferRequest::create_output_host_blob(const TensorDesc& desc, uint8_t* mem_ptr) {
OV_ITT_SCOPED_TASK(itt::domains::CLDNNPlugin, "CLDNNInferRequest::create_output_host_blob");
const Precision& p = desc.getPrecision();
switch (p) {
case Precision::FP32:
if (mem_ptr != nullptr)
return make_shared_blob<float>(desc, reinterpret_cast<float*>(mem_ptr));
else
return make_shared_blob<float>(desc);
case Precision::FP16:
if (mem_ptr != nullptr)
return make_shared_blob<uint16_t>(desc, reinterpret_cast<uint16_t*>(mem_ptr));
else
return make_shared_blob<uint16_t>(desc);
case Precision::I32:
if (mem_ptr != nullptr)
return make_shared_blob<int32_t>(desc, reinterpret_cast<int32_t*>(mem_ptr));
else
return make_shared_blob<int32_t>(desc);
case Precision::I64:
if (mem_ptr != nullptr)
return make_shared_blob<int64_t>(desc, reinterpret_cast<int64_t*>(mem_ptr));
else
return make_shared_blob<int64_t>(desc);
default:
IE_THROW() << "The plugin does not support output " << p.name() << " precision";
IE_THROW(NotImplemented) << "The plugin does not support " << p.name() << " blob precision";
}
}
@ -719,6 +689,8 @@ void CLDNNInferRequest::copy_output_data(cldnn::memory::ptr src, Blob::Ptr dst,
case Precision::FP16: copyResultToOutputBlob<uint16_t>(src, dst, bi, stream); break;
case Precision::I32: copyResultToOutputBlob<int32_t>(src, dst, bi, stream); break;
case Precision::I64: copyResultToOutputBlob<int64_t>(src, dst, bi, stream); break;
case Precision::U8: copyResultToOutputBlob<uint8_t>(src, dst, bi, stream); break;
case Precision::I8: copyResultToOutputBlob<int8_t>(src, dst, bi, stream); break;
default: IE_THROW(NotImplemented) << "The plugin does not support output " << dst->getTensorDesc().getPrecision() << " precision";
}
}
@ -799,7 +771,7 @@ void CLDNNInferRequest::allocate_inputs() {
desc_fp32.setPrecision(Precision::FP32);
auto blobPtr = create_device_blob(desc_fp32, litr->second);
_deviceInputs[name] = blobPtr;
Blob::Ptr inputBlob = create_input_host_blob(desc);
Blob::Ptr inputBlob = create_host_blob(desc);
inputBlob->allocate();
_inputs[name] = inputBlob;
} else {
@ -825,7 +797,7 @@ void CLDNNInferRequest::allocate_inputs_dynamic() {
IE_THROW() << "Empty dimensions for input blob " << input.first;
}
Blob::Ptr inputBlob = create_input_host_blob(desc);
Blob::Ptr inputBlob = create_host_blob(desc);
if (desc.getPrecision() == Precision::I16 || desc.getPrecision() == Precision::U16) {
desc.setPrecision(Precision::FP32);
auto fp32inputBlob = InferenceEngine::make_shared_blob<float>(desc);
@ -871,7 +843,7 @@ void CLDNNInferRequest::allocate_outputs_dynamic() {
IE_THROW() << "Empty dimensions for output blob " << no.first;
}
Blob::Ptr outputBlob = create_output_host_blob(desc);
Blob::Ptr outputBlob = create_host_blob(desc);
outputBlob->allocate();
_outputs[no.first] = outputBlob;
outputsMap[no.first] = outputID;

3
inference-engine/src/cldnn_engine/cldnn_infer_request.h
View File

@ -79,8 +79,7 @@ private:
std::vector<cldnn::event::ptr>& dependencies);
void prepare_output(const cldnn::primitive_id& outputName, InferenceEngine::Blob::Ptr& outputBlob);
InferenceEngine::Blob::Ptr create_input_host_blob(const InferenceEngine::TensorDesc& desc, uint8_t* mem_ptr = nullptr);
InferenceEngine::Blob::Ptr create_output_host_blob(const InferenceEngine::TensorDesc& desc, uint8_t* mem_ptr = nullptr);
InferenceEngine::Blob::Ptr create_host_blob(const InferenceEngine::TensorDesc& desc, uint8_t* mem_ptr = nullptr);
InferenceEngine::Blob::Ptr create_device_blob(const InferenceEngine::TensorDesc& desc, const cldnn::layout& layout);
void copy_output_data(cldnn::memory::ptr outputMemory, InferenceEngine::Blob::Ptr bptr, buf_info* bi = nullptr);

2
inference-engine/tests/functional/plugin/gpu/shared_tests_instances/skip_tests_config.cpp
View File

@ -23,8 +23,6 @@ std::vector<std::string> disabledTestPatterns() {
R"(.*(PreprocessTest).*(SetMeanImagePreProcessSetBlob).*)",
R"(.*(PreprocessTest).*(ReverseInputChannelsPreProcessGetBlob).*)",
R"(.*(InferRequestPreprocessDynamicallyInSetBlobTest).*)",
// TODO: Issue: 51764
".*InferRequestPreprocessConversionTest.*",
// TODO: Issue: 41462
R"(.*(SoftMaxLayerTest).*axis=0.*)",
// TODO: Issue: 43511