From 9ee9647abe62cdd10af29087a0fd0c3cda5c2378 Mon Sep 17 00:00:00 2001 From: Ekaterina Aidova Date: Mon, 16 Dec 2024 14:16:42 +0400 Subject: [PATCH] remove matplotlib upperbound for win (#2596) CVS-158214 --- notebooks/tensorflow-hub/tensorflow-hub.ipynb | 17 +++++------------ ...flow-instance-segmentation-to-openvino.ipynb | 8 ++++---- ...ensorflow-object-detection-to-openvino.ipynb | 8 ++++---- .../yolov10-optimization.ipynb | 4 ++-- 4 files changed, 15 insertions(+), 22 deletions(-) diff --git a/notebooks/tensorflow-hub/tensorflow-hub.ipynb b/notebooks/tensorflow-hub/tensorflow-hub.ipynb index dbd4665e1a4..4da99f49c01 100644 --- a/notebooks/tensorflow-hub/tensorflow-hub.ipynb +++ b/notebooks/tensorflow-hub/tensorflow-hub.ipynb @@ -57,19 +57,12 @@ "metadata": {}, "outputs": [], "source": [ - "import platform\n", - "\n", "%pip install -q pillow numpy\n", - "%pip install -q \"openvino>=2023.2.0\" \"opencv-python\"\n", - "\n", - "if platform.system() != \"Windows\":\n", - " %pip install -q \"matplotlib>=3.4\"\n", - "else:\n", - " %pip install -q \"matplotlib>=3.4,<3.7\"\n", + "%pip install -q \"openvino>=2023.2.0\" \"opencv-python\" \"matplotlib>=3.4\"\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>=2.5; 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-macos>=2.5; sys_platform == 'darwin' and platform_machine == 'arm64'\"\n", + "%pip install -q \"tensorflow>=2.5; sys_platform == 'darwin' and platform_machine != 'arm64'\"\n", + "%pip install -q \"tensorflow>=2.5; sys_platform != 'darwin'\"\n", "%pip install -q tf_keras tensorflow_hub" ] }, @@ -695,7 +688,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.10" + "version": "3.11.4" }, "openvino_notebooks": { "imageUrl": "", diff --git a/notebooks/tensorflow-object-detection-to-openvino/tensorflow-instance-segmentation-to-openvino.ipynb b/notebooks/tensorflow-object-detection-to-openvino/tensorflow-instance-segmentation-to-openvino.ipynb index aaae13c0676..236a75bb0fd 100644 --- a/notebooks/tensorflow-object-detection-to-openvino/tensorflow-instance-segmentation-to-openvino.ipynb +++ b/notebooks/tensorflow-object-detection-to-openvino/tensorflow-instance-segmentation-to-openvino.ipynb @@ -63,9 +63,9 @@ "\n", "%pip install -q \"matplotlib>=3.4\"\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>=2.5; 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'\"" + "%pip install -q \"tensorflow-macos>=2.5; sys_platform == 'darwin' and platform_machine == 'arm64'\" # macOS M1 and M2\n", + "%pip install -q \"tensorflow>=2.5; sys_platform == 'darwin' and platform_machine != 'arm64'\" # macOS x86\n", + "%pip install -q \"tensorflow>=2.5; sys_platform != 'darwin'\"" ] }, { @@ -893,7 +893,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.10" + "version": "3.11.4" }, "openvino_notebooks": { "imageUrl": "https://github.com/itrushkin/openvino_notebooks/assets/76161256/b0acc7bb-92c7-4c83-9484-84a8e1b798b7", diff --git a/notebooks/tensorflow-object-detection-to-openvino/tensorflow-object-detection-to-openvino.ipynb b/notebooks/tensorflow-object-detection-to-openvino/tensorflow-object-detection-to-openvino.ipynb index e2fb0170a4e..cd6875afbb8 100644 --- a/notebooks/tensorflow-object-detection-to-openvino/tensorflow-object-detection-to-openvino.ipynb +++ b/notebooks/tensorflow-object-detection-to-openvino/tensorflow-object-detection-to-openvino.ipynb @@ -63,9 +63,9 @@ "%pip install -q \"openvino>=2023.1.0\" \"numpy>=1.21.0\" \"opencv-python\" \"tqdm\"\n", "\n", "%pip install -q \"matplotlib>=3.4\"\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>=2.5; 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'\"" + "%pip install -q \"tensorflow-macos>=2.5; sys_platform == 'darwin' and platform_machine == 'arm64'\" # macOS M1 and M2\n", + "%pip install -q \"tensorflow>=2.5; sys_platform == 'darwin' and platform_machine != 'arm64'\" # macOS x86\n", + "%pip install -q \"tensorflow>=2.5; sys_platform != 'darwin'\"" ] }, { @@ -941,7 +941,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 3 (ipykernel)", "language": "python", "name": "python3" }, diff --git a/notebooks/yolov10-optimization/yolov10-optimization.ipynb b/notebooks/yolov10-optimization/yolov10-optimization.ipynb index 112d1adda94..5857d35f3a6 100644 --- a/notebooks/yolov10-optimization/yolov10-optimization.ipynb +++ b/notebooks/yolov10-optimization/yolov10-optimization.ipynb @@ -86,7 +86,7 @@ "%pip install -q \"nncf>=2.11.0\"\n", "%pip install -Uq \"openvino>=2024.3.0\"\n", "%pip install -q \"git+https://github.com/THU-MIG/yolov10.git\" --extra-index-url https://download.pytorch.org/whl/cpu\n", - "%pip install -q \"torch>=2.1\" \"torchvision>=0.16\" tqdm opencv-python \"gradio>=4.19\" --extra-index-url https://download.pytorch.org/whl/cpu" + "%pip install -q \"torch>=2.1\" \"torchvision>=0.16\" tqdm opencv-python \"gradio>=4.19\" \"matplotlib>=3.9\" --extra-index-url https://download.pytorch.org/whl/cpu" ] }, { @@ -1496,7 +1496,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.10" + "version": "3.11.4" }, "openvino_notebooks": { "imageUrl": "https://github.com/openvinotoolkit/openvino_notebooks/assets/29454499/81ff3233-9c8d-4fe8-ab21-baf9ce530cff",