Skip to content

Commit 99c1124

Browse files
eaidovaeaidova
authored
separate ov install in controlnet sd (#2568)
1 parent bb35986 commit 99c1124

File tree

7 files changed

+59
-36
lines changed

7 files changed

+59
-36
lines changed

‎.ci/skipped_notebooks.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -468,13 +468,6 @@
468468
skips:
469469
- python:
470470
- '3.9'
471-
- notebook: notebooks/minicpm-v-multimodal-chatbot/minicpm-v-multimodal-chatbot.ipynb
472-
skips:
473-
- os:
474-
- macos-13
475-
- ubuntu-20.04
476-
- ubuntu-22.04
477-
- windows-2019
478471
- notebook: notebooks/stable-audio/stable-audio.ipynb
479472
skips:
480473
- os:

‎notebooks/controlnet-stable-diffusion/controlnet-stable-diffusion.ipynb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,13 @@
138138
" \"transformers>=4.30.2\",\n",
139139
" \"controlnet-aux>=0.0.6\",\n",
140140
" \"gradio>=3.36\",\n",
141+
" \"datasets>=2.14.6\",\n",
142+
" \"nncf>=2.7.0\",\n",
143+
" \"opencv-python\",\n",
141144
" \"--extra-index-url\",\n",
142145
" \"https://download.pytorch.org/whl/cpu\",\n",
143146
")\n",
144-
"pip_install(\"openvino>=2023.1.0\", \"datasets>=2.14.6\", \"nncf>=2.7.0\", \"opencv-python\")"
147+
"pip_install(\"openvino>=2023.1.0\")"
145148
]
146149
},
147150
{

‎notebooks/efficient-sam/efficient-sam.ipynb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,14 @@
6767
"metadata": {},
6868
"outputs": [],
6969
"source": [
70-
"%pip install -q \"openvino>=2023.3.0\" \"nncf>=2.7.0\" opencv-python \"gradio>=4.13\" \"matplotlib>=3.4\" torch torchvision tqdm --extra-index-url https://download.pytorch.org/whl/cpu"
70+
"import platform\n",
71+
"\n",
72+
"%pip install -q \"openvino>=2024.5.0\" \"nncf>=2.14.0\"\n",
73+
"%pip install -q \"torch>=2.2.0\" \"torchaudio>=2.2.0\" \"torchvision>=0.17.0\" --extra-index-url https://download.pytorch.org/whl/cpu\n",
74+
"%pip install -q opencv-python \"gradio>=4.13\" \"matplotlib>=3.4\" tqdm\n",
75+
"\n",
76+
"if platform.system() == \"Darwin\":\n",
77+
" %pip install -q \"numpy<2.0.0\""
7178
]
7279
},
7380
{

‎notebooks/llava-multimodal-chatbot/llava-multimodal-chatbot-genai.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"from pathlib import Path\n",
9898
"import requests\n",
9999
"\n",
100-
"%pip install -q \"torch>=2.1.0\" \"torchvision\" \"torchaudio\" --index-url https://download.pytorch.org/whl/cpu\n",
100+
"%pip install -q \"torch>=2.3.0\" \"torchvision\" \"torchaudio\" --index-url https://download.pytorch.org/whl/cpu\n",
101101
"%pip install -q \"git+https://github.com/huggingface/optimum-intel.git\" --index-url https://download.pytorch.org/whl/cpu\n",
102102
"%pip install -q \"nncf>=2.14.0\" \"sentencepiece\" \"tokenizers>=0.12.1\" \"transformers>=4.45.0\" \"gradio>=4.36\"\n",
103103
"%pip install -q -U \"openvino-tokenizers>=2024.5.0\" \"openvino>=2024.5.0\" \"openvino-genai>=2024.5.0\"|\n",

‎notebooks/minicpm-v-multimodal-chatbot/minicpm-v-multimodal-chatbot.ipynb

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,11 @@
131131
"cell_type": "code",
132132
"execution_count": 3,
133133
"id": "82e846bb",
134-
"metadata": {},
134+
"metadata": {
135+
"test_replace": {
136+
"openbmb/MiniCPM-V-2_6": "katuni4ka/tiny-random-minicpmv-2_6"
137+
}
138+
},
135139
"outputs": [
136140
{
137141
"name": "stdout",
@@ -169,7 +173,7 @@
169173
"model_dir = Path(model_id.split(\"/\")[-1] + \"-ov\")\n",
170174
"\n",
171175
"if not model_dir.exists():\n",
172-
" optimum_cli(model_id, model_dir, additional_args={\"trust-remote-code\": \"\", \"weight-format\": \"fp16\"})\n",
176+
" optimum_cli(model_id, model_dir, additional_args={\"trust-remote-code\": \"\", \"weight-format\": \"fp16\", \"task\": \"image-text-to-text\"})\n",
173177
" compress_lm_weights(model_dir)"
174178
]
175179
},
@@ -204,22 +208,22 @@
204208
},
205209
{
206210
"cell_type": "code",
207-
"execution_count": 4,
211+
"execution_count": 1,
208212
"id": "626fef57",
209213
"metadata": {},
210214
"outputs": [
211215
{
212216
"data": {
213217
"application/vnd.jupyter.widget-view+json": {
214-
"model_id": "84bba5eaf8cc4b7e97a5e5d3768146e3",
218+
"model_id": "2362638a795340e6b3effb0805848768",
215219
"version_major": 2,
216220
"version_minor": 0
217221
},
218222
"text/plain": [
219223
"Dropdown(description='Device:', index=1, options=('CPU', 'AUTO'), value='AUTO')"
220224
]
221225
},
222-
"execution_count": 4,
226+
"execution_count": 1,
223227
"metadata": {},
224228
"output_type": "execute_result"
225229
}
@@ -434,21 +438,7 @@
434438
"widgets": {
435439
"application/vnd.jupyter.widget-state+json": {
436440
"state": {
437-
"41592555658f4eb69616c541894b88f0": {
438-
"model_module": "@jupyter-widgets/controls",
439-
"model_module_version": "2.0.0",
440-
"model_name": "DescriptionStyleModel",
441-
"state": {
442-
"description_width": ""
443-
}
444-
},
445-
"658a0c15a9cb47078c9c8647bff53d1e": {
446-
"model_module": "@jupyter-widgets/base",
447-
"model_module_version": "2.0.0",
448-
"model_name": "LayoutModel",
449-
"state": {}
450-
},
451-
"84bba5eaf8cc4b7e97a5e5d3768146e3": {
441+
"2362638a795340e6b3effb0805848768": {
452442
"model_module": "@jupyter-widgets/controls",
453443
"model_module_version": "2.0.0",
454444
"model_name": "DropdownModel",
@@ -459,9 +449,23 @@
459449
],
460450
"description": "Device:",
461451
"index": 1,
462-
"layout": "IPY_MODEL_658a0c15a9cb47078c9c8647bff53d1e",
463-
"style": "IPY_MODEL_41592555658f4eb69616c541894b88f0"
452+
"layout": "IPY_MODEL_d737bcde20ac4ba38ecf0902eec67998",
453+
"style": "IPY_MODEL_49b230bc877e422788033f49884843a2"
454+
}
455+
},
456+
"49b230bc877e422788033f49884843a2": {
457+
"model_module": "@jupyter-widgets/controls",
458+
"model_module_version": "2.0.0",
459+
"model_name": "DescriptionStyleModel",
460+
"state": {
461+
"description_width": ""
464462
}
463+
},
464+
"d737bcde20ac4ba38ecf0902eec67998": {
465+
"model_module": "@jupyter-widgets/base",
466+
"model_module_version": "2.0.0",
467+
"model_name": "LayoutModel",
468+
"state": {}
465469
}
466470
},
467471
"version_major": 2,

‎notebooks/parler-tts-text-to-speech/parler-tts-text-to-speech.ipynb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@
5858
"\n",
5959
"os.environ[\"GIT_CLONE_PROTECTION_ACTIVE\"] = \"false\"\n",
6060
"\n",
61+
"%pip uninstall -q -y torch torchvision torchaudio\n",
6162
"%pip install -q \"openvino>=2024.2.0\"\n",
62-
"%pip install -q git+https://github.com/huggingface/parler-tts.git \"gradio>=4.19\" transformers \"torch>=2.2\" --extra-index-url https://download.pytorch.org/whl/cpu"
63+
"%pip install -q git+https://github.com/huggingface/parler-tts.git \"gradio>=4.19\" transformers \"torch>=2.2\" \"torchaudio\" --extra-index-url https://download.pytorch.org/whl/cpu"
6364
]
6465
},
6566
{

‎notebooks/whisper-subtitles-generation/whisper-subtitles-generation.ipynb

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,27 @@
8383
"outputs": [],
8484
"source": [
8585
"import platform\n",
86+
"import importlib.metadata\n",
87+
"import importlib.util\n",
8688
"\n",
8789
"%pip install -q \"nncf>=2.14.0\"\n",
8890
"%pip install -q -U \"openvino>=2024.5.0\" \"openvino-tokenizers>=2024.5.0\" \"openvino-genai>=2024.5.0\"\n",
8991
"%pip install -q \"python-ffmpeg<=1.0.16\" \"ffmpeg\" \"moviepy\" \"transformers>=4.45\" \"git+https://github.com/huggingface/optimum-intel.git\" \"torch>=2.1\" --extra-index-url https://download.pytorch.org/whl/cpu\n",
90-
"%pip install -q -U \"yt_dlp>=2024.8.6\" soundfile librosa jiwer\n",
92+
"%pip install -q -U \"yt_dlp>=2024.8.6\" soundfile librosa jiwer packaging\n",
9193
"%pip install -q \"gradio>=4.19\" \"typing_extensions>=4.9\"\n",
9294
"\n",
9395
"if platform.system() == \"Darwin\":\n",
94-
" %pip install -q \"numpy<2.0\""
96+
" %pip install -q \"numpy<2.0\"\n",
97+
"\n",
98+
"\n",
99+
"from packaging import version\n",
100+
"\n",
101+
"if (\n",
102+
" importlib.util.find_spec(\"tensorflow\") is not None\n",
103+
" and version.parse(importlib.metadata.version(\"tensorflow\")) < version.parse(\"2.18.0\")\n",
104+
" and version.parse(importlib.metadata.version(\"numpy\")) >= version.parse(\"2.0.0\")\n",
105+
"):\n",
106+
" %pip uninstall -q -y tensorflow"
95107
]
96108
},
97109
{
@@ -379,7 +391,10 @@
379391
"metadata": {},
380392
"outputs": [],
381393
"source": [
382-
"from moviepy.editor import VideoFileClip\n",
394+
"try:\n",
395+
" from moviepy import VideoFileClip\n",
396+
"except ImportError:\n",
397+
" from moviepy.editor import VideoFileClip\n",
383398
"from transformers.pipelines.audio_utils import ffmpeg_read\n",
384399
"\n",
385400
"\n",

0 commit comments

Comments
 (0)