DepthToSpace, SpaceToDepth layers optimizations #706

dmitry-gorokhov · 2020-06-01T11:29:12Z

Issue: 31554

dmitry-gorokhov · 2020-06-01T11:32:43Z

inference-engine/src/transformations/src/transformations/depth_to_space_fusion.cpp

@GlebKazantaev @itikhono Guys, now we have the same transformation_callback check in both DepthToSpace fusion and DepthToSpace decompose transformations. So from the plug-in I cannot disable only decomposition. What's the proper way to handle this?

current behavior: after enabling this callback you turn decomposition transformation off and turn fusion transformation on. Is it suitable for you now? I will make it possible to enable/disable each transformation independently a bit later.

In fact there were 2 problems.

CommonOptimizations pass always used default transformations callback, so I wasn't able to specify the custom one.

In plug-in I uses the information regarding input rank of DepthToSpace layer (see mkldnn_plugin.cpp). That's why I moved callback call to the end of the fusion transformation to pass resulting DepthToSpace op in it.

@GlebKazantaev @itikhono I need your approval regarding nGraph changes.

dmitry-gorokhov · 2020-06-02T06:19:58Z

@openvinotoolkit/openvino-ie-cpu-developers guys, please review the PR.

AlexPeskov · 2020-06-02T22:24:17Z

As I see from layer implementation it should support NHWC formats and 3D tensors. But func tests in this PR do not cover it. Specially I worry about NHWC implementation. Do we have a plan to improve coverage?

dmitry-gorokhov · 2020-06-03T06:02:19Z

As I see from layer implementation it should support NHWC formats and 3D tensors. But func tests in this PR do not cover it. Specially I worry about NHWC implementation. Do we have a plan to improve coverage?

You are right:

3D was not covered because of the exception thrown from Ngraph core part. I will follow up it with the team.
N[D]HWC - I tested it locally by disabling planar config. However we have to test it regularly, so I created ticket 32674 to improve our test coverage.
Still think both items shouldn't block us from merging the PR.

…ith the specification The patch also includes n[d]hwc layout support as well as some optimizations

…ds to layer's specification

… callback

inference-engine/src/mkldnn_plugin/nodes/depth_to_space.cpp

AlexPeskov

LGTM

Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 6.2.1 to 7.0.0. <details> <summary>Changelog</summary> Sourced from <a href="https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst">pytest-cov's changelog</a>. <blockquote> <h2>7.0.0 (2025-09-09)</h2> <ul> <li> Dropped support for subprocesses measurement. It was a feature added long time ago when coverage lacked a nice way to measure subprocesses created in tests. It relied on a <code>.pth</code> file, there was no way to opt-out and it created bad interations with <code>coverage's new patch system <https://coverage.readthedocs.io/en/latest/config.html#run-patch></code>_ added in <code>7.10 <https://coverage.readthedocs.io/en/7.10.6/changes.html#version-7-10-0-2025-07-24></code>_. To migrate to this release you might need to enable the suprocess patch, example for <code>.coveragerc</code>: .. code-block:: ini [run] patch = subprocess This release also requires at least coverage 7.10.6. </li> <li> Switched packaging to have metadata completely in <code>pyproject.toml</code> and use <code>hatchling <https://pypi.org/project/hatchling/></code>_ for building. Contributed by Ofek Lev in <code>[openvinotoolkit#551](pytest-dev/pytest-cov#551) <https://github.com/pytest-dev/pytest-cov/pull/551></code>_ with some extras in <code>[openvinotoolkit#716](pytest-dev/pytest-cov#716) <https://github.com/pytest-dev/pytest-cov/pull/716></code>_. </li> <li> Removed some not really necessary testing deps like <code>six</code>. </li> </ul> <h2>6.3.0 (2025-09-06)</h2> <ul> <li>Added support for markdown reports. Contributed by Marcos Boger in <code>[openvinotoolkit#712](pytest-dev/pytest-cov#712) <https://github.com/pytest-dev/pytest-cov/pull/712></code>_ and <code>[openvinotoolkit#714](pytest-dev/pytest-cov#714) <https://github.com/pytest-dev/pytest-cov/pull/714></code>_.</li> <li>Fixed some formatting issues in docs. Anonymous contribution in <code>[openvinotoolkit#706](pytest-dev/pytest-cov#706) <https://github.com/pytest-dev/pytest-cov/pull/706></code>_.</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/pytest-dev/pytest-cov/commit/224d8964caad90074a8cf6dc8720b8f70f31629b"><code>224d896</code></a> Bump version: 6.3.0 → 7.0.0</li> <li><a href="https://github.com/pytest-dev/pytest-cov/commit/73424e3999f865eac72e27f09d5fe11b9703cfd6"><code>73424e3</code></a> Cleanup the docs a bit.</li> <li><a href="https://github.com/pytest-dev/pytest-cov/commit/36f1cc2967831dbd4c8aa70086fc86dc495f8b9a"><code>36f1cc2</code></a> Bump pins in template.</li> <li><a href="https://github.com/pytest-dev/pytest-cov/commit/f299c590a63a48e51e3ae949993dc7bb1f1d480d"><code>f299c59</code></a> Bump the github-actions group with 2 updates</li> <li><a href="https://github.com/pytest-dev/pytest-cov/commit/25f0b2e0cdbc345c0d3e49170f7a328c3e0d805f"><code>25f0b2e</code></a> Update docs/config.rst</li> <li><a href="https://github.com/pytest-dev/pytest-cov/commit/bb23eacc5531fb8f499213d8420407e0d72f88e3"><code>bb23eac</code></a> Improve configuration docs</li> <li><a href="https://github.com/pytest-dev/pytest-cov/commit/a19531e91e1ab753ccf648a2d9bab08a6fddebb9"><code>a19531e</code></a> Switch from build/pre-commit to uv/prek - this should make this faster.</li> <li><a href="https://github.com/pytest-dev/pytest-cov/commit/82f999391073f2fb8ae422af452602f310086a2a"><code>82f9993</code></a> Update changelog.</li> <li><a href="https://github.com/pytest-dev/pytest-cov/commit/211b5cd41c29916bc643b4a11b00578ba4fd6fe8"><code>211b5cd</code></a> Fix links.</li> <li><a href="https://github.com/pytest-dev/pytest-cov/commit/97aadd74bcbc00a2078d240e8fe871dd62b83d80"><code>97aadd7</code></a> Update some ci config, reformat and apply some lint fixes.</li> <li>Additional commits viewable in <a href="https://github.com/pytest-dev/pytest-cov/compare/v6.2.1...v7.0.0">compare view</a></li> </ul> </details> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pytest-cov&package-manager=pip&previous-version=6.2.1&new-version=7.0.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mikhail Ryzhov <mikhail.ryzhov@intel.com>

dmitry-gorokhov requested a review from a team June 1, 2020 11:29

dmitry-gorokhov requested a review from GlebKazantaev as a code owner June 1, 2020 11:29

dmitry-gorokhov requested review from a team June 1, 2020 11:29

dmitry-gorokhov commented Jun 1, 2020

View reviewed changes

dmitry-gorokhov force-pushed the feature/dmitrygo/depth_to_space branch from 6b7951c to 0099f2f Compare June 1, 2020 18:22

dmitry-gorokhov requested review from a team as code owners June 1, 2020 18:22

dmitry-gorokhov added the category: CPU OpenVINO CPU plugin label Jun 1, 2020

dmitry-gorokhov added this to the 2020.4 milestone Jun 1, 2020

dmitry-gorokhov force-pushed the feature/dmitrygo/depth_to_space branch from 0099f2f to 64dea6a Compare June 2, 2020 06:19

dmitry-gorokhov force-pushed the feature/dmitrygo/depth_to_space branch from 64dea6a to 319ff7b Compare June 2, 2020 11:51

itikhono approved these changes Jun 2, 2020

View reviewed changes

dmitry-gorokhov force-pushed the feature/dmitrygo/depth_to_space branch 3 times, most recently from aed11ad to 9159e0c Compare June 3, 2020 13:17

dmitrygo added 3 commits June 4, 2020 09:48

[CPU] Updated DepthToSpace and SpaceToDepth layers to be conformant w…

3b4392b

…ith the specification The patch also includes n[d]hwc layout support as well as some optimizations

[CPU][TESTS] Removed old DepthToSpace test since it doesn't correspon…

895b1cd

…ds to layer's specification

[nGraph] Utilize CommonOptimizations pass with custom transformations…

b0dde6c

… callback

dmitry-gorokhov force-pushed the feature/dmitrygo/depth_to_space branch from 9159e0c to b0dde6c Compare June 4, 2020 06:49

AlexPeskov reviewed Jun 4, 2020

View reviewed changes

inference-engine/src/mkldnn_plugin/nodes/depth_to_space.cpp Outdated Show resolved Hide resolved

inference-engine/src/mkldnn_plugin/nodes/depth_to_space.cpp Outdated Show resolved Hide resolved

inference-engine/src/mkldnn_plugin/nodes/depth_to_space.cpp Outdated Show resolved Hide resolved

AlexPeskov approved these changes Jun 4, 2020

View reviewed changes

dmitry-gorokhov merged commit 3183c11 into openvinotoolkit:master Jun 4, 2020

ilya-lavrenov added enhancement New feature or request optimization labels Jun 4, 2020

redradist pushed a commit to redradist/openvino that referenced this pull request Oct 6, 2023

Remove unused include (openvinotoolkit#706)

667b370

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

DepthToSpace, SpaceToDepth layers optimizations #706

DepthToSpace, SpaceToDepth layers optimizations #706

Uh oh!

dmitry-gorokhov commented Jun 1, 2020

Uh oh!

dmitry-gorokhov Jun 1, 2020

Uh oh!

itikhono Jun 1, 2020

Uh oh!

dmitry-gorokhov Jun 1, 2020

Uh oh!

dmitry-gorokhov Jun 2, 2020

Uh oh!

dmitry-gorokhov commented Jun 2, 2020

Uh oh!

AlexPeskov commented Jun 2, 2020

Uh oh!

dmitry-gorokhov commented Jun 3, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AlexPeskov left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

DepthToSpace, SpaceToDepth layers optimizations #706

DepthToSpace, SpaceToDepth layers optimizations #706

Uh oh!

Conversation

dmitry-gorokhov commented Jun 1, 2020

Uh oh!

dmitry-gorokhov Jun 1, 2020

Choose a reason for hiding this comment

Uh oh!

itikhono Jun 1, 2020

Choose a reason for hiding this comment

Uh oh!

dmitry-gorokhov Jun 1, 2020

Choose a reason for hiding this comment

Uh oh!

dmitry-gorokhov Jun 2, 2020

Choose a reason for hiding this comment

Uh oh!

dmitry-gorokhov commented Jun 2, 2020

Uh oh!

AlexPeskov commented Jun 2, 2020

Uh oh!

dmitry-gorokhov commented Jun 3, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AlexPeskov left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants