Skip to content

Commit fc60214

Browse files
eaidovaeaidova
authored
remove upper bound for matplotlib on windows (openvinotoolkit#2503)
1 parent 7e5cb6d commit fc60214

File tree

27 files changed

+52
-138
lines changed

27 files changed

+52
-138
lines changed

‎notebooks/big-transfer-quantization/tensorflow-bit-image-classification-nncf-quantization.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"if platform.system() != \"Windows\":\n",
5353
" %pip install -q \"matplotlib>=3.4\" \"tensorflow_datasets>=4.9.0\"\n",
5454
"else:\n",
55-
" %pip install -q \"matplotlib>=3.4,<3.7\" \"tensorflow_datasets>=4.9.0,<4.9.3\""
55+
" %pip install -q \"matplotlib>=3.4\" \"tensorflow_datasets>=4.9.0,<4.9.3\""
5656
]
5757
},
5858
{

‎notebooks/blip-visual-language-processing/blip-visual-language-processing.ipynb

+1-6
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,8 @@
174174
"metadata": {},
175175
"outputs": [],
176176
"source": [
177-
"import platform\n",
178-
"\n",
179177
"%pip install -q --extra-index-url https://download.pytorch.org/whl/cpu \"torch>=2.1.0\" torchvision \"transformers>=4.26.0\" \"gradio>=4.19\" \"openvino>=2023.3.0\" \"datasets>=2.14.6\" \"nncf>=2.8.1\" \"tqdm\"\n",
180-
"if platform.system() != \"Windows\":\n",
181-
" %pip install -q \"matplotlib>=3.4\"\n",
182-
"else:\n",
183-
" %pip install -q \"matplotlib>=3.4,<3.7\""
178+
"%pip install -q \"matplotlib>=3.4\""
184179
]
185180
},
186181
{

‎notebooks/clip-language-saliency-map/clip-language-saliency-map.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"source": [
9191
"# Install requirements\n",
9292
"%pip install -q \"openvino>=2023.1.0\"\n",
93-
"%pip install -q --extra-index-url https://download.pytorch.org/whl/cpu transformers \"numpy<2\" \"torch>=2.1\" \"gradio>=4.19\""
93+
"%pip install -q --extra-index-url https://download.pytorch.org/whl/cpu transformers \"numpy<2\" \"torch>=2.1\" \"gradio>=4.19\" \"matplotlib>=3.4\""
9494
]
9595
},
9696
{

‎notebooks/encodec-audio-compression/encodec-audio-compression.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"metadata": {},
6060
"outputs": [],
6161
"source": [
62-
"%pip install -q --extra-index-url https://download.pytorch.org/whl/cpu \"openvino>=2023.3.0\" \"torch>=2.1\" \"torchaudio>=2.1\" \"encodec>=0.1.1\" \"gradio>=4.19\" \"librosa>=0.8.1\" \"matplotlib\" tqdm"
62+
"%pip install -q --extra-index-url https://download.pytorch.org/whl/cpu \"openvino>=2023.3.0\" \"torch>=2.1\" \"torchaudio>=2.1\" \"encodec>=0.1.1\" \"gradio>=4.19\" \"librosa>=0.8.1\" \"matplotlib>=3.4\" tqdm"
6363
]
6464
},
6565
{

‎notebooks/explainable-ai-1-basic/explainable-ai-1-basic.ipynb

+2-6
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@
5454
"metadata": {},
5555
"outputs": [],
5656
"source": [
57-
"import platform\n",
58-
"\n",
5957
"# Install openvino package\n",
6058
"%pip install -q \"openvino>=2024.2.0\" opencv-python tqdm\n",
6159
"\n",
@@ -64,10 +62,7 @@
6462
"%pip install -q -U \"numpy==1.*\"\n",
6563
"%pip install -q scipy\n",
6664
"\n",
67-
"if platform.system() != \"Windows\":\n",
68-
" %pip install -q \"matplotlib>=3.4\"\n",
69-
"else:\n",
70-
" %pip install -q \"matplotlib>=3.4,<3.7\""
65+
"%pip install -q \"matplotlib>=3.4\""
7166
]
7267
},
7368
{
@@ -384,6 +379,7 @@
384379
]
385380
},
386381
{
382+
"attachments": {},
387383
"cell_type": "markdown",
388384
"id": "6d6e107b",
389385
"metadata": {},

‎notebooks/explainable-ai-2-deep-dive/explainable-ai-2-deep-dive.ipynb

+5-4
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,7 @@
106106
"%pip install -q -U \"numpy==1.*\"\n",
107107
"%pip install -q scipy\n",
108108
"\n",
109-
"if platform.system() != \"Windows\":\n",
110-
" %pip install -q \"matplotlib>=3.4\"\n",
111-
"else:\n",
112-
" %pip install -q \"matplotlib>=3.4,<3.7\""
109+
"%pip install -q \"matplotlib>=3.4\""
113110
]
114111
},
115112
{
@@ -471,6 +468,7 @@
471468
]
472469
},
473470
{
471+
"attachments": {},
474472
"cell_type": "markdown",
475473
"metadata": {},
476474
"source": [
@@ -789,6 +787,7 @@
789787
]
790788
},
791789
{
790+
"attachments": {},
792791
"cell_type": "markdown",
793792
"metadata": {},
794793
"source": [
@@ -864,6 +863,7 @@
864863
]
865864
},
866865
{
866+
"attachments": {},
867867
"cell_type": "markdown",
868868
"metadata": {},
869869
"source": [
@@ -929,6 +929,7 @@
929929
]
930930
},
931931
{
932+
"attachments": {},
932933
"cell_type": "markdown",
933934
"metadata": {},
934935
"source": [

‎notebooks/explainable-ai-3-map-interpretation/explainable-ai-3-map-interpretation.ipynb

+1-4
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,7 @@
9292
"%pip install -q -U \"numpy==1.*\"\n",
9393
"%pip install -q scipy\n",
9494
"\n",
95-
"if platform.system() != \"Windows\":\n",
96-
" %pip install -q \"matplotlib>=3.4\"\n",
97-
"else:\n",
98-
" %pip install -q \"matplotlib>=3.4,<3.7\""
95+
"%pip install -q \"matplotlib>=3.4\""
9996
]
10097
},
10198
{

‎notebooks/film-slowmo/film-slowmo.ipynb

+1-5
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
"metadata": {},
6767
"outputs": [],
6868
"source": [
69-
"import platform\n",
7069
"import os\n",
7170
"\n",
7271
"%pip install -q \"tensorflow-macos>=2.5; sys_platform == 'darwin' and platform_machine == 'arm64' and python_version > '3.8'\" # macOS M1 and M2\n",
@@ -79,10 +78,7 @@
7978
"\n",
8079
"%pip install -q tensorflow_hub tf_keras numpy \"opencv-python\" tqdm \"gradio>=4.19\" Pillow \"openvino>=2023.2.0\"\n",
8180
"\n",
82-
"if platform.system() != \"Windows\":\n",
83-
" %pip install -q \"matplotlib>=3.4\"\n",
84-
"else:\n",
85-
" %pip install -q \"matplotlib>=3.4,<3.7\""
81+
"%pip install -q \"matplotlib>=3.4\""
8682
]
8783
},
8884
{

‎notebooks/image-bind/image-bind.ipynb

+1-8
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,9 @@
103103
},
104104
"outputs": [],
105105
"source": [
106-
"import platform\n",
107-
"\n",
108106
"%pip install -q \"torch>=2.0.1\" \"torchvision>=0.15.2,<0.17.0\" \"torchaudio>=2.0.2\" \"matplotlib>=3.4\" --extra-index-url https://download.pytorch.org/whl/cpu\n",
109107
"%pip install -q datasets regex librosa soundfile pytorchvideo ftfy \"timm>=0.6.7\" einops fvcore \"openvino>=2024.0.0\" \"nncf>=2.9.0\" numpy scipy --extra-index-url https://download.pytorch.org/whl/cpu\n",
110-
"\n",
111-
"\n",
112-
"if platform.system() != \"Windows\":\n",
113-
" %pip install -q \"matplotlib>=3.4\"\n",
114-
"else:\n",
115-
" %pip install -q \"matplotlib>=3.4,<3.7\""
108+
"%pip install -q \"matplotlib>=3.4\""
116109
]
117110
},
118111
{

‎notebooks/mobileclip-video-search/mobileclip-video-search.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"\n",
8181
"%pip install -q \"clip-benchmark>=1.4.0\" \"datasets>=2.8.0\" \"open-clip-torch>=2.20.0\" \"timm>=0.9.5\" \"torch>=1.13.1\" \"torchvision>=0.14.1\" --extra-index-url https://download.pytorch.org/whl/cpu\n",
8282
"\n",
83-
"%pip install -q \"openvino>=2024.0.0\" \"gradio>=4.19\" \"matplotlib\" \"Pillow\" \"altair\" \"pandas\" \"opencv-python\" \"tqdm\" \"matplotlib>=3.4\""
83+
"%pip install -q \"openvino>=2024.0.0\" \"gradio>=4.19\" \"matplotlib>=3.4\" \"Pillow\" \"altair\" \"pandas\" \"opencv-python\" \"tqdm\" \"matplotlib>=3.4\""
8484
]
8585
},
8686
{

‎notebooks/qrcode-monster/qrcode-monster.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"outputs": [],
6565
"source": [
6666
"%pip install -q accelerate \"diffusers>=0.24.0\" transformers \"torch>=2.1\" \"gradio>=4.19\" qrcode opencv-python \"peft>=0.6.2\" --extra-index-url https://download.pytorch.org/whl/cpu\n",
67-
"%pip install -q \"openvino>=2023.1.0\" \"nncf>=2.7.0\""
67+
"%pip install -q \"openvino>=2023.1.0\" \"nncf>=2.7.0\" \"matplotlib>=3.4\""
6868
]
6969
},
7070
{

‎notebooks/rmbg-background-removal/rmbg-background-removal.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
},
5757
"outputs": [],
5858
"source": [
59-
"%pip install -q torch torchvision pillow huggingface_hub \"openvino>=2024.0.0\" matplotlib \"gradio>=4.15\" \"transformers>=4.39.1\" tqdm --extra-index-url https://download.pytorch.org/whl/cpu"
59+
"%pip install -q torch torchvision pillow huggingface_hub \"openvino>=2024.0.0\" \"matplotlib>=3.4\" \"gradio>=4.15\" \"transformers>=4.39.1\" tqdm --extra-index-url https://download.pytorch.org/whl/cpu"
6060
]
6161
},
6262
{

‎notebooks/s3d-mil-nce-text-to-video-retrieval/s3d-mil-nce-text-to-video-retrieval.ipynb

+1-7
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,13 @@
5353
"metadata": {},
5454
"outputs": [],
5555
"source": [
56-
"import platform\n",
57-
"\n",
58-
"%pip install -Uq pip\n",
5956
"%pip install --upgrade --pre openvino-tokenizers \"openvino>=2024.2.0\" --extra-index-url \"https://storage.openvinotoolkit.org/simple/wheels/nightly\"\n",
6057
"%pip install -q \"tensorflow-macos>=2.5; sys_platform == 'darwin' and platform_machine == 'arm64' and python_version > '3.8'\" # macOS M1 and M2\n",
6158
"%pip install -q \"tensorflow>=2.5; sys_platform == 'darwin' and platform_machine != 'arm64' and python_version > '3.8'\" # macOS x86\n",
6259
"%pip install -q \"tensorflow>=2.5; sys_platform != 'darwin' and python_version > '3.8'\"\n",
6360
"\n",
6461
"%pip install -q tensorflow_hub tf_keras numpy \"opencv-python\" \"nncf>=2.10.0\"\n",
65-
"if platform.system() != \"Windows\":\n",
66-
" %pip install -q \"matplotlib>=3.4\"\n",
67-
"else:\n",
68-
" %pip install -q \"matplotlib>=3.4,<3.7\""
62+
"%pip install -q \"matplotlib>=3.4\""
6963
]
7064
},
7165
{

‎notebooks/sam2-image-segmentation/segment-anything-2-image.ipynb

+5-7
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,10 @@
8686
"metadata": {},
8787
"outputs": [],
8888
"source": [
89-
"import platform\n",
90-
"\n",
91-
"\n",
9289
"%pip install -q \"gradio>=4.13,<4.41.0\" \"fastapi==0.112.4\" \"openvino>=2024.4.0\" \"nncf>=2.13\" \"torch>=2.3.1\" \"torchvision>=0.18.1\" opencv-python tqdm numpy --extra-index-url https://download.pytorch.org/whl/cpu\n",
9390
"%pip install \"iopath>=0.1.10\" \"pillow>=9.4.0\" \"hydra-core>=1.3.2\"\n",
9491
"\n",
95-
"if platform.system() != \"Windows\":\n",
96-
" %pip install -q \"matplotlib>=3.4\"\n",
97-
"else:\n",
98-
" %pip install -q \"matplotlib>=3.4,<3.7\""
92+
"%pip install -q \"matplotlib>=3.4\""
9993
]
10094
},
10195
{
@@ -118,6 +112,7 @@
118112
]
119113
},
120114
{
115+
"attachments": {},
121116
"cell_type": "markdown",
122117
"id": "dbe4ee93",
123118
"metadata": {},
@@ -185,6 +180,7 @@
185180
]
186181
},
187182
{
183+
"attachments": {},
188184
"cell_type": "markdown",
189185
"id": "7839ced0",
190186
"metadata": {},
@@ -194,6 +190,7 @@
194190
]
195191
},
196192
{
193+
"attachments": {},
197194
"cell_type": "markdown",
198195
"id": "6d0a8a1a",
199196
"metadata": {},
@@ -252,6 +249,7 @@
252249
]
253250
},
254251
{
252+
"attachments": {},
255253
"cell_type": "markdown",
256254
"id": "d798fbde",
257255
"metadata": {},

0 commit comments

Comments
 (0)