remove upperbound for matplotlib on win where it is possible (#2454)

openvinotoolkit · Oct 17, 2024 · 095090d · 095090d
1 parent e594dd3
commit 095090d
Show file tree

Hide file tree

Showing 38 changed files with 104 additions and 220 deletions.
diff --git a/notebooks/3D-segmentation-point-clouds/3D-segmentation-point-clouds.ipynb b/notebooks/3D-segmentation-point-clouds/3D-segmentation-point-clouds.ipynb
@@ -40,14 +40,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import platform\n",
-    "\n",
-    "%pip install -q \"openvino>=2023.1.0\" \"tqdm\"\n",
-    "\n",
-    "if platform.system() != \"Windows\":\n",
-    "    %pip install -q \"matplotlib>=3.4\"\n",
-    "else:\n",
-    "    %pip install -q \"matplotlib>=3.4,<3.7\""
+    "%pip install -q \"openvino>=2023.1.0\" \"tqdm\" \"matplotlib>=3.4\""
    ]
   },
   {

diff --git a/notebooks/async-api/async-api.ipynb b/notebooks/async-api/async-api.ipynb
@@ -55,14 +55,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import platform\n",
-    "\n",
     "%pip install -q \"openvino>=2023.1.0\"\n",
-    "%pip install -q opencv-python\n",
-    "if platform.system() != \"windows\":\n",
-    "    %pip install -q \"matplotlib>=3.4\"\n",
-    "else:\n",
-    "    %pip install -q \"matplotlib>=3.4,<3.7\""
+    "%pip install -q opencv-python \"matplotlib>=3.4\""
    ]
   },
   {

diff --git a/notebooks/auto-device/auto-device.ipynb b/notebooks/auto-device/auto-device.ipynb
@@ -70,12 +70,10 @@
     "import platform\n",
     "\n",
     "# Install required packages\n",
-    "%pip install -q \"openvino>=2023.1.0\" \"numpy<2\" Pillow torch torchvision tqdm --extra-index-url https://download.pytorch.org/whl/cpu\n",
+    "%pip install -q \"openvino>=2023.1.0\" \"matplotlib>=3.4\" Pillow torch torchvision tqdm --extra-index-url https://download.pytorch.org/whl/cpu\n",
     "\n",
-    "if platform.system() != \"Windows\":\n",
-    "    %pip install -q \"matplotlib>=3.4\"\n",
-    "else:\n",
-    "    %pip install -q \"matplotlib>=3.4,<3.7\""
+    "if platform.system() == \"Darwin\":\n",
+    "    %pip install -q \"numpy<2.0.0\""
    ]
   },
   {

diff --git a/notebooks/clip-zero-shot-image-classification/clip-zero-shot-classification.ipynb b/notebooks/clip-zero-shot-image-classification/clip-zero-shot-classification.ipynb
@@ -88,14 +88,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import platform\n",
-    "\n",
-    "%pip install -q --extra-index-url https://download.pytorch.org/whl/cpu \"gradio>=4.19\" \"openvino>=2023.1.0\" \"transformers[torch]>=4.30\" \"datasets\" \"nncf>=2.6.0\" \"torch>=2.1\" Pillow\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 --extra-index-url https://download.pytorch.org/whl/cpu \"gradio>=4.19\" \"matplotlib>=3.4\" \"openvino>=2023.1.0\" \"transformers[torch]>=4.30\" \"datasets\" \"nncf>=2.6.0\" \"torch>=2.1\" Pillow\n",
     "\n",
     "import requests\n",
     "\n",

diff --git a/notebooks/controlnet-stable-diffusion/controlnet-stable-diffusion.ipynb b/notebooks/controlnet-stable-diffusion/controlnet-stable-diffusion.ipynb
@@ -118,7 +118,7 @@
    "outputs": [],
    "source": [
     "%pip install -q --extra-index-url https://download.pytorch.org/whl/cpu \"torch>=2.1\" \"torchvision\"\n",
-    "%pip install -q \"diffusers>=0.14.0\" \"transformers>=4.30.2\" \"controlnet-aux>=0.0.6\" \"gradio>=3.36\" --extra-index-url https://download.pytorch.org/whl/cpu\n",
+    "%pip install -q \"diffusers>=0.14.0\" \"matplotlib>=3.4\" \"transformers>=4.30.2\" \"controlnet-aux>=0.0.6\" \"gradio>=3.36\" --extra-index-url https://download.pytorch.org/whl/cpu\n",
     "%pip install -q \"openvino>=2023.1.0\" \"datasets>=2.14.6\" \"nncf>=2.7.0\"\n",
     "\n",
     "import requests\n",

diff --git a/notebooks/convert-to-openvino/convert-to-openvino.ipynb b/notebooks/convert-to-openvino/convert-to-openvino.ipynb
@@ -43,9 +43,8 @@
    "outputs": [],
    "source": [
     "# Required imports. Please execute this cell first.\n",
-    "%pip install --upgrade pip\n",
     "%pip install -q --extra-index-url https://download.pytorch.org/whl/cpu \\\n",
-    "\"openvino-dev>=2024.0.0\" \"requests\" \"tqdm\" \"transformers>=4.31\" \"onnx<1.16.2\" \"torch>=2.1\" \"torchvision\" \"tensorflow_hub\" \"tensorflow\""
+    "\"openvino>=2024.4.0\" \"requests\" \"tqdm\" \"transformers>=4.31\" \"onnx!=1.16.2\" \"torch>=2.1\" \"torchvision\" \"tensorflow_hub\" \"tensorflow\""
    ]
   },
   {
@@ -617,26 +616,16 @@
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": 20,
+   "attachments": {},
+   "cell_type": "markdown",
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "huggingface/tokenizers: The current process just got forked, after parallelism has already been used. Disabling parallelism to avoid deadlocks...\n",
-      "To disable this warning, you can either:\n",
-      "\t- Avoid using `tokenizers` before the fork if possible\n",
-      "\t- Explicitly set the environment variable TOKENIZERS_PARALLELISM=(true | false)\n"
-     ]
-    }
-   ],
    "source": [
+    "```python\n",
     "# Legacy Model Optimizer API\n",
     "from openvino.tools import mo\n",
     "\n",
-    "ov_model = mo.convert_model(ONNX_CV_MODEL_PATH, layout=\"nchw\")"
+    "ov_model = mo.convert_model(ONNX_CV_MODEL_PATH, layout=\"nchw\")\n",
+    "```"
    ]
   },
   {
@@ -670,18 +659,19 @@
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": 22,
+   "attachments": {},
+   "cell_type": "markdown",
    "metadata": {},
-   "outputs": [],
    "source": [
     "# Legacy Model Optimizer API\n",
+    "```python\n",
     "from openvino.tools import mo\n",
     "\n",
     "ov_model = mo.convert_model(ONNX_CV_MODEL_PATH, layout=\"nchw->nhwc\")\n",
     "\n",
     "# alternatively use source_layout and target_layout parameters\n",
-    "ov_model = mo.convert_model(ONNX_CV_MODEL_PATH, source_layout=\"nchw\", target_layout=\"nhwc\")"
+    "ov_model = mo.convert_model(ONNX_CV_MODEL_PATH, source_layout=\"nchw\", target_layout=\"nhwc\")\n",
+    "```"
    ]
   },
   {
@@ -715,20 +705,22 @@
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": 24,
+   "attachments": {},
+   "cell_type": "markdown",
    "metadata": {},
-   "outputs": [],
    "source": [
+    "```python\n",
     "# Legacy Model Optimizer API\n",
+    "\n",
     "from openvino.tools import mo\n",
     "\n",
     "\n",
     "ov_model = mo.convert_model(\n",
     "    ONNX_CV_MODEL_PATH,\n",
     "    mean_values=[255 * x for x in [0.485, 0.456, 0.406]],\n",
     "    scale_values=[255 * x for x in [0.229, 0.224, 0.225]],\n",
-    ")"
+    ")\n",
+    "```"
    ]
   },
   {
@@ -760,15 +752,16 @@
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": 26,
+   "attachments": {},
+   "cell_type": "markdown",
    "metadata": {},
-   "outputs": [],
    "source": [
+    "```python\n",
     "# Legacy Model Optimizer API\n",
     "from openvino.tools import mo\n",
     "\n",
-    "ov_model = mo.convert_model(ONNX_CV_MODEL_PATH, reverse_input_channels=True)"
+    "ov_model = mo.convert_model(ONNX_CV_MODEL_PATH, reverse_input_channels=True)\n",
+    "```"
    ]
   },
   {

diff --git a/notebooks/cross-lingual-books-alignment/cross-lingual-books-alignment.ipynb b/notebooks/cross-lingual-books-alignment/cross-lingual-books-alignment.ipynb
@@ -61,14 +61,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import platform\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",
-    "\n",
-    "%pip install -q --extra-index-url https://download.pytorch.org/whl/cpu requests pysbd transformers \"torch>=2.1\" \"openvino>=2023.1.0\" seaborn ipywidgets"
+    "%pip install -q --extra-index-url https://download.pytorch.org/whl/cpu requests pysbd transformers \"torch>=2.1\" \"openvino>=2023.1.0\" seaborn ipywidgets \"matplotlib>=3.4\""
    ]
   },
   {