Skip to content
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.

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

[openvino] ported upstream patches to 2023.1.0 #20245

Merged

Conversation

ilya-lavrenov
Copy link
Contributor

@ilya-lavrenov ilya-lavrenov commented Oct 1, 2023

Changes requested here #19681 (comment):

  • Added upper bound for cmake tool
  • Pinned scons tool to exact version

Several patches from upstream to make the recipe itself more future proof and minimize conditions when adding newer versions:

  • Ported patch to enable GPU plugin under clang
  • Ported patch to compile and work with GPU plugin statically
  • Used rapidjson as a requirement instead of "local" copy of this dependency in 3rdparty. This allows to prevent possible ODR violations.

Common changes:

  • Introduced dependency files to make updates for newer OpenVINO versions more simpler - no needs to write conditional code in the recipe itself, because different dependency versions can be hidden in dedicated files.

@ghost
Copy link

ghost commented Oct 1, 2023

I detected other pull requests that are modifying openvino/all recipe:

This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there.

@conan-center-bot

This comment has been minimized.

@ilya-lavrenov ilya-lavrenov force-pushed the openvino-2023.1.0-update branch 5 times, most recently from 6f0c578 to ad07567 Compare October 1, 2023 12:32
@conan-center-bot

This comment has been minimized.

url: "https://github.com/openvinotoolkit/openvino/archive/47b736f63edda256d66e2bbb572f42a9d6549f6e.tar.gz"
sha256: "8a1dd5b35fe4b60440e97ee61e12e01aa4dd78b5be30550aa08fcd96c416e1d7"
url: "https://github.com/openvinotoolkit/openvino/archive/refs/tags/2023.1.0.tar.gz"
sha256: "ff88596b342440185874ddbe22874b47ad7b923f14671921af760b15c98aacd6"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

commit hash is the same, just replace with tag instead if commit hash:

$ git log -1 2023.1.0
commit 47b736f63edda256d66e2bbb572f42a9d6549f6e (tag: 2023.1.0)
Author: Tatiana Savina <tatiana.savina@intel.com>
Date:   Mon Sep 4 15:04:36 2023 +0200

    update links (#19563)

@ilya-lavrenov ilya-lavrenov force-pushed the openvino-2023.1.0-update branch 2 times, most recently from 63eea71 to a3ee522 Compare October 2, 2023 21:24
@conan-center-bot

This comment has been minimized.

@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 12 (f606af02de1c24d2dfeb7528d110d64ffd7c106f):

  • openvino/2023.1.0:
    All packages built successfully! (All logs)

Conan v2 pipeline ✔️

Note: Conan v2 builds are now mandatory. Please read our discussion about it.

All green in build 12 (f606af02de1c24d2dfeb7528d110d64ffd7c106f):

  • openvino/2023.1.0:
    All packages built successfully! (All logs)

@ilya-lavrenov
Copy link
Contributor Author

@SpaceIm @RubenRBS
Could you please have a look? The comments from original PR were addressed here

@AbrilRBS AbrilRBS self-assigned this Oct 4, 2023
@AbrilRBS
Copy link
Member

AbrilRBS commented Oct 4, 2023

@ilya-lavrenov yup, it's in the review backlog :) Thanks for your patience

Copy link
Member

@AbrilRBS AbrilRBS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We usually prefer to have a mapping in the recipe code itself, but I guess this also works! Thanks a lot :)

@ilya-lavrenov
Copy link
Contributor Author

We usually prefer to have a mapping in the recipe code itself, but I guess this also works! Thanks a lot :)

I supposed that if we have mapping in code - we need to change it with every version of OpenVINO. So, when we introduce new version - Conan CI will rebuild all other OpenVINO versions, while they are actually not touched.

I hoped to WA this rebuild issue with external files for dependencies, because OpenVINO rebuild is not a 2 mins task :)

@ghost ghost mentioned this pull request Oct 7, 2023
3 tasks
@ilya-lavrenov
Copy link
Contributor Author

Hi @SSE4 @theirix @ericLemanissier @jwillikers
Could you please review?

@conan-center-bot conan-center-bot merged commit 2ec1c8d into conan-io:master Oct 9, 2023
13 checks passed
@ilya-lavrenov ilya-lavrenov deleted the openvino-2023.1.0-update branch October 9, 2023 17:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants