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

[PyOV] Disallow Python 3.6 usage (#13240)

Browse Source 
* Remove py3.6 constraints

* Cleanup out of date python versions

* Bump pybind11 to v2.10.1 release tag

* [PyOV] Fix wheel requirements for new package versions

Co-authored-by: jiwaszki <jan.iwaszkiewicz@intel.com>
This commit is contained in:
Przemyslaw Wysocki
2022-11-06 07:45:42 +01:00
committed by GitHub
parent 03dbd8c4e7
commit 520b9ff68c
23 changed files with 34 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/github_org_control/configs.py vendored
View File

@@ -14,8 +14,8 @@ import json
from pathlib import Path
if sys.version_info[:2] < (3, 6):
raise Exception("Python version must be >= 3.6")
if sys.version_info[:2] < (3, 7):
raise Exception("Python version must be >= 3.7")
class ConfigException(Exception):

1
cmake/developer_package/ncc_naming_style/requirements_dev.txt
View File

@@ -1,4 +1,3 @@
clang==10.0.1; python_version == '3.6'
clang==11.1.0; python_version == '3.7'
clang==12.0.1; python_version == '3.8'
clang==12.0.1; python_version == '3.9'

2
docs/MO_DG/prepare_model/convert_model/tf_specific/Convert_XLNet_From_Tensorflow.md
View File

@@ -37,8 +37,6 @@ To get pb-file from the archive contents, you need to do the following.
2. Save and run the following Python script in `~/XLNet-Base/xlnet`:
> **NOTE**: The original model repository has been tested with TensorFlow 1.13.1 under Python2.
```python
from collections import namedtuple

6
docs/dev/build.md
View File

@@ -27,7 +27,7 @@ For the OpenVINO build next tools are required:
- [CMake]\* 3.14 or higher
- Microsoft\* Visual Studio 2019, version 16.8 or later
- (Optional) Intel® Graphics Driver for Windows* (30.0) [driver package](https://www.intel.com/content/www/us/en/download/19344/intel-graphics-windows-dch-drivers.html).
- Python 3.6 or higher for OpenVINO Runtime Python API
- Python 3.7 or higher for OpenVINO Runtime Python API
- [Git for Windows*](https://gitforwindows.org/)
</p>
@@ -37,7 +37,7 @@ For the OpenVINO build next tools are required:
- [CMake] 3.13 or higher
- GCC 7.5 or higher to build OpenVINO Runtime
- Python 3.6 or higher for OpenVINO Runtime Python API
- Python 3.7 or higher for OpenVINO Runtime Python API
- (Optional) [Install Intel® Graphics Compute Runtime for OpenCL™ Driver package 19.41.14441] to enable inference on Intel integrated GPUs.
<p>
@@ -55,7 +55,7 @@ For the OpenVINO build next tools are required:
% xcode-select --install
```
- The step to install python and python libraries is different depending on host architecture:
- **x86_64** Python\* 3.6 or higher for the OpenVINO Runtime Python API, Development tools (Model Optimizer, POT and others):
- **x86_64** Python\* 3.7 or higher for the OpenVINO Runtime Python API, Development tools (Model Optimizer, POT and others):
```sh
% # let's have a look what python versions are available in brew
% brew search python

3
docs/install_guides/installing-openvino-from-archive-linux.md
View File

@@ -44,8 +44,7 @@ See the [Release Notes](https://software.intel.com/en-us/articles/OpenVINO-RelNo
* `CMake 3.13 or higher, 64-bit <https://cmake.org/download/>`_
* GCC 7.5.0 (for Ubuntu 18.04) or GCC 9.3.0 (for Ubuntu 20.04)
* `Python 3.6 - 3.10, 64-bit <https://www.python.org/downloads/windows/>`_
* Note that OpenVINO is gradually stopping the support for Python 3.6. You are encouraged to use Python 3.7 - 3.10.
* `Python 3.7 - 3.9, 64-bit <https://www.python.org/downloads/windows/>`_
@endsphinxdirective

3
docs/install_guides/installing-openvino-from-archive-macos.md
View File

@@ -37,8 +37,7 @@ See the [Release Notes](https://software.intel.com/en-us/articles/OpenVINO-RelNo
.. tab:: Software Requirements
* `CMake 3.13 or higher <https://cmake.org/download/>`_ (choose "macOS 10.13 or later"). Add `/Applications/CMake.app/Contents/bin` to path (for default install).
* `Python 3.6 - 3.10 <https://www.python.org/downloads/mac-osx/>`_ (choose 3.6 - 3.10). Install and add to path.
* Note that OpenVINO is gradually phasing out the support for Python 3.6. You are encouraged to use Python 3.7 - 3.10.
* `Python 3.7 - 3.10 <https://www.python.org/downloads/mac-osx/>`_ (choose 3.7 - 3.9). Install and add to path.
* Apple Xcode Command Line Tools. In the terminal, run `xcode-select --install` from any directory
* (Optional) Apple Xcode IDE (not required for OpenVINO™, but useful for development)

3
docs/install_guides/installing-openvino-from-archive-windows.md
View File

@@ -40,8 +40,7 @@ See the [Release Notes](https://software.intel.com/en-us/articles/OpenVINO-RelNo
* `Microsoft Visual Studio 2019 with MSBuild <https://visualstudio.microsoft.com/vs/older-downloads/>`_ or `Microsoft Visual Studio 2022 <http://visualstudio.microsoft.com/downloads/>`_
* `CMake 3.14 or higher, 64-bit <https://cmake.org/download/>`_ (optional, only required for building sample applications)
* `Python 3.6 - 3.10, 64-bit <https://www.python.org/downloads/windows/>`_
* Note that OpenVINO is gradually phasing out support for Python 3.6. You are encouraged to use Python 3.7 - 3.10.
* `Python 3.7 - 3.10, 64-bit <https://www.python.org/downloads/windows/>`_
.. note::
To install Microsoft Visual Studio 2019, follow the `Microsoft Visual Studio installation guide <https://docs.microsoft.com/en-us/visualstudio/install/install-visual-studio?view=vs-2019>`_. You can choose to download the Community version. During installation in the **Workloads** tab, choose **Desktop development with C++**.

16
docs/notebooks-installation.md
View File

@@ -43,20 +43,18 @@ The table below lists the supported operating systems and Python versions.
| | (64-bit |
| | ) <https://www.python.org/>`__ |
+=====================================+================================+
| Ubuntu 18.04 LTS | 3.6, 3.7, 3.8, 3.9, 3.10 |
| Ubuntu 18.04 LTS | 3.7, 3.8, 3.9, 3.10 |
+-------------------------------------+--------------------------------+
| Ubuntu 20.04 LTS | 3.6, 3.7, 3.8, 3.9, 3.10 |
| Ubuntu 20.04 LTS | 3.7, 3.8, 3.9, 3.10 |
+-------------------------------------+--------------------------------+
| Red Hat Enterprise Linux 8 | 3.6, 3.8, 3.9, 3.10 |
| Red Hat Enterprise Linux 8 | 3.8, 3.9, 3.10 |
+-------------------------------------+--------------------------------+
| CentOS 7 | 3.6, 3.7, 3.8, 3.9, 3.10 |
| macOS 10.15.x versions | 3.7, 3.8, 3.9, 3.10 |
+-------------------------------------+--------------------------------+
| macOS 10.15.x versions | 3.6, 3.7, 3.8, 3.9, 3.10 |
+-------------------------------------+--------------------------------+
| Windows 10 Pro, Enterprise | 3.6, 3.7, 3.8, 3.9, 3.10 |
| Windows 10 Pro, Enterprise | 3.7, 3.8, 3.9, 3.10 |
| or Education editions | |
+-------------------------------------+--------------------------------+
| Windows Server 2016 or higher | 3.6, 3.7, 3.8, 3.9, 3.10 |
| Windows Server 2016 or higher | 3.7, 3.8, 3.9 |
+-------------------------------------+--------------------------------+
OpenVINO Notebooks also require Git. Follow the guide below for your
@@ -69,7 +67,7 @@ operating system or environment.
1. **Install Python**
Download 64 bit version of Python software (3.6, 3.7, 3.8, 3.9, 3.10) from `python.org`_.
Download 64 bit version of Python software (3.7, 3.8, 3.9, 3.10) from `python.org`_.
.. _python.org: https://www.python.org/downloads/windows/

2
docs/openvino_sphinx_theme/setup.py
View File

@@ -12,7 +12,7 @@ setup(
include_package_data=True,
entry_points={"sphinx.html_themes": ["openvino_sphinx_theme = openvino_sphinx_theme"]},
install_requires=['pydata_sphinx_theme', 'sphinx_inline_tabs'],
python_requires='>=3.5',
python_requires='>=3.7',
url='https://github.com/openvinotoolkit/openvino',
license='',
author='Intel Corporation',

2
scripts/setupvars/setupvars.bat
View File

@@ -62,7 +62,7 @@ set "PATH=%OPENVINO_LIB_PATHS%;%PATH%"
:: Check if Python is installed
set PYTHON_VERSION_MAJOR=3
set MIN_REQUIRED_PYTHON_VERSION_MINOR=6
set MIN_REQUIRED_PYTHON_VERSION_MINOR=7
set MAX_SUPPORTED_PYTHON_VERSION_MINOR=9
python --version 2>NUL

2
scripts/setupvars/setupvars.sh
View File

@@ -99,7 +99,7 @@ if command -v lsb_release >/dev/null 2>&1; then
fi
PYTHON_VERSION_MAJOR="3"
MIN_REQUIRED_PYTHON_VERSION_MINOR="6"
MIN_REQUIRED_PYTHON_VERSION_MINOR="7"
MAX_SUPPORTED_PYTHON_VERSION_MINOR="9"
check_python_version () {

2
src/plugins/intel_gpu/README.md
View File

@@ -41,7 +41,7 @@ The software dependencies are:
> Intel® CPU intrinsics header (`<immintrin.h>`) must be available during compilation.
- [python™](https://www.python.org/downloads/) 2.7 or later (scripts are both compatible with python™ 2.7.x and python™ 3.x)
- [python™](https://www.python.org/downloads/) 3.7 or later.
# Trademark Information

2
tools/benchmark_tool/setup.py
View File

@@ -41,5 +41,5 @@ setup(
],
packages=find_packages(),
install_requires=reqs,
python_requires='>=3.6',
python_requires='>=3.7',
)

2
tools/cross_check_tool/setup.py
View File

@@ -36,5 +36,5 @@ setup(
],
packages=find_packages(),
install_requires=read_text('requirements.txt'),
python_requires='>=3.6',
python_requires='>=3.7',
)

8
tools/deployment_manager/configs/darwin.json
View File

@@ -48,14 +48,6 @@
"runtime/lib/intel64/Release/pcie-ma2x8x.mvcmd"
]
},
"python3.6": {
"ui_name": "OpenVINO Python API for Python3.6",
"group": ["python"],
"dependencies" : ["ie_core"],
"files": [
"python/python3.6"
]
},
"python3.7": {
"ui_name": "OpenVINO Python API for Python3.7",
"group": ["python"],

8
tools/deployment_manager/configs/linux.json
View File

@@ -87,14 +87,6 @@
"runtime/3rdparty/hddl"
]
},
"python3.6": {
"ui_name": "OpenVINO Python API for Python3.6",
"group": ["python"],
"dependencies" : ["ie_core"],
"files": [
"python/python3.6"
]
},
"python3.7": {
"ui_name": "OpenVINO Python API for Python3.7",
"group": ["python"],

8
tools/deployment_manager/configs/windows.json
View File

@@ -75,14 +75,6 @@
"runtime/3rdparty/hddl"
]
},
"python3.6": {
"ui_name": "OpenVINO Python API for Python3.6",
"group": ["python"],
"dependencies" : ["ie_core"],
"files": [
"python/python3.6"
]
},
"python3.7": {
"ui_name": "OpenVINO Python API for Python3.7",
"group": ["python"],

4
tools/deployment_manager/deployment_manager.py
View File

@@ -17,8 +17,8 @@
import sys
if sys.version_info[0] < 3 or (sys.version_info[0] == 3 and sys.version_info[1] < 6):
exit("Python* 3.6 or higher is required to run the Deployment Manager.")
if sys.version_info[0] < 3 or (sys.version_info[0] == 3 and sys.version_info[1] < 7):
exit("Python* 3.7 or higher is required to run the Deployment Manager.")
if __name__ == '__main__':
from deployman.main import main

8
tools/mo/install_prerequisites/install_prerequisites.bat
View File

@@ -10,11 +10,11 @@ set ROOT_DIR=%~dp0
python --version 2>NUL
if errorlevel 1 (
echo Error^: Python is not installed. Please install Python 3.5 ^(64-bit^) or higher from https://www.python.org/downloads/
echo Error^: Python is not installed. Please install Python 3.7 ^(64-bit^) or higher from https://www.python.org/downloads/
goto error
)
:: Check if Python version is equal or higher 3.4
:: Check if Python version is equal or higher 3.7
for /F "tokens=* USEBACKQ" %%F IN (`python --version 2^>^&1`) DO (
set version=%%F
)
@@ -26,12 +26,12 @@ for /F "tokens=1,2,3 delims=. " %%a in ("%version%") do (
)
if "%Major%" geq "3" (
if "%Minor%" geq "5" (
if "%Minor%" geq "7" (
set python_ver=okay
)
)
if not "%python_ver%"=="okay" (
echo Unsupported Python version. Please install Python 3.5 ^(64-bit^) or higher from https://www.python.org/downloads/
echo Unsupported Python version. Please install Python 3.7 ^(64-bit^) or higher from https://www.python.org/downloads/
goto error
)

2
tools/mo/install_prerequisites/install_prerequisites.sh
View File

@@ -49,8 +49,6 @@ if [[ $DISTRO == "centos" ]]; then
python_binary=python3.8
elif command -v python3.7 >/dev/null 2>&1; then
python_binary=python3.7
elif command -v python3.6 >/dev/null 2>&1; then
python_binary=python3.6
fi
else
python_binary=python3

2
tools/pot/openvino/tools/pot/algorithms/quantization/optimization/algorithm.py
View File

@@ -30,7 +30,7 @@ except ImportError:
'Nevergrad package could not be imported. If you are planning to use '
'any hyperparameter optimization algo, consider installing it '
'using pip. This implies advanced usage of the tool. '
'Note that nevergrad is compatible only with Python 3.6+'
'Note that nevergrad is compatible only with Python 3.7+'
)
try:

9
tools/pot/setup.py
View File

@@ -69,8 +69,7 @@ INSTALL_REQUIRES = [
"jstyleson>=0.0.2",
"numpy>=1.16.6,<=1.23.1",
"addict>=2.4.0",
"networkx~=2.5;python_version<='3.6'",
"networkx<2.8.1;python_version>'3.6'",
"networkx<2.8.1",
"tqdm>=4.54.1",
"texttable>=1.6.3",
"pandas~=1.1.5",
@@ -85,10 +84,10 @@ DEPENDENCY_LINKS = []
python_version = sys.version_info[:2]
if python_version[0] < 3:
print('Only Python >= 3.6 is supported by POT/OV')
print('Only Python >= 3.7 is supported by POT/OV')
sys.exit(0)
elif python_version[1] < 6:
print('Only Python >= 3.6 is supported by POT/OV')
elif python_version[1] < 7:
print('Only Python >= 3.7 is supported by POT/OV')
sys.exit(0)

4
tools/pot/tests/utils/command.py
View File

@@ -22,9 +22,9 @@ class Command:
# set system/version dependent 'start_new_session' analogs
if sys.platform == 'win32':
self.kwargs.update(creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)
elif sys.version_info < (3, 2): # assume posix
elif sys.version_info < (3, 7): # assume posix
self.kwargs.update(preexec_fn=os.setsid)
else: # Python 3.2+ and Unix
else: # Python 3.7+ and Unix
self.kwargs.update(start_new_session=True)
def kill_process_tree(self, pid):