natas_hw
/
openvino
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ported fixes to 2022.3 LTS from master (#19017) 

* [PyOV] Add temporary workaround for wheel building issue (#19011)

* Add upper bound

* Minor changes

* Revert "[PyOV] Pin version of Cython for API 1.0 (#18604)" (#18681)

* Revert "[PyOV] Pin version of Cython for API 1.0 (#18604)"

This reverts commit 787796d88f.

* Suppressed clang warning

* Ability to use old API and old cmake config files (#18558)

* Update numpy version to 1.26.0

* Fix flake8 warnings and ignore VNE001 for Python samples (#18204)

* Ignore VNE001 for Python samples

* Add explanation

* Fix flake8 on wheel setup.py

* Fix onnx test reporting VNE001

---------

Co-authored-by: Przemyslaw Wysocki <przemyslaw.wysocki@intel.com>
Co-authored-by: Jan Iwaszkiewicz <jan.iwaszkiewicz@intel.com>
This commit is contained in:
Ilya Lavrenov 2023-08-08 00:02:30 +04:00 committed by GitHub
parent f74f4cea10
commit dd04073708
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/templates/InferenceEngineConfig.cmake.in
View File

@ -37,6 +37,7 @@ include(CMakeFindDependencyMacro)
find_dependency(OpenVINO
PATHS "${CMAKE_CURRENT_LIST_DIR}"
"${CMAKE_CURRENT_LIST_DIR}/../openvino${InferenceEngine_VERSION}"
NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH)

6
cmake/templates/ngraphConfig.cmake.in
View File

@ -1,5 +1,5 @@
# ******************************************************************************
# Copyright 2017-2022 Intel Corporation
# Copyright 2017-2023 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -15,7 +15,7 @@
# ******************************************************************************
#
#
# FindNGraph
# ngraph config file
# ------
#
# This script defines the following variables and imported targets:
@ -44,7 +44,7 @@ include(CMakeFindDependencyMacro)
find_dependency(OpenVINO
PATHS "${CMAKE_CURRENT_LIST_DIR}"
"${CMAKE_CURRENT_LIST_DIR}/ngraph"
"${CMAKE_CURRENT_LIST_DIR}/../openvino${ngraph_VERSION}"
NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH)

3
samples/python/setup.cfg
View File

@ -3,9 +3,10 @@
# D100 - Missing docstring in public module
# D101 - Missing docstring in public class
# D103 - Missing docstring in public function
# VNE001 - Single letter variable names are not allowed
filename = *.py
max-line-length = 160
ignore = E203,D100,D101,D103
ignore = E203,D100,D101,D103,VNE001
max-parameters-amount = 8
show_source = True
docstring-convention = google

3
src/bindings/c/src/CMakeLists.txt
View File

@ -45,7 +45,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
ARCHIVE DESTINATION ${OV_CPACK_ARCHIVEDIR} COMPONENT ${OV_CPACK_COMP_CORE_C}
LIBRARY DESTINATION ${OV_CPACK_LIBRARYDIR} COMPONENT ${OV_CPACK_COMP_CORE_C}
NAMELINK_COMPONENT ${OV_CPACK_COMP_CORE_C_DEV}
INCLUDES DESTINATION ${OV_CPACK_INCLUDEDIR})
INCLUDES DESTINATION ${OV_CPACK_INCLUDEDIR}
${OV_CPACK_INCLUDEDIR}/ie)
install(DIRECTORY ${OpenVINO_C_API_SOURCE_DIR}/include/c_api
DESTINATION ${OV_CPACK_INCLUDEDIR}/ie

2
src/bindings/python/requirements_test.txt
View File

@ -35,5 +35,5 @@ radon
retrying
tox
types-pkg_resources
wheel>=0.38.1
wheel>=0.38.1,<=0.41.0
protobuf~=3.18.1

6
src/bindings/python/src/compatibility/openvino/inference_engine/CMakeLists.txt
View File

@ -21,9 +21,13 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# 'argument': conversion from 'size_t' to 'int', possible loss of data
ie_add_compiler_flags(/wd4267)
ie_add_compiler_flags(/wd4244)
ie_add_compiler_flags(/wd4551)
endif()
if (OV_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCXX)
if(OV_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCXX)
ie_add_compiler_flags(-Wno-undef)
if(OV_COMPILER_IS_CLANG)
ie_add_compiler_flags(-Wno-parentheses-equality)
endif()
endif()
if(UNUSED_BUT_SET_VARIABLE_SUPPORTED)
ie_add_compiler_flags(-Wno-unused-but-set-variable)

3
src/bindings/python/src/compatibility/openvino/requirements-dev.txt
View File

@ -4,4 +4,5 @@ pytest==7.2.0; python_version >= '3.10'
py>=1.9.0
attrs==22.1.0
pytest-html==1.19.0
cython>=0.29.32
cython>=0.29.32
g

2
src/bindings/python/tests/test_onnx/test_ops_reshape.py
View File

@ -369,7 +369,7 @@ def test_split_1d():
def test_depth_to_space():
b, c, h, w = shape = (2, 8, 3, 3)
b, c, h, w = shape = (2, 8, 3, 3) # noqa: VNE001
blocksize = 2
data = np.random.random_sample(shape).astype(np.float32)
tmp = np.reshape(data, [b, blocksize, blocksize, c // (blocksize ** 2), h, w])

2
src/bindings/python/wheel/requirements-dev.txt
View File

@ -1,3 +1,3 @@
setuptools>=65.6.1
wheel>=0.38.1
wheel>=0.38.1,<=0.41.0
patchelf<=0.17.2.1; sys_platform == 'linux' and platform_machine == 'x86_64'

2
src/frontends/paddle/tests/requirements.txt
View File

@ -1,6 +1,6 @@
# PaddlePaddle - generate test models
paddlepaddle==2.4.1
gast==0.3.3
numpy>=1.16.6,<1.25.0
numpy>=1.16.6,<1.26.0
six~=1.15.0
protobuf>=3.18.1,<4.0.0

2
src/frontends/tensorflow/tests/requirements.txt
View File

@ -1,2 +1,2 @@
numpy>=1.16.6,<1.25.0
numpy>=1.16.6,<1.26.0
tensorflow>=1.15.5,<=2.10.0

2
src/plugins/intel_cpu/tools/dump_check/requirements.txt
View File

@ -1,4 +1,4 @@
numpy>=1.16.6,<1.25.0
numpy>=1.16.6,<1.26.0
argparse
matplotlib~=3.3.4; python_version<'3.7'
matplotlib>=3.3.4, <3.6; python_version>='3.7'

2
tools/benchmark_tool/requirements.txt
View File

@ -1,2 +1,2 @@
numpy>=1.16.6,<1.25.0
numpy>=1.16.6,<1.26.0
opencv-python>=4.5

2
tools/cross_check_tool/requirements.txt
View File

@ -1,2 +1,2 @@
numpy>=1.16.6,<1.25.0
numpy>=1.16.6,<1.26.0
opencv-python==4.5.*

2
tools/mo/requirements.txt
View File

@ -1,4 +1,4 @@
numpy>=1.16.6,<1.25.0
numpy>=1.16.6,<1.26.0
tensorflow>=1.15.5,<=2.10.0
mxnet~=1.2.0; sys_platform == 'win32'
mxnet>=1.7.0.post2,<=1.9.1; sys_platform != 'win32'

2
tools/mo/requirements_caffe.txt
View File

@ -1,6 +1,6 @@
networkx~=2.5; python_version <= "3.6"
networkx<=2.8.8; python_version > "3.6"
numpy>=1.16.6,<1.25.0
numpy>=1.16.6,<1.26.0
protobuf>=3.18.1,<4.0.0
defusedxml>=0.7.1
requests>=2.25.1

2
tools/mo/requirements_kaldi.txt
View File

@ -1,6 +1,6 @@
networkx~=2.5; python_version <= "3.6"
networkx<=2.8.8; python_version > "3.6"
numpy>=1.16.6,<1.25.0
numpy>=1.16.6,<1.26.0
defusedxml>=0.7.1
requests>=2.25.1
fastjsonschema~=2.15.1

2
tools/mo/requirements_mxnet.txt
View File

@ -2,7 +2,7 @@ mxnet~=1.2.0; sys_platform == 'win32'
mxnet>=1.7.0.post2,<=1.9.1; sys_platform != 'win32'
networkx~=2.5; python_version <= "3.6"
networkx<=2.8.8; python_version > "3.6"
numpy>=1.16.6,<1.25.0
numpy>=1.16.6,<1.24.0
defusedxml>=0.7.1
urllib3>=1.26.4
requests>=2.25.1

2
tools/mo/requirements_onnx.txt
View File

@ -1,7 +1,7 @@
onnx>=1.8.1,<=1.12
networkx~=2.5; python_version <= "3.6"
networkx<=2.8.8; python_version > "3.6"
numpy>=1.16.6,<1.25.0
numpy>=1.16.6,<1.26.0
defusedxml>=0.7.1
requests>=2.25.1
fastjsonschema~=2.15.1

2
tools/mo/requirements_tf.txt
View File

@ -1,4 +1,4 @@
numpy>=1.16.6,<1.25.0
numpy>=1.16.6,<1.26.0
tensorflow>=1.15.5,<=2.10.0
networkx~=2.5; python_version <= "3.6"
networkx<=2.8.8; python_version > "3.6"

2
tools/mo/requirements_tf2.txt
View File

@ -1,4 +1,4 @@
numpy>=1.16.6,<1.25.0
numpy>=1.16.6,<1.26.0
tensorflow>=2.5,<=2.10.0
networkx~=2.5; python_version <= "3.6"
networkx<=2.8.8; python_version > "3.6"

2
tools/pot/setup.py
View File

@ -68,7 +68,7 @@ INSTALL_REQUIRES = [
"scipy~=1.7; python_version == '3.7'",
"scipy>=1.8; python_version >= '3.8'",
"jstyleson>=0.0.2",
"numpy>=1.16.6,<1.25.0",
"numpy>=1.16.6,<1.26.0",
"addict>=2.4.0",
"networkx<=2.8.8",
"tqdm>=4.54.1",