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

[CPU] DepthToSpace review leftovers

Browse Source
This commit is contained in:
dmitrygo 2020-06-04 15:59:14 +03:00 committed by Alexander Peskov
parent f51c533ea8
commit b485e829d6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inference-engine/src/mkldnn_plugin/nodes/depth_to_space.cpp
View File

@ -61,7 +61,7 @@ public:
THROW_IE_EXCEPTION << "DepthToSpace layer with name '" << layer->name << " has incompatible input/output channels"; THROW_IE_EXCEPTION << "DepthToSpace layer with name '" << layer->name << " has incompatible input/output channels";
for (int i = 0; i < numSpatialDims; i++) { for (int i = 0; i < numSpatialDims; i++) {
if (inDims[i + 2] != outDims[i + 2] / blockSize) if (inDims[i + 2] * blockSize != outDims[i + 2])
THROW_IE_EXCEPTION << "DepthToSpace layer with name '" << layer->name << " has incompatible spatial dims"; THROW_IE_EXCEPTION << "DepthToSpace layer with name '" << layer->name << " has incompatible spatial dims";
} }
@ -130,7 +130,7 @@ private:
return shape5D; return shape5D;
} }
std::vector<size_t> getBlock3D(const SizeVector& shape, const SizeVector& shape5D) { std::vector<size_t> getBlock3D(const SizeVector& shape) {
std::vector<size_t> block3D(3, 1); std::vector<size_t> block3D(3, 1);
for (int i = 0; i < shape.size() - 2; i++) { for (int i = 0; i < shape.size() - 2; i++) {
block3D[i] = blockSize; block3D[i] = blockSize;
@ -144,7 +144,7 @@ private:
T* dst_data = outputs[0]->buffer().as<T *>() + outputs[0]->getTensorDesc().getBlockingDesc().getOffsetPadding(); T* dst_data = outputs[0]->buffer().as<T *>() + outputs[0]->getTensorDesc().getBlockingDesc().getOffsetPadding();
auto shape5D = getShape5D(inDims); auto shape5D = getShape5D(inDims);
auto block3D = getBlock3D(inDims, shape5D); auto block3D = getBlock3D(inDims);
size_t spatialStep = shape5D[2] * shape5D[3] * shape5D[4]; size_t spatialStep = shape5D[2] * shape5D[3] * shape5D[4];
size_t batchStep = shape5D[1] * spatialStep; size_t batchStep = shape5D[1] * spatialStep;

6
inference-engine/src/mkldnn_plugin/nodes/space_to_depth.cpp
View File

@ -61,7 +61,7 @@ public:
THROW_IE_EXCEPTION << "SpaceToDepth layer with name '" << layer->name << " has incompatible input/output channels"; THROW_IE_EXCEPTION << "SpaceToDepth layer with name '" << layer->name << " has incompatible input/output channels";
for (int i = 0; i < numSpatialDims; i++) { for (int i = 0; i < numSpatialDims; i++) {
if (inDims[i + 2] / blockSize != outDims[i + 2]) if (inDims[i + 2] != outDims[i + 2] * blockSize)
THROW_IE_EXCEPTION << "SpaceToDepth layer with name '" << layer->name << " has incompatible spatial dims"; THROW_IE_EXCEPTION << "SpaceToDepth layer with name '" << layer->name << " has incompatible spatial dims";
} }
@ -130,7 +130,7 @@ private:
return shape5D; return shape5D;
} }
std::vector<size_t> getBlock3D(const SizeVector& shape, const SizeVector& shape5D) { std::vector<size_t> getBlock3D(const SizeVector& shape) {
std::vector<size_t> block3D(3, 1); std::vector<size_t> block3D(3, 1);
for (int i = 0; i < shape.size() - 2; i++) { for (int i = 0; i < shape.size() - 2; i++) {
block3D[i] = blockSize; block3D[i] = blockSize;
@ -144,7 +144,7 @@ private:
T* dst_data = outputs[0]->buffer().as<T *>() + outputs[0]->getTensorDesc().getBlockingDesc().getOffsetPadding(); T* dst_data = outputs[0]->buffer().as<T *>() + outputs[0]->getTensorDesc().getBlockingDesc().getOffsetPadding();
auto shape5D = getShape5D(outDims); auto shape5D = getShape5D(outDims);
auto block3D = getBlock3D(outDims, shape5D); auto block3D = getBlock3D(outDims);
size_t spatialStep = shape5D[2] * shape5D[3] * shape5D[4]; size_t spatialStep = shape5D[2] * shape5D[3] * shape5D[4];
size_t batchStep = shape5D[1] * spatialStep; size_t batchStep = shape5D[1] * spatialStep;