[VPU] StaticShapeNMS support #1057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

ggladilov merged 7 commits into openvinotoolkit:master from unknown repository

Jul 2, 2020

ghost commented Jun 22, 2020

Ticket #-33362

ghost added the category: VPU label

ghost added this to the 2021.1 milestone

ghost self-requested a review

June 22, 2020 07:30

ghost self-requested a review as a code owner

June 22, 2020 07:30

ghost self-requested a review

June 22, 2020 07:30

ghost self-assigned this

postrational approved these changes

View reviewed changes

Contributor

ggladilov commented Jun 22, 2020

@AndrewBakalinIntel I don't see a link to internal validation at the ticket

ghost marked this pull request as draft

June 22, 2020 10:29

Author

ghost commented Jun 22, 2020

@AndrewBakalinIntel I don't see a link to internal validation at the ticket

@gladilov-gleb Sry, forgot to mark this as draft, as some changes are also required.

ggladilov reviewed

View reviewed changes

...engine/src/vpu/common/include/vpu/ngraph/operations/static_shape_non_maximum_suppression.hpp Show resolved Hide resolved

inference-engine/src/vpu/graph_transformer/src/stages/static_shape_nms.cpp Show resolved Hide resolved

inference-engine/src/vpu/graph_transformer/src/stages/static_shape_nms.cpp Outdated Show resolved Hide resolved

inference-engine/src/vpu/graph_transformer/src/stages/static_shape_nms.cpp Outdated Show resolved Hide resolved

inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_nms.cpp Show resolved Hide resolved

ghost marked this pull request as ready for review

June 25, 2020 12:41

ggladilov approved these changes

View reviewed changes

Author

ghost commented Jun 25, 2020

@gladilov-gleb It's still waiting for final review of device side changes (in order to update the firmware). I will let you know once it's ready.

ghost self-requested a review

June 30, 2020 08:41

andreybakalin97 added 7 commits

June 30, 2020 16:52


          [VPU] Introduce StaticShapeNMS stage

511cf32


          [VPU][NGraph] StaticShapeNMS fixes

ebf5820


          [VPU] StaticShapeNMS layer tests

c1457cc


          [VPU] +1 to StaticShapeNMS fixes

183de78


          [VPU] Add test on v3::NMS with NonZero

c49c521


          [VPU] Review fixes


          [VPU] Update firmware

f6432c1

Author

ghost commented Jul 2, 2020

@gladilov-gleb could you please merge? Precommit and internal CI are fine.

ghost assigned ggladilov and unassigned ghost

ggladilov merged commit dfe27ba into openvinotoolkit:master

github-merge-queue bot pushed a commit that referenced this pull request


          Bump pytest-xdist from 2.1.0 to 3.6.1 in /tests (#28548)

ace5379

Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from
2.1.0 to 3.6.1.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst">pytest-xdist's
changelog</a>.</em></p>
<blockquote>
<h1>pytest-xdist 3.6.1 (2024-04-28)</h1>
<h2>Bug Fixes</h2>
<ul>

<li><code>[#1071](pytest-dev/pytest-xdist#1071)
&lt;https://github.com/pytest-dev/pytest-xdist/issues/1071&gt;</code>_:
Add backward compatibility for deadlock issue with the
<code>execnet</code> new <code>main_thread_only</code>
&quot;execmodel&quot; triggered when pytest-cov accesses rinfo.</li>
</ul>
<h1>pytest-xdist 3.6.0 (2024-04-19)</h1>
<p>This release was YANKED due to a regression fixed in 3.6.1.</p>
<h2>Features</h2>
<ul>

<li><code>[#1027](pytest-dev/pytest-xdist#1027)
&lt;https://github.com/pytest-dev/pytest-xdist/pull/1027&gt;</code>_:<code>pytest-xdist</code>
workers now always execute the tests in the main thread.
Previously some tests might end up executing in a separate thread other
than <code>main</code> in the workers, due to some internal
<code>execnet`` details. This can cause problems specially with async
frameworks where the event loop is running in the ``main`` thread (for
example </code><a
href="https://redirect.github.com/pytest-dev/pytest-xdist/issues/620">#620</a>
<a
href="https://redirect.github.com/pytest-dev/pytest-xdist/issues/620">pytest-dev/pytest-xdist#620</a>`__).</li>
</ul>
<h2>Bug Fixes</h2>
<ul>
<li>

<p><code>[#1024](pytest-dev/pytest-xdist#1024)
&lt;https://github.com/pytest-dev/pytest-xdist/issues/1024&gt;</code>_:
Added proper handling of <code>shouldstop</code> (such as set by
<code>--max-fail</code>) and <code>shouldfail</code> conditions in
workers.
Previously, a worker might have continued executing further tests before
the controller could terminate the session.</p>
</li>
<li>

<p><code>[#1028](pytest-dev/pytest-xdist#1028)
&lt;https://github.com/pytest-dev/pytest-xdist/issues/1028&gt;</code>_:
Fixed compatibility issue between <code>looponfail</code> and editable
installs.</p>
</li>
<li>
<p><code>[#620](pytest-dev/pytest-xdist#620)
&lt;https://github.com/pytest-dev/pytest-xdist/issues/620&gt;</code>_:
Use the new <code>main_thread_only</code> <code>execnet</code>
&quot;execmodel&quot; so that code which expects to only run in the main
thread will now work as expected.</p>
</li>
<li>
<p><code>[#937](pytest-dev/pytest-xdist#937)
&lt;https://github.com/pytest-dev/pytest-xdist/issues/937&gt;</code>_:
Fixed a bug where plugin would raise an incompatibility error with
<code>--pdb</code> despite using <code>-n0</code>.</p>
</li>
</ul>
<h2>Removals</h2>
<ul>
<li>

<p><code>[#1053](pytest-dev/pytest-xdist#1053)
&lt;https://github.com/pytest-dev/pytest-xdist/issues/1053&gt;</code>_:
Dropped support for Python 3.7.</p>
</li>
<li>

<p><code>[#1057](pytest-dev/pytest-xdist#1057)
&lt;https://github.com/pytest-dev/pytest-xdist/issues/1057&gt;</code>_:
pytest&gt;=7.0.0 is now required.</p>
<p>execnet&gt;=2.1.0 is now required.</p>
</li>
</ul>
<h2>Trivial Changes</h2>
<ul>
<li>

<p><code>[#1020](pytest-dev/pytest-xdist#1020)
&lt;https://github.com/pytest-dev/pytest-xdist/issues/1020&gt;</code>_:
pytest-xdist's <code>setup.py</code> file is removed.</p>
<p>If you relied on this file, e.g. to install pytest using
<code>setup.py install</code>,
please see <code>Why you shouldn't invoke setup.py directly
&lt;https://blog.ganssle.io/articles/2021/10/setup-py-deprecated.html#summary&gt;</code>_
for alternatives.</p>
</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/4dd2978031eaf7017c84a1cc77667379a2b11c64"><code>4dd2978</code></a>
Release 3.6.1</li>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/b397288b7ed40ac8c55a173566bb881e0adcb546"><code>b397288</code></a>
Merge pull request <a
href="https://redirect.github.com/pytest-dev/pytest-xdist/issues/1072">#1072</a>
from zmedico/gateway-cache-rinfo</li>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/12b3cce0ce4f4cffcc35c0e8369759b71b32c0cc"><code>12b3cce</code></a>
Cache execnet gateway rinfo during WorkerController setup</li>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/c93a106b3ad466e22d19d814394de0422adf4dca"><code>c93a106</code></a>
build(deps): bump hynek/build-and-inspect-python-package (<a
href="https://redirect.github.com/pytest-dev/pytest-xdist/issues/1066">#1066</a>)</li>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/52e202263827775ad6bcf18a216000aec4412911"><code>52e2022</code></a>
[pre-commit.ci] pre-commit autoupdate (<a
href="https://redirect.github.com/pytest-dev/pytest-xdist/issues/1073">#1073</a>)</li>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/699f939b5cc2d61df9f622d0449a590be216ee7a"><code>699f939</code></a>
Merge pull request <a
href="https://redirect.github.com/pytest-dev/pytest-xdist/issues/1070">#1070</a>
from pytest-dev/release-3.6.0</li>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/80bc0b8e5be6e256c8f49791e08abd5fa2d2d3a2"><code>80bc0b8</code></a>
Release 3.6.0</li>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/20e3ac774e8fa34b25665ef183b94c9879f98cd1"><code>20e3ac7</code></a>
Use execnet main_thread_only execmodel (<a
href="https://redirect.github.com/pytest-dev/pytest-xdist/issues/1027">#1027</a>)</li>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/0a4238f6da367a9133882d8810a3b556837cb5ae"><code>0a4238f</code></a>
Merge pull request <a
href="https://redirect.github.com/pytest-dev/pytest-xdist/issues/1067">#1067</a>
from pytest-dev/pre-commit-ci-update-config</li>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/068627994f91068fb27269be421385c7cd3ab201"><code>0686279</code></a>
[pre-commit.ci] pre-commit autoupdate</li>
<li>Additional commits viewable in <a
href="https://github.com/pytest-dev/pytest-xdist/compare/v2.1.0...v3.6.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pytest-xdist&package-manager=pip&previous-version=2.1.0&new-version=3.6.1)](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>
<br />

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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

MirceaDan99 pushed a commit to MirceaDan99/openvino that referenced this pull request


          Bump pytest-xdist from 2.1.0 to 3.6.1 in /tests (openvinotoolkit#28548)

86da06f

Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from
2.1.0 to 3.6.1.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst">pytest-xdist's
changelog</a>.</em></p>
<blockquote>
<h1>pytest-xdist 3.6.1 (2024-04-28)</h1>
<h2>Bug Fixes</h2>
<ul>

<li><code>[openvinotoolkit#1071](pytest-dev/pytest-xdist#1071)
&lt;https://github.com/pytest-dev/pytest-xdist/issues/1071&gt;</code>_:
Add backward compatibility for deadlock issue with the
<code>execnet</code> new <code>main_thread_only</code>
&quot;execmodel&quot; triggered when pytest-cov accesses rinfo.</li>
</ul>
<h1>pytest-xdist 3.6.0 (2024-04-19)</h1>
<p>This release was YANKED due to a regression fixed in 3.6.1.</p>
<h2>Features</h2>
<ul>

<li><code>[openvinotoolkit#1027](pytest-dev/pytest-xdist#1027)
&lt;https://github.com/pytest-dev/pytest-xdist/pull/1027&gt;</code>_:<code>pytest-xdist</code>
workers now always execute the tests in the main thread.
Previously some tests might end up executing in a separate thread other
than <code>main</code> in the workers, due to some internal
<code>execnet`` details. This can cause problems specially with async
frameworks where the event loop is running in the ``main`` thread (for
example </code><a
href="https://redirect.github.com/pytest-dev/pytest-xdist/issues/620">#620</a>
<a
href="https://redirect.github.com/pytest-dev/pytest-xdist/issues/620">pytest-dev/pytest-xdist#620</a>`__).</li>
</ul>
<h2>Bug Fixes</h2>
<ul>
<li>

<p><code>[openvinotoolkit#1024](pytest-dev/pytest-xdist#1024)
&lt;https://github.com/pytest-dev/pytest-xdist/issues/1024&gt;</code>_:
Added proper handling of <code>shouldstop</code> (such as set by
<code>--max-fail</code>) and <code>shouldfail</code> conditions in
workers.
Previously, a worker might have continued executing further tests before
the controller could terminate the session.</p>
</li>
<li>

<p><code>[openvinotoolkit#1028](pytest-dev/pytest-xdist#1028)
&lt;https://github.com/pytest-dev/pytest-xdist/issues/1028&gt;</code>_:
Fixed compatibility issue between <code>looponfail</code> and editable
installs.</p>
</li>
<li>
<p><code>[openvinotoolkit#620](pytest-dev/pytest-xdist#620)
&lt;https://github.com/pytest-dev/pytest-xdist/issues/620&gt;</code>_:
Use the new <code>main_thread_only</code> <code>execnet</code>
&quot;execmodel&quot; so that code which expects to only run in the main
thread will now work as expected.</p>
</li>
<li>
<p><code>[openvinotoolkit#937](pytest-dev/pytest-xdist#937)
&lt;https://github.com/pytest-dev/pytest-xdist/issues/937&gt;</code>_:
Fixed a bug where plugin would raise an incompatibility error with
<code>--pdb</code> despite using <code>-n0</code>.</p>
</li>
</ul>
<h2>Removals</h2>
<ul>
<li>

<p><code>[openvinotoolkit#1053](pytest-dev/pytest-xdist#1053)
&lt;https://github.com/pytest-dev/pytest-xdist/issues/1053&gt;</code>_:
Dropped support for Python 3.7.</p>
</li>
<li>

<p><code>[openvinotoolkit#1057](pytest-dev/pytest-xdist#1057)
&lt;https://github.com/pytest-dev/pytest-xdist/issues/1057&gt;</code>_:
pytest&gt;=7.0.0 is now required.</p>
<p>execnet&gt;=2.1.0 is now required.</p>
</li>
</ul>
<h2>Trivial Changes</h2>
<ul>
<li>

<p><code>[openvinotoolkit#1020](pytest-dev/pytest-xdist#1020)
&lt;https://github.com/pytest-dev/pytest-xdist/issues/1020&gt;</code>_:
pytest-xdist's <code>setup.py</code> file is removed.</p>
<p>If you relied on this file, e.g. to install pytest using
<code>setup.py install</code>,
please see <code>Why you shouldn't invoke setup.py directly
&lt;https://blog.ganssle.io/articles/2021/10/setup-py-deprecated.html#summary&gt;</code>_
for alternatives.</p>
</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/4dd2978031eaf7017c84a1cc77667379a2b11c64"><code>4dd2978</code></a>
Release 3.6.1</li>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/b397288b7ed40ac8c55a173566bb881e0adcb546"><code>b397288</code></a>
Merge pull request <a
href="https://redirect.github.com/pytest-dev/pytest-xdist/issues/1072">#1072</a>
from zmedico/gateway-cache-rinfo</li>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/12b3cce0ce4f4cffcc35c0e8369759b71b32c0cc"><code>12b3cce</code></a>
Cache execnet gateway rinfo during WorkerController setup</li>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/c93a106b3ad466e22d19d814394de0422adf4dca"><code>c93a106</code></a>
build(deps): bump hynek/build-and-inspect-python-package (<a
href="https://redirect.github.com/pytest-dev/pytest-xdist/issues/1066">#1066</a>)</li>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/52e202263827775ad6bcf18a216000aec4412911"><code>52e2022</code></a>
[pre-commit.ci] pre-commit autoupdate (<a
href="https://redirect.github.com/pytest-dev/pytest-xdist/issues/1073">#1073</a>)</li>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/699f939b5cc2d61df9f622d0449a590be216ee7a"><code>699f939</code></a>
Merge pull request <a
href="https://redirect.github.com/pytest-dev/pytest-xdist/issues/1070">#1070</a>
from pytest-dev/release-3.6.0</li>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/80bc0b8e5be6e256c8f49791e08abd5fa2d2d3a2"><code>80bc0b8</code></a>
Release 3.6.0</li>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/20e3ac774e8fa34b25665ef183b94c9879f98cd1"><code>20e3ac7</code></a>
Use execnet main_thread_only execmodel (<a
href="https://redirect.github.com/pytest-dev/pytest-xdist/issues/1027">#1027</a>)</li>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/0a4238f6da367a9133882d8810a3b556837cb5ae"><code>0a4238f</code></a>
Merge pull request <a
href="https://redirect.github.com/pytest-dev/pytest-xdist/issues/1067">#1067</a>
from pytest-dev/pre-commit-ci-update-config</li>
<li><a
href="https://github.com/pytest-dev/pytest-xdist/commit/068627994f91068fb27269be421385c7cd3ab201"><code>0686279</code></a>
[pre-commit.ci] pre-commit autoupdate</li>
<li>Additional commits viewable in <a
href="https://github.com/pytest-dev/pytest-xdist/compare/v2.1.0...v3.6.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pytest-xdist&package-manager=pip&previous-version=2.1.0&new-version=3.6.1)](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>
<br />

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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet