Accepting request 1235692 from science:machinelearning

OBS-URL: https://build.opensuse.org/request/show/1235692
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openvino?expand=0&rev=8
This commit is contained in:
2025-01-09 14:06:03 +00:00
committed by Git OBS Bridge
9 changed files with 113 additions and 71 deletions

View File

@@ -2,8 +2,8 @@
<service name="obs_scm" mode="manual">
<param name="url">https://github.com/openvinotoolkit/openvino.git</param>
<param name="scm">git</param>
<param name="revision">2024.4.0</param>
<param name="version">2024.4.0</param>
<param name="revision">2024.6.0</param>
<param name="version">2024.6.0</param>
<param name="submodules">enable</param>
<param name="filename">openvino</param>
<param name="exclude">.git</param>

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fde6d7a29c8284b72866b02b37f6eaff9143f4a3b05f48a098d4965cc53c9248
size 1102958095

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bf888744a675256fd9afab53a2e9ba738ccd08d1c5153bbbe3ec26385ff9111e
size 1150310927

View File

@@ -1,8 +1,7 @@
Index: openvino-2024.0.0/cmake/developer_package/packaging/archive.cmake
===================================================================
--- openvino-2024.0.0.orig/cmake/developer_package/packaging/archive.cmake
+++ openvino-2024.0.0/cmake/developer_package/packaging/archive.cmake
@@ -21,15 +21,19 @@ endif()
diff -uNr openvino-2024.6.0.orig/cmake/developer_package/packaging/archive.cmake openvino-2024.6.0/cmake/developer_package/packaging/archive.cmake
--- openvino-2024.6.0.orig/cmake/developer_package/packaging/archive.cmake 2024-12-27 17:04:54.520685198 -0300
+++ openvino-2024.6.0/cmake/developer_package/packaging/archive.cmake 2024-12-27 17:02:57.644273948 -0300
@@ -25,14 +25,18 @@
macro(ov_archive_cpack_set_dirs)
# common "archive" package locations
# TODO: move current variables to OpenVINO specific locations
@@ -11,8 +10,7 @@ Index: openvino-2024.0.0/cmake/developer_package/packaging/archive.cmake
- set(OV_CPACK_DOCDIR docs)
- set(OV_CPACK_LICENSESDIR licenses)
- set(OV_CPACK_SAMPLESDIR samples)
- set(OV_CPACK_WHEELSDIR tools)
- set(OV_CPACK_TOOLSDIR tools)
- set(OV_CPACK_WHEELSDIR wheels)
- set(OV_CPACK_DEVREQDIR tools)
- set(OV_CPACK_PYTHONDIR python)
+ set(OV_CPACK_INCLUDEDIR include)
@@ -24,14 +22,13 @@ Index: openvino-2024.0.0/cmake/developer_package/packaging/archive.cmake
+ find_package(Python3 QUIET COMPONENTS Interpreter)
+ file(RELATIVE_PATH OV_PYTHON_MODPATH ${CMAKE_INSTALL_PREFIX} ${Python3_SITEARCH})
+ set(OV_CPACK_WHEELSDIR tools)
+ set(OV_CPACK_TOOLSDIR tools)
+ set(OV_CPACK_DEVREQDIR tools)
+ set(OV_CPACK_PYTHONDIR ${OV_PYTHON_MODPATH})
+ endif()
if(USE_BUILD_TYPE_SUBFOLDER)
set(build_type ${CMAKE_BUILD_TYPE})
@@ -46,11 +50,11 @@ macro(ov_archive_cpack_set_dirs)
@@ -49,11 +53,12 @@
set(OV_CPACK_RUNTIMEDIR runtime/lib/${ARCH_FOLDER}/${build_type})
set(OV_CPACK_ARCHIVEDIR runtime/lib/${ARCH_FOLDER}/${build_type})
else()
@@ -44,14 +41,14 @@ Index: openvino-2024.0.0/cmake/developer_package/packaging/archive.cmake
endif()
- set(OV_CPACK_PLUGINSDIR ${OV_CPACK_RUNTIMEDIR})
+ set(OV_CPACK_PLUGINSDIR ${OV_CPACK_RUNTIMEDIR}/${PROJECT_NAME})
+
endmacro()
ov_archive_cpack_set_dirs()
Index: openvino-2024.0.0/src/cmake/openvino.cmake
===================================================================
--- openvino-2024.0.0.orig/src/cmake/openvino.cmake
+++ openvino-2024.0.0/src/cmake/openvino.cmake
@@ -254,6 +254,7 @@ if(ENABLE_PKGCONFIG_GEN)
diff -uNr openvino-2024.6.0.orig/src/cmake/openvino.cmake openvino-2024.6.0/src/cmake/openvino.cmake
--- openvino-2024.6.0.orig/src/cmake/openvino.cmake 2024-12-27 17:04:55.240687724 -0300
+++ openvino-2024.6.0/src/cmake/openvino.cmake 2024-12-27 17:03:50.176459053 -0300
@@ -267,6 +267,7 @@
# define relative paths
file(RELATIVE_PATH PKGCONFIG_OpenVINO_PREFIX "/${OV_CPACK_RUNTIMEDIR}/pkgconfig" "/")
@@ -59,3 +56,32 @@ Index: openvino-2024.0.0/src/cmake/openvino.cmake
set(pkgconfig_in "${OpenVINO_SOURCE_DIR}/cmake/templates/openvino.pc.in")
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.20 AND OV_GENERATOR_MULTI_CONFIG)
diff -uNr openvino-2024.6.0.orig/src/plugins/intel_npu/tools/compile_tool/cmake/standalone.cmake openvino-2024.6.0/src/plugins/intel_npu/tools/compile_tool/cmake/standalone.cmake
--- openvino-2024.6.0.orig/src/plugins/intel_npu/tools/compile_tool/cmake/standalone.cmake 2024-12-27 17:04:56.868693438 -0300
+++ openvino-2024.6.0/src/plugins/intel_npu/tools/compile_tool/cmake/standalone.cmake 2024-12-28 00:55:18.661614722 -0300
@@ -43,5 +43,5 @@
endif()
install(TARGETS ${TARGET_NAME}
- DESTINATION "tools/${TARGET_NAME}"
+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/tools/${TARGET_NAME}"
COMPONENT npu_tools)
diff -uNr openvino-2024.6.0.orig/src/plugins/intel_npu/tools/compile_tool/CMakeLists.txt openvino-2024.6.0/src/plugins/intel_npu/tools/compile_tool/CMakeLists.txt
--- openvino-2024.6.0.orig/src/plugins/intel_npu/tools/compile_tool/CMakeLists.txt 2024-12-27 17:04:56.868693438 -0300
+++ openvino-2024.6.0/src/plugins/intel_npu/tools/compile_tool/CMakeLists.txt 2024-12-28 02:18:52.768816190 -0300
@@ -41,13 +41,13 @@
#
install(TARGETS ${TARGET_NAME}
- RUNTIME DESTINATION "tools/${TARGET_NAME}"
+ RUNTIME DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/tools/${TARGET_NAME}"
COMPONENT ${NPU_INTERNAL_COMPONENT}
${OV_CPACK_COMP_NPU_INTERNAL_EXCLUDE_ALL})
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
- DESTINATION "tools/${TARGET_NAME}"
+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/tools/${TARGET_NAME}"
COMPONENT ${NPU_INTERNAL_COMPONENT}
${OV_CPACK_COMP_NPU_INTERNAL_EXCLUDE_ALL})
endif()

View File

@@ -1,12 +0,0 @@
Index: openvino-2024.0.0/thirdparty/dependencies.cmake
===================================================================
--- openvino-2024.0.0.orig/thirdparty/dependencies.cmake
+++ openvino-2024.0.0/thirdparty/dependencies.cmake
@@ -482,6 +482,7 @@ if(ENABLE_OV_ONNX_FRONTEND)
if(ONNX_FOUND)
# conan and vcpkg create imported targets 'onnx' and 'onnx_proto'
+ add_compile_definitions(ONNX_ML=1)
else()
add_subdirectory(thirdparty/onnx)
endif()

View File

@@ -1,28 +0,0 @@
diff -uNr openvino.orig/src/plugins/intel_npu/tools/CMakeLists.txt openvino/src/plugins/intel_npu/tools/CMakeLists.txt
--- openvino.orig/src/plugins/intel_npu/tools/CMakeLists.txt 2024-08-02 23:32:03.216982353 -0300
+++ openvino/src/plugins/intel_npu/tools/CMakeLists.txt 2024-08-04 17:22:22.899469769 -0300
@@ -4,5 +4,4 @@
#
add_subdirectory(common)
-add_subdirectory(compile_tool)
add_subdirectory(single-image-test)
diff -uNr openvino.orig/src/plugins/intel_npu/tools/compile_tool/CMakeLists.txt openvino/src/plugins/intel_npu/tools/compile_tool/CMakeLists.txt
--- openvino.orig/src/plugins/intel_npu/tools/compile_tool/CMakeLists.txt 2024-08-02 23:32:03.216982353 -0300
+++ openvino/src/plugins/intel_npu/tools/compile_tool/CMakeLists.txt 2024-08-03 02:36:25.059440300 -0300
@@ -44,13 +44,13 @@
#
install(TARGETS ${TARGET_NAME}
- RUNTIME DESTINATION "tools/${TARGET_NAME}"
+ RUNTIME DESTINATION "share/OpenVINO/tools/${TARGET_NAME}"
COMPONENT ${NPU_INTERNAL_COMPONENT}
${OV_CPACK_COMP_NPU_INTERNAL_EXCLUDE_ALL})
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
- DESTINATION "tools/${TARGET_NAME}"
+ DESTINATION "share/OpenVINO/tools/${TARGET_NAME}"
COMPONENT ${NPU_INTERNAL_COMPONENT}
${OV_CPACK_COMP_NPU_INTERNAL_EXCLUDE_ALL})
endif()

View File

@@ -1,3 +1,62 @@
-------------------------------------------------------------------
Sun Dec 29 03:41:47 UTC 2024 - Alessandro de Oliveira Faria <cabelo@opensuse.org>
- openvino-onnx-ml-defines.patch and
openvino-remove-npu-compile-tool.patchhas been removed
as it is no longer needed in this version.
- Update to 2024.4.0
- Summary of major features and improvements
* OpenVINO 2024.6 release includes updates for enhanced
stability and improved LLM performance.
* Introduced support for Intel® Arc™ B-Series Graphics
(formerly known as Battlemage).
* Implemented optimizations to improve the inference time and
LLM performance on NPUs.
* Improved LLM performance with GenAI API optimizations and
bug fixes.
- Support Change and Deprecation Notices
* Using deprecated features and components is not advised. They
are available to enable a smooth transition to new solutions
and will be discontinued in the future. To keep using
discontinued features, you will have to revert to the last
LTS OpenVINO version supporting them. For more details, refer
to the OpenVINO Legacy Features and Components page.
* Discontinued in 2024.0:
+ Runtime components:
- Intel® Gaussian & Neural Accelerator (Intel®GNA)..
Consider using the Neural Processing Unit (NPU) for
low-powered systems like Intel® Core™ Ultra or 14th
generation and beyond.
- OpenVINO C++/C/Python 1.0 APIs (see 2023.3 API transition
guide for reference).
- All ONNX Frontend legacy API (known as ONNX_IMPORTER_API)
- 'PerfomanceMode.UNDEFINED' property as part of the
OpenVINO Python API
+ Tools:
- Deployment Manager. See installation and deployment
guides for current distribution options.
- Accuracy Checker.
- Post-Training Optimization Tool (POT).Neural Network
Compression Framework (NNCF) should be used instead.
- A Git patchfor NNCF integration with
huggingface/transformers. The recommended approachis
to usehuggingface/optimum-intelfor applying NNCF
optimization on top of models from Hugging Face.
- Support for Apache MXNet, Caffe, and Kaldi model formats.
Conversion to ONNX may be used as a solution.
* Deprecated and to be removed in the future:
+ The macOS x86_64 debug bins will no longer be provided
with the OpenVINO toolkit, starting with OpenVINO 2024.5.
+ Python 3.8 is no longer supported, starting with
OpenVINO 2024.5.
+ As MxNet doesnt support Python version higher than 3.8,
according to the MxNet PyPI project, it is no longer
supported by OpenVINO, either.
+ Discrete Keem Bay support is no longer supported, starting
with OpenVINO 2024.5.
+ Support for discrete devices (formerly codenamed Raptor
Lake) is no longer available for NPU.
-------------------------------------------------------------------
Tue Dec 10 15:50:41 UTC 2024 - Giacomo Comes <gcomes.obs@gmail.com>

View File

@@ -1,4 +1,4 @@
name: openvino
version: 2024.4.0
mtime: 1725541792
commit: c3152d32c9c7df71397e5a3aba1d935c49eec598
version: 2024.6.0
mtime: 1734008710
commit: 4c0f47d233538e67a8eb4414c85617e85be55fc4

View File

@@ -31,13 +31,13 @@
%define pythons python3
%endif
%define __builder ninja
%define so_ver 2440
%define so_ver 2460
%define shlib lib%{name}%{so_ver}
%define shlib_c lib%{name}_c%{so_ver}
%define prj_name OpenVINO
Name: openvino
Version: 2024.4.0
Version: 2024.6.0
Release: 0
Summary: A toolkit for optimizing and deploying AI inference
# Let's be safe and put all third party licenses here, no matter that we use specific thirdparty libs or not
@@ -45,16 +45,12 @@ License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND HPND AND JSON A
URL: https://github.com/openvinotoolkit/openvino
Source0: %{name}-%{version}.tar.zst
Source1: %{name}-rpmlintrc
# PATCH-FEATURE-OPENSUSE openvino-onnx-ml-defines.patch badshah400@gmail.com -- Define ONNX_ML at compile time when using system onnx to allow using 'onnx-ml.pb.h' instead of 'onnx.pb.h', the latter not being shipped with openSUSE's onnx-devel package
Patch0: openvino-onnx-ml-defines.patch
# PATCH-FEATURE-OPENSUSE openvino-fix-install-paths.patch badshah400@gmail.com -- Fix installation paths hardcoded into upstream defined cmake macros
Patch2: openvino-fix-install-paths.patch
Patch0: openvino-fix-install-paths.patch
# PATCH-FIX-UPSTREAM openvino-ComputeLibrary-include-string.patch badshah400@gmail.com -- Include header for std::string
Patch3: openvino-ComputeLibrary-include-string.patch
Patch1: openvino-ComputeLibrary-include-string.patch
# PATCH-FIX-UPSTREAM openvino-fix-build-sample-path.patch cabelo@opensuse.org -- Fix sample source path in build script
Patch4: openvino-fix-build-sample-path.patch
# PATCH-FIX-UPSTREAM openvino-remove-npu-compile-tool.patch cabelo@opensuse.org -- Remove NPU Compile Tool
Patch5: openvino-remove-npu-compile-tool.patch
Patch2: openvino-fix-build-sample-path.patch
BuildRequires: ade-devel
BuildRequires: cmake
@@ -423,6 +419,7 @@ rm -fr %{buildroot}%{_datadir}/licenses/*
%files -n %{name}-sample
%license LICENSE
%{_datadir}/%{prj_name}/
%exclude %{_prefix}/lib/debug/usr/share/OpenVINO/tools/compile_tool/
%files -n %{name}-devel
%license LICENSE