3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-29 03:34:26 +08:00
Code Issues Projects Releases Wiki Activity

[openvino] 2023.1.0 release (#33079)

Browse Source 
* openvino: 2023.1.0 release

* updated version databases
This commit is contained in:
Ilya Lavrenov 2023-09-19 20:40:15 +04:00 committed by GitHub
parent 6a349fe1fb
commit 9b68425b11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 68 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/openvino/002-typo-in-default-option-value.patch
View File

@ -1,13 +0,0 @@
diff --git a/cmake/features.cmake b/cmake/features.cmake
index fc7a07252e..546fc72193 100644
--- a/cmake/features.cmake
+++ b/cmake/features.cmake
@@ -126,7 +126,7 @@ ie_option(ENABLE_OV_IR_FRONTEND "Enable IR FrontEnd" ON)
ie_option(ENABLE_OV_TF_FRONTEND "Enable TensorFlow FrontEnd" ON)
ie_option(ENABLE_OV_TF_LITE_FRONTEND "Enable TensorFlow Lite FrontEnd" ON)
ie_dependent_option(ENABLE_SNAPPY_COMPRESSION "Enables compression support for TF FE" ON
- "ENABLE_OV_TF_FRONTEND" ON)
+ "ENABLE_OV_TF_FRONTEND" OFF)
if(CMAKE_HOST_LINUX AND LINUX)
# Debian packages are enabled on Ubuntu systems

16
ports/openvino/004-compilation-with-cpp17.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/src/plugins/intel_cpu/src/cpu_tensor.cpp b/src/plugins/intel_cpu/src/cpu_tensor.cpp
index 48d8fdd4be..815edd9309 100644
--- a/src/plugins/intel_cpu/src/cpu_tensor.cpp
+++ b/src/plugins/intel_cpu/src/cpu_tensor.cpp
@@ -68,8 +68,9 @@ void Tensor::update_strides() const {
OPENVINO_ASSERT(blocked_desc, "not a valid blocked memory descriptor.");
auto& strides = blocked_desc->getStrides();
m_strides.resize(strides.size());
- std::transform(strides.cbegin(), strides.cend(), m_strides.begin(),
- std::bind1st(std::multiplies<size_t>(), m_element_type.size()));
+ std::transform(strides.cbegin(), strides.cend(), m_strides.begin(), [this] (const size_t stride) {
+ return stride * m_element_type.size();
+ });
}
void* Tensor::data(const element::Type& element_type) const {

41
ports/openvino/004-onednn-build.patch
View File

@ -1,41 +0,0 @@
diff --git a/src/cmake/ie_parallel.cmake b/src/cmake/ie_parallel.cmake
index e8aa1c30ef..259e4152c2 100644
--- a/src/cmake/ie_parallel.cmake
+++ b/src/cmake/ie_parallel.cmake
@@ -282,7 +282,7 @@ function(set_ie_threading_interface_for TARGET_NAME)
foreach(include_directory IN LISTS include_directories)
# cannot include /usr/include headers as SYSTEM
if(NOT "${include_directory}" MATCHES "^/usr.*$")
- target_include_directories(${TARGET_NAME} SYSTEM BEFORE
+ target_include_directories(${TARGET_NAME} SYSTEM
${LINK_TYPE} $<BUILD_INTERFACE:${include_directory}>)
else()
set(_system_library ON)
diff --git a/src/plugins/intel_cpu/CMakeLists.txt b/src/plugins/intel_cpu/CMakeLists.txt
index e1f04b4ad2..d1150fdab0 100644
--- a/src/plugins/intel_cpu/CMakeLists.txt
+++ b/src/plugins/intel_cpu/CMakeLists.txt
@@ -83,18 +83,19 @@ elseif(RISCV64)
set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "openvino_riscv_cpu_plugin")
endif()
-set_ie_threading_interface_for(${TARGET_NAME})
-
ie_mark_target_as_cc(${TARGET_NAME})
target_link_libraries(${TARGET_NAME} PRIVATE dnnl
ov_shape_inference
- openvino::pugixml
inference_engine_snippets)
+target_include_directories(${TARGET_NAME} SYSTEM PRIVATE $<TARGET_PROPERTY:dnnl,INCLUDE_DIRECTORIES>)
target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_EXTENSION_API)
target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
-target_include_directories(${TARGET_NAME} SYSTEM PRIVATE $<TARGET_PROPERTY:dnnl,INCLUDE_DIRECTORIES>)
+
+# system libraries must go last
+target_link_libraries(${TARGET_NAME} PRIVATE openvino::pugixml)
+set_ie_threading_interface_for(${TARGET_NAME})
# Cross compiled function
# TODO: The same for proposal, proposalONNX, topk

13
ports/openvino/005-rename-utils.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/common/util/CMakeLists.txt b/src/common/util/CMakeLists.txt
index 4b538aab7c..1cae344ed6 100644
--- a/src/common/util/CMakeLists.txt
+++ b/src/common/util/CMakeLists.txt
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
#
-set(TARGET_NAME util)
+set(TARGET_NAME openvino_util)
file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
file(GLOB_RECURSE PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp)

12
ports/openvino/005-tflite-search.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/src/frontends/common/src/manager.cpp b/src/frontends/common/src/manager.cpp
index 2fa59398b1..fa917dadb1 100644
--- a/src/frontends/common/src/manager.cpp
+++ b/src/frontends/common/src/manager.cpp
@@ -49,6 +49,7 @@ public:
{"ir", "ir"},
{"onnx", "onnx"},
{"tf", "tensorflow"},
+ {"tflite", "tensorflow_lite"},
{"paddle", "paddle"},
{"pytorch", "pytorch"},
};

24
ports/openvino/006-onednn-gpu-build.patch
View File

@ -1,5 +1,5 @@
diff --git a/cmake/OpenCL.cmake b/cmake/OpenCL.cmake
index df86d3434..cf4274b47 100644
index df86d3434d..cf4274b472 100644
--- a/cmake/OpenCL.cmake
+++ b/cmake/OpenCL.cmake
@@ -42,5 +42,5 @@ endif()
@ -10,7 +10,7 @@ index df86d3434..cf4274b47 100644
+# include_directories(${OpenCL_INCLUDE_DIRS})
list(APPEND EXTRA_SHARED_LIBS OpenCL::OpenCL)
diff --git a/cmake/TBB.cmake b/cmake/TBB.cmake
index d6bbe3e80..a62a25117 100644
index d6bbe3e801..a62a251175 100644
--- a/cmake/TBB.cmake
+++ b/cmake/TBB.cmake
@@ -26,7 +26,7 @@ include("cmake/Threading.cmake")
@ -23,24 +23,24 @@ index d6bbe3e80..a62a25117 100644
# Print TBB location
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index e38723312..f19c63f3d 100644
index 9f0aa2a1db..ade68da1af 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -50,5 +50,7 @@ endif()
set(OBJ_LIB ${DNNL_LIBRARY_NAME}_common)
set(OBJ_LIB ${LIB_PACKAGE_NAME}_common)
add_library(${OBJ_LIB} OBJECT ${SOURCES})
+target_include_directories(${OBJ_LIB} PRIVATE
+ $<TARGET_PROPERTY:OpenCL::OpenCL,INTERFACE_INCLUDE_DIRECTORIES>)
set_property(GLOBAL APPEND PROPERTY DNNL_LIB_DEPS
$<TARGET_OBJECTS:${OBJ_LIB}>)
diff --git a/src/gpu/CMakeLists.txt b/src/gpu/CMakeLists.txt
index e31655ec4..867dcac6f 100644
index 0292ebb021..0c79f7a7aa 100644
--- a/src/gpu/CMakeLists.txt
+++ b/src/gpu/CMakeLists.txt
@@ -27,6 +27,8 @@ add_definitions_with_host_compiler(-DNGEN_WINDOWS_COMPAT)
set(OBJ_LIB ${DNNL_LIBRARY_NAME}_gpu)
set(OBJ_LIB ${LIB_PACKAGE_NAME}_gpu)
add_library(${OBJ_LIB} OBJECT ${SOURCES})
+target_include_directories(${OBJ_LIB} PRIVATE
+ $<TARGET_PROPERTY:OpenCL::OpenCL,INTERFACE_INCLUDE_DIRECTORIES>)
@ -48,36 +48,36 @@ index e31655ec4..867dcac6f 100644
$<TARGET_OBJECTS:${OBJ_LIB}>)
diff --git a/src/gpu/compute/CMakeLists.txt b/src/gpu/compute/CMakeLists.txt
index 3f08abbe1..51c59f026 100644
index d69ed519a1..e6a1fe6924 100644
--- a/src/gpu/compute/CMakeLists.txt
+++ b/src/gpu/compute/CMakeLists.txt
@@ -23,5 +23,7 @@ file(GLOB_RECURSE SOURCES
set(OBJ_LIB ${DNNL_LIBRARY_NAME}_gpu_compute)
set(OBJ_LIB ${LIB_PACKAGE_NAME}_gpu_compute)
add_library(${OBJ_LIB} OBJECT ${SOURCES})
+target_include_directories(${OBJ_LIB} PRIVATE
+ $<TARGET_PROPERTY:OpenCL::OpenCL,INTERFACE_INCLUDE_DIRECTORIES>)
set_property(GLOBAL APPEND PROPERTY DNNL_LIB_DEPS
$<TARGET_OBJECTS:${OBJ_LIB}>)
diff --git a/src/gpu/jit/CMakeLists.txt b/src/gpu/jit/CMakeLists.txt
index 178d325ed..a84b54b02 100644
index 38fb5abe07..ac4b0a3523 100644
--- a/src/gpu/jit/CMakeLists.txt
+++ b/src/gpu/jit/CMakeLists.txt
@@ -32,5 +32,7 @@ endif()
set(OBJ_LIB ${DNNL_LIBRARY_NAME}_gpu_jit)
set(OBJ_LIB ${LIB_PACKAGE_NAME}_gpu_jit)
add_library(${OBJ_LIB} OBJECT ${SOURCES})
+target_include_directories(${OBJ_LIB} PRIVATE
+ $<TARGET_PROPERTY:OpenCL::OpenCL,INTERFACE_INCLUDE_DIRECTORIES>)
set_property(GLOBAL APPEND PROPERTY DNNL_LIB_DEPS
$<TARGET_OBJECTS:${OBJ_LIB}>)
diff --git a/src/gpu/ocl/CMakeLists.txt b/src/gpu/ocl/CMakeLists.txt
index 2ccb8d1f5..ab6310e39 100644
index 711645b87f..6e9623798f 100644
--- a/src/gpu/ocl/CMakeLists.txt
+++ b/src/gpu/ocl/CMakeLists.txt
@@ -39,5 +39,7 @@ list(APPEND SOURCES ${kernel_list_src})
set(OBJ_LIB ${DNNL_LIBRARY_NAME}_gpu_ocl)
set(OBJ_LIB ${LIB_PACKAGE_NAME}_gpu_ocl)
add_library(${OBJ_LIB} OBJECT ${SOURCES})
+target_include_directories(${OBJ_LIB} PRIVATE
+ $<TARGET_PROPERTY:OpenCL::OpenCL,INTERFACE_INCLUDE_DIRECTORIES>)

57
ports/openvino/007-dnnl-library-rename.patch
View File

@ -1,57 +0,0 @@
diff --git a/src/plugins/intel_cpu/CMakeLists.txt b/src/plugins/intel_cpu/CMakeLists.txt
index d1150fdab0..cb2881301f 100644
--- a/src/plugins/intel_cpu/CMakeLists.txt
+++ b/src/plugins/intel_cpu/CMakeLists.txt
@@ -85,11 +85,11 @@ endif()
ie_mark_target_as_cc(${TARGET_NAME})
-target_link_libraries(${TARGET_NAME} PRIVATE dnnl
+target_link_libraries(${TARGET_NAME} PRIVATE ${DNNL_LIBRARY_NAME}
ov_shape_inference
inference_engine_snippets)
-target_include_directories(${TARGET_NAME} SYSTEM PRIVATE $<TARGET_PROPERTY:dnnl,INCLUDE_DIRECTORIES>)
+target_include_directories(${TARGET_NAME} SYSTEM PRIVATE $<TARGET_PROPERTY:${DNNL_LIBRARY_NAME},INCLUDE_DIRECTORIES>)
target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_EXTENSION_API)
target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
@@ -119,7 +119,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
if(BUILD_SHARED_LIBS)
add_library(${TARGET_NAME}_obj OBJECT ${SOURCES} ${HEADERS})
- link_system_libraries(${TARGET_NAME}_obj PUBLIC dnnl openvino::pugixml)
+ link_system_libraries(${TARGET_NAME}_obj PUBLIC ${DNNL_LIBRARY_NAME} openvino::pugixml)
ov_add_version_defines(src/plugin.cpp ${TARGET_NAME}_obj)
@@ -133,7 +133,7 @@ if(BUILD_SHARED_LIBS)
${CMAKE_CURRENT_SOURCE_DIR}/src
$<TARGET_PROPERTY:openvino::conditional_compilation,INTERFACE_INCLUDE_DIRECTORIES>)
- target_include_directories(${TARGET_NAME}_obj SYSTEM PUBLIC $<TARGET_PROPERTY:dnnl,INCLUDE_DIRECTORIES>)
+ target_include_directories(${TARGET_NAME}_obj SYSTEM PUBLIC $<TARGET_PROPERTY:${DNNL_LIBRARY_NAME},INCLUDE_DIRECTORIES>)
set_ie_threading_interface_for(${TARGET_NAME}_obj)
diff --git a/src/plugins/intel_cpu/thirdparty/CMakeLists.txt b/src/plugins/intel_cpu/thirdparty/CMakeLists.txt
index 19e453d6b4..f25b7d3db7 100644
--- a/src/plugins/intel_cpu/thirdparty/CMakeLists.txt
+++ b/src/plugins/intel_cpu/thirdparty/CMakeLists.txt
@@ -36,6 +36,7 @@ function(ov_add_onednn)
# select needed primitives
set(DNNL_ENABLE_PRIMITIVE "CONVOLUTION;DECONVOLUTION;CONCAT;LRN;INNER_PRODUCT;MATMUL;POOLING;REDUCTION;REORDER;RNN;SOFTMAX" CACHE STRING "" FORCE)
set(DNNL_ENABLE_WORKLOAD "INFERENCE" CACHE STRING "" FORCE)
+ set(DNNL_LIBRARY_NAME "onednn_cpu" CACHE STRING "" FORCE)
# Allow to enable oneDNN verbose with CPU_DEBUG_CAPS and rely on oneDNN default configuration otherwise
if(ENABLE_CPU_DEBUG_CAPS)
@@ -116,7 +117,7 @@ function(ov_add_onednn)
add_subdirectory(onednn EXCLUDE_FROM_ALL)
# install static libraries
- ov_install_static_lib(dnnl cpu)
+ ov_install_static_lib(${DNNL_LIBRARY_NAME} cpu)
if(DNNL_USE_ACL AND NOT BUILD_SHARED_LIBS)
# use ACLConfig.cmake in OpenVINOConfig.cmake in case of static build

34
ports/openvino/portfile.cmake
View File

@ -1,15 +1,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO openvinotoolkit/openvino
REF 50c85f01ab44b2470f08b0f8824cced109628fc6
SHA512 1673cdab4f0d73ba5e3d0ac1e8a7b136d25df59704575a468016650c3c6c0dcba0bdc0a2306f61a14d49792651b21e9233d166610e0b463624b309758f1b1c04
REF "${VERSION}"
SHA512 29ee621c1428808607ce499e527b5943b8a2172769cb7315ef25253db818f54f2da4bbf5539198c012e25e78c8c830205b46f6e6a83032e732e82a7d00d46312
PATCHES
001-disable-tools.patch
002-typo-in-default-option-value.patch
003-fix-find-onnx.patch
004-onednn-build.patch
005-rename-utils.patch
007-dnnl-library-rename.patch
004-compilation-with-cpp17.patch
005-tflite-search.patch
HEAD_REF master)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@ -40,10 +38,10 @@ if(ENABLE_INTEL_GPU)
vcpkg_from_github(
OUT_SOURCE_PATH DEP_SOURCE_PATH
REPO oneapi-src/oneDNN
REF f27dedbfc093f51032a4580198bb80579440dc15
SHA512 882eb42e31490df1b35b5e55bef1be8452b710b7a16f5ad648961510abd288e16dbd783e0163aab9dd161fd3a9bd836b0f4afc82b14043d80d1dad9c3400af1b
REF ec0b2ee85fc2a2dbdeec10035c5ef5813d8fb5ea
SHA512 abc09c9ab190cc043ba675fdcaf2da0069eacce14aad6e788a9957d8b6704cfcefe5a707e78d544d25acac35bc83217660ee64528150311f577d2ccbdd165de1
PATCHES 006-onednn-gpu-build.patch
)
)
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/onednn_gpu")
endif()
@ -56,11 +54,19 @@ if(ENABLE_INTEL_CPU)
vcpkg_from_github(
OUT_SOURCE_PATH DEP_SOURCE_PATH
REPO openvinotoolkit/oneDNN
REF 48bf41e04ba8cdccb1e7ad166fecfb329f5f84a1
SHA512 8a5ef1ce07545bc28328d1cfd49a8ee8f2ff13c2e393623cb842982b83963881f3d096230805d2a187100c68a2ca30c99add5a975f3f623d9f4a51517c2d585f
)
REF a1aa20ca8f19465dc2fd18389953ed83798b2fd3
SHA512 0ff5b235a6f349ad94f52a3b8282f5c825eac7275ad784986d7f533863ace7a4ed71094b9f5cac85d473d2678e197727c1cb33dee5cf75cd793ded7be58f946e
)
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/onednn")
vcpkg_from_github(
OUT_SOURCE_PATH DEP_SOURCE_PATH
REPO openvinotoolkit/mlas
REF c7c8a631315000f17c650af34431009d2f22129c
SHA512 4146598ce6b30a3eaea544d6703b949061118398e67b773aa11a3c0f3e8fbcc446d09ea893b9879f8869e977162bcada0d4895cb225cf2e2469fb71cd5942e53
)
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/mlas")
if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
# scons (python tool) is required for ARM Compute Library building
vcpkg_find_acquire_program(PYTHON3)
@ -77,7 +83,7 @@ if(ENABLE_INTEL_CPU)
REPO ARM-software/ComputeLibrary
REF v23.02.1
SHA512 ee9439e0804bacd365f079cedc548ffe2c12b0d4a86780e0783186884eb5a6d7aa7ceac11c504e242bedc55c3d026b826c90adaafbdbd3e5cfa2562a1c4ee04d
)
)
file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/ComputeLibrary")
endif()
endif()
@ -105,7 +111,6 @@ vcpkg_cmake_configure(
"-DENABLE_NCC_STYLE=OFF"
"-DENABLE_CPPLINT=OFF"
"-DENABLE_SAMPLES=OFF"
"-DENABLE_COMPILE_TOOL=OFF"
"-DENABLE_TEMPLATE=OFF"
"-DENABLE_INTEL_GNA=OFF"
"-DENABLE_PYTHON=OFF"
@ -125,7 +130,6 @@ vcpkg_install_copyright(
FILE_LIST
"${SOURCE_PATH}/LICENSE"
"${SOURCE_PATH}/licensing/third-party-programs.txt"
"${SOURCE_PATH}/licensing/tbb_third-party-programs.txt"
"${SOURCE_PATH}/licensing/onednn_third-party-programs.txt"
"${SOURCE_PATH}/licensing/runtime-third-party-programs.txt"
COMMENT

13
ports/openvino/vcpkg.json
View File

@ -1,8 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "openvino",
"version-date": "2023-06-11",
"port-version": 6,
"version": "2023.1.0",
"maintainers": "OpenVINO Developers <openvino@intel.com>",
"summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference",
"description": [
@ -16,7 +15,6 @@
"documentation": "https://docs.openvino.ai/latest/index.html",
"license": "Apache-2.0",
"dependencies": [
"ade",
{
"name": "pkgconf",
"host": true
@ -24,14 +22,7 @@
"pugixml",
{
"name": "tbb",
"default-features": false,
"features": [
{
"name": "hwloc",
"platform": "!static & !osx"
}
],
"version>=": "2021.9.0#2"
"version>=": "2021.10.0#2"
},
{
"name": "vcpkg-cmake",

4
versions/baseline.json
View File

@ -6161,8 +6161,8 @@
"port-version": 4
},
"openvino": {
"baseline": "2023-06-11",
"port-version": 6
"baseline": "2023.1.0",
"port-version": 0
},
"openvpn3": {
"baseline": "3.7.0",

5
versions/o-/openvino.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "717114b7751c8866fc2f475267dea3c04a5cedcc",
"version": "2023.1.0",
"port-version": 0
},
{
"git-tree": "ad00a0dadb3ecf1eff66f9de71017808ade00d0f",
"version-date": "2023-06-11",