Skip to content

Commit

Permalink
(#22913) openvino: added 2024.0.0 version
Browse files Browse the repository at this point in the history
  • Loading branch information
RaguzovaTatyana committed Mar 7, 2024
1 parent ebf0181 commit 72b035c
Show file tree
Hide file tree
Showing 8 changed files with 570 additions and 10 deletions.
29 changes: 29 additions & 0 deletions recipes/openvino/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
sources:
"2024.0.0":
"openvino":
url: "https://github.com/openvinotoolkit/openvino/archive/refs/tags/2024.0.0.tar.gz"
sha256: "b3c257f8af9545ae68a6ea217173b2b2de9dd42d35e8703a7a51d76f4c2bfe2f"
"arm_compute":
url: "https://github.com/ARM-software/ComputeLibrary/archive/refs/tags/v23.08.tar.gz"
sha256: "62f514a555409d4401e5250b290cdf8cf1676e4eb775e5bd61ea6a740a8ce24f"
"onednn_cpu":
url: "https://github.com/openvinotoolkit/oneDNN/archive/f82148befdbdc9576ec721c9d500155ee4de8060.tar.gz"
sha256: "7fce5c6b499ffe1a30c26b2d4e4a5193a38aa217b6f54e44eea52b21cf38a684"
"mlas":
url: "https://github.com/openvinotoolkit/mlas/archive/d1bc25ec4660cddd87804fcf03b2411b5dfb2e94.tar.gz"
sha256: "0a44fbfd4b13e8609d66ddac4b11a27c90c1074cde5244c91ad197901666004c"
"onednn_gpu":
url: "https://github.com/oneapi-src/oneDNN/archive/494af5f9921bdae98f1a0e2955fa7d76ff386c4f.tar.gz"
sha256: "e2f36563cecf39197ad8d4f8b351ccc5a431085dad26e47c0ae6f0bb79149df7"
"2023.3.0":
"openvino":
url: "https://github.com/openvinotoolkit/openvino/archive/refs/tags/2023.3.0.tar.gz"
Expand Down Expand Up @@ -48,6 +64,19 @@ sources:
url: "https://github.com/oneapi-src/oneDNN/archive/4b82a66ed38ecaa993352e5cc6ed7753656b8a26.tar.gz"
sha256: "cb17c003fe51bc9b4e20189573956b4446468162adf0fc4cea2ee0820cff0cd0"
patches:
"2024.0.0":
- patch_file: "patches/2024.0.0/0001-Include-mutex-for-std-call_once.patch"
patch_description: "Include mutex for std::call_once"
patch_type: "portability"
patch_source: "https://github.com/openvinotoolkit/openvino/pull/23151"
- patch_file: "patches/2024.0.0/0002-Fix-includes-for-dev-api.patch"
patch_description: "Include tensor for dev api"
patch_type: "portability"
patch_source: "https://github.com/openvinotoolkit/openvino/pull/23175"
- patch_file: "patches/2024.0.0/0003-Support-OpenVINO-compilation-with-cpp20.patch"
patch_description: "Add support to OpenVINO to build it with standards newer than cpp11"
patch_type: "portability"
patch_source: "https://github.com/openvinotoolkit/openvino/pull/22784"
"2023.2.0":
- patch_file: "patches/2023.2.0/0001-git-version.patch"
patch_description: "Fixed issue with version on Windows"
Expand Down
5 changes: 3 additions & 2 deletions recipes/openvino/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -355,8 +355,9 @@ def package_info(self):
if self.options.enable_pytorch_frontend:
openvino_runtime.libs.append("openvino_pytorch_frontend")
# Common private dependencies should go last, because they satisfy dependencies for all other libraries
openvino_runtime.libs.extend(["openvino_reference", "openvino_builders",
"openvino_shape_inference", "openvino_itt",
if Version(self.version) < "2024.0.0":
openvino_runtime.libs.append("openvino_builders")
openvino_runtime.libs.extend(["openvino_reference", "openvino_shape_inference", "openvino_itt",
# utils goes last since all others depend on it
"openvino_util"])
# set 'openvino' once again for transformations objects files (cyclic dependency)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
onnx: "1.15.0"
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/inference/src/dev/make_tensor.cpp b/src/inference/src/dev/make_tensor.cpp
index e34497749a..f28c90ccf4 100644
--- a/src/inference/src/dev/make_tensor.cpp
+++ b/src/inference/src/dev/make_tensor.cpp
@@ -5,6 +5,7 @@
#include "openvino/runtime/make_tensor.hpp"

#include <memory>
+#include <mutex>

#include "openvino/runtime/iremote_tensor.hpp"
#include "openvino/runtime/properties.hpp"

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/inference/src/dev/make_tensor.cpp b/src/inference/src/dev/make_tensor.cpp
index f28c90ccf4..e457b81fc0 100644
--- a/src/inference/src/dev/make_tensor.cpp
+++ b/src/inference/src/dev/make_tensor.cpp
@@ -9,6 +9,7 @@

#include "openvino/runtime/iremote_tensor.hpp"
#include "openvino/runtime/properties.hpp"
+#include "openvino/runtime/tensor.hpp"
#ifdef PROXY_PLUGIN_ENABLED
# include "openvino/proxy/plugin.hpp"
#endif

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions recipes/openvino/all/test_package/test_package.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@ int test_available_devices() {
OV_FAIL(ov_core_get_property(core, "GPU", "AVAILABLE_DEVICES", &ret));
#endif
#ifdef ENABLE_AUTO
OV_SUCCESS(ov_core_get_property(core, "AUTO", "SUPPORTED_METRICS", &ret));
OV_SUCCESS(ov_core_get_property(core, "MULTI", "SUPPORTED_METRICS", &ret));
OV_SUCCESS(ov_core_get_property(core, "AUTO", "SUPPORTED_PROPERTIES", &ret));
OV_SUCCESS(ov_core_get_property(core, "MULTI", "SUPPORTED_PROPERTIES", &ret));
#else
OV_FAIL(ov_core_get_property(core, "AUTO", "SUPPORTED_METRICS", &ret));
OV_FAIL(ov_core_get_property(core, "MULTI", "SUPPORTED_METRICS", &ret));
OV_FAIL(ov_core_get_property(core, "AUTO", "SUPPORTED_PROPERTIES", &ret));
OV_FAIL(ov_core_get_property(core, "MULTI", "SUPPORTED_PROPERTIES", &ret));
#endif
#ifdef ENABLE_HETERO
OV_SUCCESS(ov_core_get_property(core, "HETERO", "SUPPORTED_METRICS", &ret));
OV_SUCCESS(ov_core_get_property(core, "HETERO", "SUPPORTED_PROPERTIES", &ret));
#else
OV_FAIL(ov_core_get_property(core, "HETERO", "SUPPORTED_METRICS", &ret));
OV_FAIL(ov_core_get_property(core, "HETERO", "SUPPORTED_PROPERTIES", &ret));
#endif
#ifdef ENABLE_AUTO_BATCH
OV_SUCCESS(ov_core_get_property(core, "BATCH", "SUPPORTED_METRICS", &ret));
OV_SUCCESS(ov_core_get_property(core, "BATCH", "SUPPORTED_PROPERTIES", &ret));
#else
OV_FAIL(ov_core_get_property(core, "BATCH", "SUPPORTED_METRICS", &ret));
OV_FAIL(ov_core_get_property(core, "BATCH", "SUPPORTED_PROPERTIES", &ret));
#endif
ov_core_free(core);
return 0;
Expand Down
2 changes: 2 additions & 0 deletions recipes/openvino/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"2024.0.0":
folder: "all"
"2023.3.0":
folder: "all"
"2023.2.0":
Expand Down

0 comments on commit 72b035c

Please sign in to comment.