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] Update to 2024.1.0 #38255

Merged
merged 2 commits into from
May 2, 2024
Merged

[OpenVINO] Update to 2024.1.0 #38255

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71bfa0b
Add OpenVINO 2024.1.0, introduce npu feature
culhatsker Apr 18, 2024
a2171b7
Update ports/openvino/vcpkg.json
culhatsker Apr 22, 2024
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
35 changes: 26 additions & 9 deletions ports/openvino/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO openvinotoolkit/openvino
REF "${VERSION}"
SHA512 89c60aa8c73d91003f9fdd4e8f93213b98164ecdcd4a4264ba93352473666a290d1dd55b61cf9c5d62b0cef429f989bb31f5d4bfa67cf6d97dfc2abca45d4186
SHA512 ddada33aac43f707c36868ef12861445f08856f0df3b086e509bc294ff54ad1f55afd7e2b44c6f8444b0d74532b46cfc217f45a4635eeec4ef96bb55d12deab6
PATCHES
# vcpkg specific patch, because OV creates a file in source tree, which is prohibited
001-disable-tools.patch
Expand All @@ -12,6 +12,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
cpu ENABLE_INTEL_CPU
gpu ENABLE_INTEL_GPU
npu ENABLE_INTEL_NPU
auto ENABLE_AUTO
hetero ENABLE_HETERO
auto-batch ENABLE_AUTO_BATCH
Expand Down Expand Up @@ -39,8 +40,8 @@ if(ENABLE_INTEL_GPU)
vcpkg_from_github(
OUT_SOURCE_PATH DEP_SOURCE_PATH
REPO oneapi-src/oneDNN
REF 494af5f9921bdae98f1a0e2955fa7d76ff386c4f
SHA512 30c555cbe1e2f4f536ccedc920a962751ba05e2c49e38948e5da83f9b89e14eebda7450edabe51865beeebdf6b6da5fe4673c30d1db67c803f474e9093759b1f
REF 4e6ff043c439652fcf6c400ac4e0c81bbac7c71c
SHA512 456332fdaf0d20d48bb1caaab1fa0b933c59d145f09ba4b1083d044207dd488d08a6eae84877b410cc7ba55cea251fa2652dabe92f25d75483fa723a0949df72
)
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/onednn_gpu")
endif()
Expand All @@ -54,8 +55,8 @@ if(ENABLE_INTEL_CPU)
vcpkg_from_github(
OUT_SOURCE_PATH DEP_SOURCE_PATH
REPO openvinotoolkit/oneDNN
REF f82148befdbdc9576ec721c9d500155ee4de8060
SHA512 d4270b27ee274a5aa065ae5812db3c6ca9c898d72059eb5146f040a3ee354c8f114e45247ac37cab9fb2beee0f09eea2d0947d4f06ecbc7121b14011d3e1ce6d
REF 26633ae49edd4353a29b7170d9fcef6b2d7
SHA512 554c8050b5012248189c45bd51dbce6efa3a4b19f018a09a423b5dfa79da32a56a24c02ba24447e9a1f4d424b1e46e19322d8d02d622ef7c6a6910cdda991756
)
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/onednn")

Expand All @@ -81,13 +82,31 @@ if(ENABLE_INTEL_CPU)
vcpkg_from_github(
OUT_SOURCE_PATH DEP_SOURCE_PATH
REPO ARM-software/ComputeLibrary
REF v23.08
SHA512 8379fdf804732ef4e69a3e91807810d413f35855d035cfde9d81059679f62cd625c0347f07dc1f76468dc82c06217a5ae8df25b4581a29558ac32b2a4f7d8af4
REF v24.02.1
SHA512 3a27458e5a0f72654aa7f7cd7145ec20678b49cd4e49846c9097855595c12d29b9753cd38b0825b5d6ffeeb40db1563defac8a0aebd71ee45a34abc26e21e285
)
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/ComputeLibrary")
endif()
endif()

if(ENABLE_INTEL_NPU)
vcpkg_from_github(
OUT_SOURCE_PATH DEP_SOURCE_PATH
REPO oneapi-src/level-zero
REF 4ed13f327d3389285592edcf7598ec3cb2bc712e
SHA512 1159b2dc59ffe201821aa6c4c65c1803f8be26654a5f7e09d4e2cea70afdaf6a49508acbc74279d2d5c8fc7b632ad29b70ea506c442cd599d7db47323de9e62d
)
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_npu/thirdparty/level-zero")

vcpkg_from_github(
OUT_SOURCE_PATH DEP_SOURCE_PATH
REPO intel/level-zero-npu-extensions
REF 0e1c471356a724ef6d176ba027a68e210d90939e
SHA512 586c516e636afb9c1930fbc5faa0ceb130cd0507273fad10b96cd5c3450fb5c76b9bcbc9be630ac5ff3cd97f8108a96fa5d87dce7111be2ff2a59ab92053329c
)
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_npu/thirdparty/level-zero-ext")
endif()

if(ENABLE_OV_TF_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_PADDLE_FRONTEND)
list(APPEND FEATURE_OPTIONS "-DENABLE_SYSTEM_PROTOBUF=ON")
endif()
Expand All @@ -112,9 +131,7 @@ vcpkg_cmake_configure(
"-DENABLE_CPPLINT=OFF"
"-DENABLE_SAMPLES=OFF"
"-DENABLE_TEMPLATE=OFF"
"-DENABLE_INTEL_GNA=OFF"
"-DENABLE_PYTHON=OFF"
"-DENABLE_GAPI_PREPROCESSING=OFF"
"-DCPACK_GENERATOR=VCPKG"
"-DENABLE_JS=OFF"
)
Expand Down
10 changes: 9 additions & 1 deletion ports/openvino/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "openvino",
"version": "2024.0.0",
"version": "2024.1.0",
"maintainers": "OpenVINO Developers <[email protected]>",
"summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference",
"description": [
Expand Down Expand Up @@ -56,6 +56,10 @@
},
"hetero",
"ir",
{
"name": "npu",
"platform": "x64 & !(osx | uwp)"
culhatsker marked this conversation as resolved.
Show resolved Hide resolved
},
"onnx",
"paddle",
"pytorch",
Expand Down Expand Up @@ -87,6 +91,10 @@
"ir": {
"description": "Enables IR frontend for reading models in OpenVINO IR format"
},
"npu": {
"description": "NPU Support",
"supports": "x64 & !(osx | uwp) & !static"
},
"onnx": {
"description": "Enables ONNX frontend for reading models in ONNX format",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6545,7 +6545,7 @@
"port-version": 0
},
"openvino": {
"baseline": "2024.0.0",
"baseline": "2024.1.0",
"port-version": 0
},
"openvpn3": {
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/openvino.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a5a13bdeac616b877575c3b4b0d40fb1def16c04",
"version": "2024.1.0",
"port-version": 0
},
{
"git-tree": "0be18ab11cbaa055a9c4b84dfb11de163b3a30ea",
"version": "2024.0.0",
Expand Down
Loading