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.

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

openvino/2024.4.0 update #25327

Merged
merged 1 commit into from
Sep 24, 2024
Merged

openvino/2024.4.0 update #25327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions recipes/openvino/all/conandata.yml
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

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

Since OpenVINO 2024.4, static build of CPU and GPU plugin can be combined together.

So, could you please add a version check here

conan-center-index/recipes/openvino/all/conanfile.py

Lines 278 to 283 in ae51be0

if self.options.get_safe("enable_gpu") and not self.options.shared and self.options.enable_cpu:
# GPU and CPU plugins cannot be simultaneously built statically, because they use different oneDNN versions
self.output.warning(f"{self.name} recipe builds GPU plugin without oneDNN (dGPU) support during static build, "
"because CPU plugin compiled with different oneDNN version may cause ODR violation. "
"To enable oneDNN support for GPU plugin, please, either use shared build configuration "
"or disable CPU plugin by setting 'enable_cpu' option to False.")
?

Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
sources:
"2024.4.0":
"openvino":
url: "https://github.com/openvinotoolkit/openvino/archive/refs/tags/2024.4.0.tar.gz"
sha256: "aeb6297e3e88b4ab7803b27b231a72bd0493b6761ef98f225142146be500f538"
"arm_compute":
url: "https://github.com/ARM-software/ComputeLibrary/archive/refs/tags/v24.08.tar.gz"
sha256: "b3576ffa2a70e7704bdf7febe7109f4cfb416a0178222b58f5ee0fd455980337"
"onednn_cpu":
url: "https://github.com/openvinotoolkit/oneDNN/archive/c8ae8d96e963bd04214858319fa334968e5e73c9.tar.gz"
sha256: "b9c2a53061b4528231ff5fbcee85900d698c329c7977b1f39c5d3d65f29c2caa"
"mlas":
url: "https://github.com/openvinotoolkit/mlas/archive/d1bc25ec4660cddd87804fcf03b2411b5dfb2e94.tar.gz"
sha256: "0a44fbfd4b13e8609d66ddac4b11a27c90c1074cde5244c91ad197901666004c"
"onednn_gpu":
url: "https://github.com/oneapi-src/oneDNN/archive/4ccd07e3a10e1c08075cf824ac14708245fbc334.tar.gz"
sha256: "4782d7cfd06ae6f782f1f99a62b7937e38a0d4b879a4e33f740a0602e610c86c"
"2024.3.0":
"openvino":
url: "https://github.com/openvinotoolkit/openvino/archive/refs/tags/2024.3.0.tar.gz"
Expand Down
11 changes: 8 additions & 3 deletions recipes/openvino/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,11 @@ def generate(self):
toolchain.cache_variables["ENABLE_INTEL_CPU"] = self.options.enable_cpu
if self._gpu_option_available:
toolchain.cache_variables["ENABLE_INTEL_GPU"] = self.options.enable_gpu
toolchain.cache_variables["ENABLE_ONEDNN_FOR_GPU"] = self.options.shared or not self.options.enable_cpu
toolchain.cache_variables["ENABLE_ONEDNN_FOR_GPU"] = (
Version(self.version) >= "2024.4.0" and self.options.enable_gpu
or not self.options.enable_cpu
or self.options.shared
)
if self._gna_option_available:
toolchain.cache_variables["ENABLE_INTEL_GNA"] = False
if self._npu_option_available:
Expand Down Expand Up @@ -275,7 +279,8 @@ def validate_build(self):
raise ConanInvalidConfiguration(f"{self.ref} does not support Debug build type on Conan Center CI")

def validate(self):
if self.options.get_safe("enable_gpu") and not self.options.shared and self.options.enable_cpu:
if (self.options.get_safe("enable_gpu") and self.options.enable_cpu
and Version(self.version) < "2024.4.0" and not self.options.shared):
# GPU and CPU plugins cannot be simultaneously built statically, because they use different oneDNN versions
self.output.warning(f"{self.name} recipe builds GPU plugin without oneDNN (dGPU) support during static build, "
"because CPU plugin compiled with different oneDNN version may cause ODR violation. "
Expand Down Expand Up @@ -329,7 +334,7 @@ def package_info(self):
if self.options.get_safe("enable_gpu"):
openvino_runtime.libs.extend(["openvino_intel_gpu_plugin", "openvino_intel_gpu_graph",
"openvino_intel_gpu_runtime", "openvino_intel_gpu_kernels"])
if not self.options.enable_cpu:
if not self.options.enable_cpu or Version(self.version) >= "2024.4.0":
openvino_runtime.libs.append("openvino_onednn_gpu")
# SW plugins
if self.options.enable_auto:
Expand Down
1 change: 1 addition & 0 deletions recipes/openvino/all/dependencies/dependencies-2024.4.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
onnx: "1.16.0"
2 changes: 2 additions & 0 deletions recipes/openvino/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"2024.4.0":
folder: "all"
"2024.3.0":
folder: "all"
"2024.2.0":
Expand Down
Loading