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

Rename dunder methods (#4334)

Browse Source
This commit is contained in:
Michał Karzyński
2021-02-15 18:34:21 +01:00
committed by GitHub
parent c52c4916be
commit ccc1a9f357
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ngraph/frontend/onnx_import/src/op/max_pool.cpp
View File

@@ -18,7 +18,6 @@
#include "core/null_node.hpp"
#include "ngraph/log.hpp"
#include "ngraph/op/max_pool.hpp"
#include "op/max_pool.hpp"
#include "utils/pooling_factory.hpp"
@@ -34,8 +33,7 @@ namespace ngraph
{
if (node.get_outputs_size() > 1)
{
NGRAPH_WARN
<< "Indices output is not supported for MaxPooling and was ignored";
NGRAPH_WARN << "MaxPool: Indices output is not supported and was ignored";
}
auto max_pool = pooling::PoolingFactory(node).make_max_pool();
max_pool.emplace_back(std::make_shared<NullNode>()); // Indices (optional)
@@ -48,4 +46,4 @@ namespace ngraph
} // namespace onnx_import
} // namespace ngraph
} // namespace ngraph

10
ngraph/python/tests/runtime.py
View File

@@ -115,7 +115,7 @@ class Computation(object):
params_string = ", ".join([param.name for param in self.parameters])
return "<Computation: {}({})>".format(self.function.get_name(), params_string)
def __get_ie_output_blob_name(self, outputs: Dict, ng_result: result) -> str:
def _get_ie_output_blob_name(self, outputs: Dict, ng_result: result) -> str:
if len(self.results) == 1:
return next(iter(outputs.keys()))
else:
@@ -125,8 +125,8 @@ class Computation(object):
out_name += "." + str(prev_layer.get_index())
return out_name
def __get_ie_output_blob_buffer(self, output_blobs: Dict[str, Blob], ng_result: result) -> np.ndarray:
out_name = self.__get_ie_output_blob_name(output_blobs, ng_result)
def _get_ie_output_blob_buffer(self, output_blobs: Dict[str, Blob], ng_result: result) -> np.ndarray:
out_name = self._get_ie_output_blob_name(output_blobs, ng_result)
return output_blobs[out_name].buffer
def __call__(self, *input_values: NumericData) -> List[NumericData]:
@@ -157,7 +157,7 @@ class Computation(object):
# set output blobs precission based on nG results
for ng_result in self.results:
ie_out_name = self.__get_ie_output_blob_name(cnn_network.outputs, ng_result)
ie_out_name = self._get_ie_output_blob_name(cnn_network.outputs, ng_result)
apply_ng_type(cnn_network.outputs[ie_out_name], ng_result.get_output_element_type(0))
executable_network = self.runtime.backend.load_network(cnn_network, self.runtime.backend_name)
@@ -176,7 +176,7 @@ class Computation(object):
request.infer(dict(zip(param_names, input_values)))
# Set order of output blobs compatible with nG Function
result_buffers = [self.__get_ie_output_blob_buffer(request.output_blobs, result)
result_buffers = [self._get_ie_output_blob_buffer(request.output_blobs, result)
for result in self.results]
# Since OV overwrite result data type we have to convert results to the original one.