From b485e829d6f702f0bcc3dfda03a6e315403538a3 Mon Sep 17 00:00:00 2001 From: dmitrygo Date: Thu, 4 Jun 2020 15:59:14 +0300 Subject: [PATCH] [CPU] DepthToSpace review leftovers --- inference-engine/src/mkldnn_plugin/nodes/depth_to_space.cpp | 6 +++--- inference-engine/src/mkldnn_plugin/nodes/space_to_depth.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/inference-engine/src/mkldnn_plugin/nodes/depth_to_space.cpp b/inference-engine/src/mkldnn_plugin/nodes/depth_to_space.cpp index ee6b2d6a4a6..42809f21026 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/depth_to_space.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/depth_to_space.cpp @@ -61,7 +61,7 @@ public: THROW_IE_EXCEPTION << "DepthToSpace layer with name '" << layer->name << " has incompatible input/output channels"; 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"; } @@ -130,7 +130,7 @@ private: return shape5D; } - std::vector getBlock3D(const SizeVector& shape, const SizeVector& shape5D) { + std::vector getBlock3D(const SizeVector& shape) { std::vector block3D(3, 1); for (int i = 0; i < shape.size() - 2; i++) { block3D[i] = blockSize; @@ -144,7 +144,7 @@ private: T* dst_data = outputs[0]->buffer().as() + outputs[0]->getTensorDesc().getBlockingDesc().getOffsetPadding(); auto shape5D = getShape5D(inDims); - auto block3D = getBlock3D(inDims, shape5D); + auto block3D = getBlock3D(inDims); size_t spatialStep = shape5D[2] * shape5D[3] * shape5D[4]; size_t batchStep = shape5D[1] * spatialStep; diff --git a/inference-engine/src/mkldnn_plugin/nodes/space_to_depth.cpp b/inference-engine/src/mkldnn_plugin/nodes/space_to_depth.cpp index 6014063305e..c76682c4716 100644 --- a/inference-engine/src/mkldnn_plugin/nodes/space_to_depth.cpp +++ b/inference-engine/src/mkldnn_plugin/nodes/space_to_depth.cpp @@ -61,7 +61,7 @@ public: THROW_IE_EXCEPTION << "SpaceToDepth layer with name '" << layer->name << " has incompatible input/output channels"; 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"; } @@ -130,7 +130,7 @@ private: return shape5D; } - std::vector getBlock3D(const SizeVector& shape, const SizeVector& shape5D) { + std::vector getBlock3D(const SizeVector& shape) { std::vector block3D(3, 1); for (int i = 0; i < shape.size() - 2; i++) { block3D[i] = blockSize; @@ -144,7 +144,7 @@ private: T* dst_data = outputs[0]->buffer().as() + outputs[0]->getTensorDesc().getBlockingDesc().getOffsetPadding(); auto shape5D = getShape5D(outDims); - auto block3D = getBlock3D(outDims, shape5D); + auto block3D = getBlock3D(outDims); size_t spatialStep = shape5D[2] * shape5D[3] * shape5D[4]; size_t batchStep = shape5D[1] * spatialStep;