Skip to content

Commit

Permalink
remove python3.8 compatibility support (#2413)
Browse files Browse the repository at this point in the history
  • Loading branch information
eaidova authored Sep 25, 2024
1 parent 3e0b5bb commit 9d0ef18
Show file tree
Hide file tree
Showing 28 changed files with 560 additions and 141 deletions.
2 changes: 0 additions & 2 deletions .ci/skipped_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,5 @@
- cpu
- notebook: notebooks/stable-fast-3d/stable-fast-3d.ipynb
skips:
- python:
- '3.8'
- os:
- macos-12
31 changes: 1 addition & 30 deletions .ci/skipped_notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,6 @@
- ubuntu-20.04
- ubuntu-22.04
- windows-2019
- python:
- '3.8'
- notebook: notebooks/kosmos2-multimodal-large-language-model/kosmos2-multimodal-large-language-model.ipynb
skips:
- os:
Expand Down Expand Up @@ -491,14 +489,6 @@
skips:
- os:
- windows-2019
- notebook: notebooks/surya-line-level-text-detection/surya-line-level-text-detection.ipynb
skips:
- python:
- '3.8'
- notebook: notebooks/speechbrain-emotion-recognition/speechbrain-emotion-recognition.ipynb
skips:
- python:
- '3.8'
- notebook: notebooks/s3d-mil-nce-text-to-video-retrieval/s3d-mil-nce-text-to-video-retrieval.ipynb
skips:
- device:
Expand All @@ -515,17 +505,14 @@
- notebook: notebooks/explainable-ai-1-basic/explainable-ai-1-basic.ipynb
skips:
- python:
- '3.8'
- '3.9'
- notebook: notebooks/explainable-ai-2-deep-dive/explainable-ai-2-deep-dive.ipynb
skips:
- python:
- '3.8'
- '3.9'
- notebook: notebooks/explainable-ai-3-map-interpretation/explainable-ai-3-map-interpretation.ipynb
skips:
- python:
- '3.8'
- '3.9'
- notebook: notebooks/minicpm-v-multimodal-chatbot/minicpm-v-multimodal-chatbot.ipynb
skips:
Expand All @@ -536,21 +523,13 @@
- windows-2019
- notebook: notebooks/stable-audio/stable-audio.ipynb
skips:
- python:
- '3.8'
- os:
- macos-12
- ubuntu-20.04
- ubuntu-22.04
- windows-2019
- notebook: notebooks/triposr-3d-reconstruction/triposr-3d-reconstruction.ipynb
skips:
- python:
- '3.8'
- notebook: notebooks/llm-agent-react/llm-agent-rag-llamaindex.ipynb
skips:
- python:
- '3.8'
- os:
- macos-12
- notebook: notebooks/phi-3-vision/phi-3-vision.ipynb
Expand Down Expand Up @@ -583,8 +562,6 @@
- windows-2019
- notebook: notebooks/stable-fast-3d/stable-fast-3d.ipynb
skips:
- python:
- '3.8'
- os:
- macos-12
- notebook: notebooks/mllama-3.2/mllama-3.2.ipynb
Expand All @@ -593,23 +570,17 @@
- macos-12
- ubuntu-20.04
- ubuntu-22.04
- windows-2019
- notebook: notebooks/llm-agent-react/llm-agent-react-langchain.ipynb
skips:
- python:
- '3.8'
- windows-2019'
- notebook: notebooks/segment-anything/segment-anything-2-image.ipynb
skips:
- python:
- '3.8'
- '3.9'
- os:
- macos-12
- windows-2019
- notebook: notebooks/segment-anything/segment-anything-2-video.ipynb
skips:
- python:
- '3.8'
- '3.9'
- os:
- macos-12
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codecheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ jobs:
- name: Set up Python
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
with:
python-version: 3.8 # change cachepip step when changing this
python-version: "3.10" # change cachepip step when changing this
- name: Cache OpenVINO Pip Packages
id: cachepip
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
with:
path: |
pipcache
key: ${{ env.PIP_CACHE_KEY }}-ubuntu-20.04-3.8
key: ${{ env.PIP_CACHE_KEY }}-ubuntu-20.04-3.10
- name: Cache openvino packages
if: steps.cachepip.outputs.cache-hit != 'true'
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
with:
python-version: '3.8'
python-version: '3.9'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/convert_notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
# Matrix is unnecessary here, but this allows easy copying of steps from treon.yml
matrix:
os: [ubuntu-22.04]
python: [3.8]
python: [3.9]

runs-on: ${{ matrix.os }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/install_requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04, ubuntu-22.04, windows-2019, windows-2022, macos-11, macos-12]
python: ['3.8', '3.9', '3.10', '3.11']
python: ['3.9', '3.10', '3.11']
steps:
- name: Checkout repository
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/install_requirements_china.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04]
python: [3.8]
python: [3.9]

runs-on: ${{ matrix.os }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pip_conflicts_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
with:
python-version: 3.8 # change cachepip step when changing this
python-version: 3.9 # change cachepip step when changing this

- name: Install dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/spellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ jobs:
- name: Set up Python
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
with:
python-version: 3.8 # change cachepip step when changing this
python-version: 3.9 # change cachepip step when changing this

- name: Cache OpenVINO Pip Packages
id: cachepip
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
with:
path: |
pipcache
key: ${{ env.PIP_CACHE_KEY }}-ubuntu-20.04-3.8
key: ${{ env.PIP_CACHE_KEY }}-ubuntu-20.04-3.9

- name: Install dependencies
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/treon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
runs_on: [ubuntu-20.04, ubuntu-22.04, windows-2019, macos-12]
python: ['3.8', '3.9', '3.10', '3.11']
python: ['3.9', '3.10', '3.11']
uses: ./.github/workflows/build_treon_reusable.yml
with:
runs_on: ${{ matrix.runs_on }}
Expand All @@ -37,7 +37,7 @@ jobs:
fail-fast: false
matrix:
runs_on: ['gpu']
python: ['3.8', '3.9', '3.10', '3.11']
python: ['3.9', '3.10', '3.11']
container: ['ubuntu:20.04', 'ubuntu:22.04'] # Windows and macOS are not available in machine pool with GPU
uses: ./.github/workflows/build_treon_reusable.yml
with:
Expand All @@ -55,7 +55,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
with:
python-version: '3.8'
python-version: '3.9'
- name: Collect artifacts with reports
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/treon_precommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
fail-fast: true
matrix:
runs_on: [ubuntu-20.04, windows-2019, macos-12]
python: ['3.8', '3.9', '3.10', '3.11']
python: ['3.9', '3.10', '3.11']
uses: ./.github/workflows/build_treon_reusable.yml
with:
runs_on: ${{ matrix.runs_on }}
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ To do this, there are a few requirements that all notebooks need to pass.

1. The notebooks work on Windows, macOS and Linux (see [supported operating
systems](https://github.com/openvinotoolkit/openvino_notebooks#%EF%B8%8F-system-requirements))
with Python 3.8, 3.9, 3.10 and 3.11.
with Python 3.9, 3.10 and 3.11.
2. As a rule, the notebooks do not require installation of additional software that is not installable by
`pip`. We do not assume that users have installed XCode Developer Tools, Visual C++ redistributable,
`cmake`, etc. Please discuss if your notebook does need C++ - there are exceptions to this rule.
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ The notebooks run almost anywhere — your laptop, a cloud VM, or even a Doc

| Supported Operating System | [Python Version (64-bit)](https://www.python.org/) |
| :--------------------------------------------------------- |:---------------------------------------------------|
| Ubuntu 20.04 LTS, 64-bit | 3.8 - 3.11 |
| Ubuntu 22.04 LTS, 64-bit | 3.8 - 3.11 |
| Red Hat Enterprise Linux 8, 64-bit | 3.8 - 3.11 |
| CentOS 7, 64-bit | 3.8 - 3.11 |
| macOS 10.15.x versions or higher | 3.8 - 3.11 |
| Windows 10, 64-bit Pro, Enterprise or Education editions | 3.8 - 3.11 |
| Windows Server 2016 or higher | 3.8 - 3.11 |
| Ubuntu 20.04 LTS, 64-bit | 3.9 - 3.11 |
| Ubuntu 22.04 LTS, 64-bit | 3.9 - 3.11 |
| Red Hat Enterprise Linux 8, 64-bit | 3.9 - 3.11 |
| CentOS 7, 64-bit | 3.9 - 3.11 |
| macOS 10.15.x versions or higher | 3.9 - 3.11 |
| Windows 10, 64-bit Pro, Enterprise or Education editions | 3.9 - 3.11 |
| Windows Server 2016 or higher | 3.9 - 3.11 |

[![-----------------------------------------------------](https://user-images.githubusercontent.com/10940214/155750931-fc094349-b6ec-4e1f-9f9a-113e67941119.jpg)](#)
<div id='-run-the-notebooks'></div>
Expand Down
14 changes: 7 additions & 7 deletions README_cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ OpenVINO™ Notebooks需要预装Python和Git, 针对不同操作系统的安

| 支持的操作系统 | [Python Version (64-bit)](https://www.python.org/) |
| :--------------------------------------------------------- |:---------------------------------------------------|
| Ubuntu 20.04 LTS, 64-bit | 3.8 - 3.11 |
| Ubuntu 22.04 LTS, 64-bit | 3.8 - 3.11 |
| Red Hat Enterprise Linux 8, 64-bit | 3.8 - 3.11 |
| CentOS 7, 64-bit | 3.8 - 3.11 |
| macOS 10.15.x versions or higher | 3.8 - 3.11 |
| Windows 10, 64-bit Pro, Enterprise or Education editions | 3.8 - 3.11 |
| Windows Server 2016 or higher | 3.8 - 3.11 |
| Ubuntu 20.04 LTS, 64-bit | 3.9 - 3.11 |
| Ubuntu 22.04 LTS, 64-bit | 3.9 - 3.11 |
| Red Hat Enterprise Linux 8, 64-bit | 3.9 - 3.11 |
| CentOS 7, 64-bit | 3.9 - 3.11 |
| macOS 10.15.x versions or higher | 3.9 - 3.11 |
| Windows 10, 64-bit Pro, Enterprise or Education editions | 3.9 - 3.11 |
| Windows Server 2016 or higher | 3.9 - 3.11 |


[![-----------------------------------------------------](https://user-images.githubusercontent.com/10940214/155750931-fc094349-b6ec-4e1f-9f9a-113e67941119.jpg)](#)
Expand Down
2 changes: 1 addition & 1 deletion check_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def kernel_check():
print(
"If you have multiple Python version installed, use the full path to the Python\n"
"executable for creating the virtual environment with a specific Python version.\n"
"For example: `/usr/bin/python3.8 -m venv openvino_env`. Once you have activated\n"
"For example: `/usr/bin/python3.10 -m venv openvino_env`. Once you have activated\n"
"the virtual environment you can type just `python` again.\n"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,8 @@
"import platform\n",
"\n",
"%pip install -q \"tensorflow-macos>=2.5; sys_platform == 'darwin' and platform_machine == 'arm64' and python_version > '3.8'\" # macOS M1 and M2\n",
"%pip install -q \"tensorflow-macos>=2.5,<=2.12.0; sys_platform == 'darwin' and platform_machine == 'arm64' and python_version <= '3.8'\" # macOS M1 and M2\n",
"%pip install -q \"tensorflow>=2.5; sys_platform == 'darwin' and platform_machine != 'arm64' and python_version > '3.8'\" # macOS x86\n",
"%pip install -q \"tensorflow>=2.5,<=2.12.0; sys_platform == 'darwin' and platform_machine != 'arm64' and python_version <= '3.8'\" # macOS x86\n",
"%pip install -q \"tensorflow>=2.5; sys_platform != 'darwin' and python_version > '3.8'\"\n",
"%pip install -q \"tensorflow>=2.5,<=2.12.0; sys_platform != 'darwin' and python_version <= '3.8'\"\n",
"\n",
"%pip install -q \"openvino>=2024.0.0\" \"nncf>=2.7.0\" \"tensorflow-hub>=0.15.0\" tf_keras\n",
"%pip install -q \"scikit-learn>=1.3.2\"\n",
Expand Down
5 changes: 1 addition & 4 deletions notebooks/gpu-device/gpu-device.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,8 @@
"source": [
"%pip install -q \"openvino-dev>=2024.0.0\" \"opencv-python\" \"tqdm\"\n",
"%pip install -q \"tensorflow-macos>=2.5; sys_platform == 'darwin' and platform_machine == 'arm64' and python_version > '3.8'\" # macOS M1 and M2\n",
"%pip install -q \"tensorflow-macos>=2.5,<=2.12.0; sys_platform == 'darwin' and platform_machine == 'arm64' and python_version <= '3.8'\" # macOS M1 and M2\n",
"%pip install -q \"tensorflow>=2.5; sys_platform == 'darwin' and platform_machine != 'arm64' and python_version > '3.8'\" # macOS x86\n",
"%pip install -q \"tensorflow>=2.5,<=2.12.0; sys_platform == 'darwin' and platform_machine != 'arm64' and python_version <= '3.8'\" # macOS x86\n",
"%pip install -q \"tensorflow>=2.5; sys_platform != 'darwin' and python_version > '3.8'\"\n",
"%pip install -q \"tensorflow>=2.5,<=2.12.0; sys_platform != 'darwin' and python_version <= '3.8'\""
"%pip install -q \"tensorflow>=2.5; sys_platform != 'darwin' and python_version > '3.8'\""
]
},
{
Expand Down
3 changes: 0 additions & 3 deletions notebooks/optimize-preprocessing/optimize-preprocessing.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,8 @@
" %pip install -q \"matplotlib>=3.4,<3.7\"\n",
"\n",
"%pip install -q \"tensorflow-macos>=2.5; sys_platform == 'darwin' and platform_machine == 'arm64' and python_version > '3.8'\" # macOS M1 and M2\n",
"%pip install -q \"tensorflow-macos>=2.5,<=2.12.0; sys_platform == 'darwin' and platform_machine == 'arm64' and python_version <= '3.8'\" # macOS M1 and M2\n",
"%pip install -q \"tensorflow>=2.5; sys_platform == 'darwin' and platform_machine != 'arm64' and python_version > '3.8'\" # macOS x86\n",
"%pip install -q \"tensorflow>=2.5,<=2.12.0; sys_platform == 'darwin' and platform_machine != 'arm64' and python_version <= '3.8'\" # macOS x86\n",
"%pip install -q \"tensorflow>=2.5; sys_platform != 'darwin' and python_version > '3.8'\"\n",
"%pip install -q \"tensorflow>=2.5; sys_platform != 'darwin' and python_version <= '3.8'\"\n",
"%pip install -q tf_keras tensorflow_hub"
]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,8 @@
"%pip install -Uq pip\n",
"%pip install --upgrade --pre openvino-tokenizers \"openvino>=2024.2.0\" --extra-index-url \"https://storage.openvinotoolkit.org/simple/wheels/nightly\"\n",
"%pip install -q \"tensorflow-macos>=2.5; sys_platform == 'darwin' and platform_machine == 'arm64' and python_version > '3.8'\" # macOS M1 and M2\n",
"%pip install -q \"tensorflow-macos>=2.5,<=2.12.0; sys_platform == 'darwin' and platform_machine == 'arm64' and python_version <= '3.8'\" # macOS M1 and M2\n",
"%pip install -q \"tensorflow>=2.5; sys_platform == 'darwin' and platform_machine != 'arm64' and python_version > '3.8'\" # macOS x86\n",
"%pip install -q \"tensorflow>=2.5,<=2.12.0; sys_platform == 'darwin' and platform_machine != 'arm64' and python_version <= '3.8'\" # macOS x86\n",
"%pip install -q \"tensorflow>=2.5; sys_platform != 'darwin' and python_version > '3.8'\"\n",
"%pip install -q \"tensorflow>=2.5,<=2.12.0; sys_platform != 'darwin' and python_version <= '3.8'\"\n",
"\n",
"%pip install -q tensorflow_hub tf_keras numpy \"opencv-python\" \"nncf>=2.10.0\"\n",
"if platform.system() != \"Windows\":\n",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"source": [
"# SpeechBrain Emotion Recognition with OpenVINO\n",
"\n",
"<div class=\"alert alert-block alert-danger\"> <b>Important note:</b> This notebook requires python >= 3.9. Please make sure that your environment fulfill to this requirement before running it </div>\n",
"\n",
"[SpeechBrain](https://github.com/speechbrain/speechbrain) is an open-source PyTorch toolkit that accelerates Conversational AI development, i.e., the technology behind speech assistants, chatbots, and large language models. \n",
"\n",
Expand Down
3 changes: 1 addition & 2 deletions notebooks/stable-audio/stable-audio.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@
"metadata": {},
"source": [
"## Prerequisites\n",
"[back to top ⬆️](#Table-of-contents:)\n",
">**Note**: using python3.8 can take a long time to resolve dependency conflicts."
"[back to top ⬆️](#Table-of-contents:)"
]
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
"source": [
"# Stable Diffusion with KerasCV and OpenVINO\n",
"\n",
"<div class=\"alert alert-block alert-danger\"> <b>Important note:</b> This notebook requires python >= 3.9. Please make sure that your environment fulfill to this requirement before running it </div>\n",
"\n",
"Stable Diffusion is a powerful, open-source text-to-image generation model. There are multiple implementations of this pipeline in different frameworks. Previously, we already considered how to convert and optimize [PyTorch Stable Diffusion using HuggingFace Diffusers library](https://github.com/openvinotoolkit/openvino_notebooks/blob/latest/notebooks/stable-diffusion-text-to-image/stable-diffusion-text-to-image.ipynb). In this tutorial, we consider how to convert and run [Stable Diffusion from KerasCV](https://www.tensorflow.org/tutorials/generative/generate_images_with_stable_diffusion) that employs graph mode execution, which enhances performance by leveraging graph optimization and enabling parallelism and in the same time maintains a user-friendly interface for image generation. An additional part demonstrates how to run optimization with [NNCF](https://github.com/openvinotoolkit/nncf/) to speed up pipeline.\n",
"\n",
"#### Table of contents:\n",
Expand Down
Loading

0 comments on commit 9d0ef18

Please sign in to comment.