Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

separate ov install in controlnet sd #2568

Merged
merged 5 commits into from
Nov 29, 2024
Merged

separate ov install in controlnet sd #2568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c4813d5
separate ov install in controlnet sd
eaidova Nov 29, 2024
0d72a62
more conflicts torch versions
eaidova Nov 29, 2024
e8cbd14
fix whisper
eaidova Nov 29, 2024
4c2b526
replace test model for minicpm
eaidova Nov 29, 2024
6c389fd
update ignore list
eaidova Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .ci/skipped_notebooks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,13 +468,6 @@
skips:
- python:
- '3.9'
- notebook: notebooks/minicpm-v-multimodal-chatbot/minicpm-v-multimodal-chatbot.ipynb
skips:
- os:
- macos-13
- ubuntu-20.04
- ubuntu-22.04
- windows-2019
- notebook: notebooks/stable-audio/stable-audio.ipynb
skips:
- os:
Expand Down
5 changes: 4 additions & 1 deletion notebooks/controlnet-stable-diffusion/controlnet-stable-diffusion.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,13 @@
" \"transformers>=4.30.2\",\n",
" \"controlnet-aux>=0.0.6\",\n",
" \"gradio>=3.36\",\n",
" \"datasets>=2.14.6\",\n",
" \"nncf>=2.7.0\",\n",
" \"opencv-python\",\n",
" \"--extra-index-url\",\n",
" \"https://download.pytorch.org/whl/cpu\",\n",
")\n",
"pip_install(\"openvino>=2023.1.0\", \"datasets>=2.14.6\", \"nncf>=2.7.0\", \"opencv-python\")"
"pip_install(\"openvino>=2023.1.0\")"
]
},
{
Expand Down
9 changes: 8 additions & 1 deletion notebooks/efficient-sam/efficient-sam.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,14 @@
"metadata": {},
"outputs": [],
"source": [
"%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"
"import platform\n",
"\n",
"%pip install -q \"openvino>=2024.5.0\" \"nncf>=2.14.0\"\n",
"%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",
"%pip install -q opencv-python \"gradio>=4.13\" \"matplotlib>=3.4\" tqdm\n",
"\n",
"if platform.system() == \"Darwin\":\n",
" %pip install -q \"numpy<2.0.0\""
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion notebooks/llava-multimodal-chatbot/llava-multimodal-chatbot-genai.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"from pathlib import Path\n",
"import requests\n",
"\n",
"%pip install -q \"torch>=2.1.0\" \"torchvision\" \"torchaudio\" --index-url https://download.pytorch.org/whl/cpu\n",
"%pip install -q \"torch>=2.3.0\" \"torchvision\" \"torchaudio\" --index-url https://download.pytorch.org/whl/cpu\n",
"%pip install -q \"git+https://github.com/huggingface/optimum-intel.git\" --index-url https://download.pytorch.org/whl/cpu\n",
"%pip install -q \"nncf>=2.14.0\" \"sentencepiece\" \"tokenizers>=0.12.1\" \"transformers>=4.45.0\" \"gradio>=4.36\"\n",
"%pip install -q -U \"openvino-tokenizers>=2024.5.0\" \"openvino>=2024.5.0\" \"openvino-genai>=2024.5.0\"|\n",
Expand Down
48 changes: 26 additions & 22 deletions notebooks/minicpm-v-multimodal-chatbot/minicpm-v-multimodal-chatbot.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,11 @@
"cell_type": "code",
"execution_count": 3,
"id": "82e846bb",
"metadata": {},
"metadata": {
"test_replace": {
"openbmb/MiniCPM-V-2_6": "katuni4ka/tiny-random-minicpmv-2_6"
}
},
"outputs": [
{
"name": "stdout",
Expand Down Expand Up @@ -169,7 +173,7 @@
"model_dir = Path(model_id.split(\"/\")[-1] + \"-ov\")\n",
"\n",
"if not model_dir.exists():\n",
" optimum_cli(model_id, model_dir, additional_args={\"trust-remote-code\": \"\", \"weight-format\": \"fp16\"})\n",
" optimum_cli(model_id, model_dir, additional_args={\"trust-remote-code\": \"\", \"weight-format\": \"fp16\", \"task\": \"image-text-to-text\"})\n",
" compress_lm_weights(model_dir)"
]
},
Expand Down Expand Up @@ -204,22 +208,22 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": 1,
"id": "626fef57",
"metadata": {},
"outputs": [
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "84bba5eaf8cc4b7e97a5e5d3768146e3",
"model_id": "2362638a795340e6b3effb0805848768",
"version_major": 2,
"version_minor": 0
},
"text/plain": [
"Dropdown(description='Device:', index=1, options=('CPU', 'AUTO'), value='AUTO')"
]
},
"execution_count": 4,
"execution_count": 1,
"metadata": {},
"output_type": "execute_result"
}
Expand Down Expand Up @@ -434,21 +438,7 @@
"widgets": {
"application/vnd.jupyter.widget-state+json": {
"state": {
"41592555658f4eb69616c541894b88f0": {
"model_module": "@jupyter-widgets/controls",
"model_module_version": "2.0.0",
"model_name": "DescriptionStyleModel",
"state": {
"description_width": ""
}
},
"658a0c15a9cb47078c9c8647bff53d1e": {
"model_module": "@jupyter-widgets/base",
"model_module_version": "2.0.0",
"model_name": "LayoutModel",
"state": {}
},
"84bba5eaf8cc4b7e97a5e5d3768146e3": {
"2362638a795340e6b3effb0805848768": {
"model_module": "@jupyter-widgets/controls",
"model_module_version": "2.0.0",
"model_name": "DropdownModel",
Expand All @@ -459,9 +449,23 @@
],
"description": "Device:",
"index": 1,
"layout": "IPY_MODEL_658a0c15a9cb47078c9c8647bff53d1e",
"style": "IPY_MODEL_41592555658f4eb69616c541894b88f0"
"layout": "IPY_MODEL_d737bcde20ac4ba38ecf0902eec67998",
"style": "IPY_MODEL_49b230bc877e422788033f49884843a2"
}
},
"49b230bc877e422788033f49884843a2": {
"model_module": "@jupyter-widgets/controls",
"model_module_version": "2.0.0",
"model_name": "DescriptionStyleModel",
"state": {
"description_width": ""
}
},
"d737bcde20ac4ba38ecf0902eec67998": {
"model_module": "@jupyter-widgets/base",
"model_module_version": "2.0.0",
"model_name": "LayoutModel",
"state": {}
}
},
"version_major": 2,
Expand Down
3 changes: 2 additions & 1 deletion notebooks/parler-tts-text-to-speech/parler-tts-text-to-speech.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@
"\n",
"os.environ[\"GIT_CLONE_PROTECTION_ACTIVE\"] = \"false\"\n",
"\n",
"%pip uninstall -q -y torch torchvision torchaudio\n",
"%pip install -q \"openvino>=2024.2.0\"\n",
"%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"
"%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"
]
},
{
Expand Down
21 changes: 18 additions & 3 deletions notebooks/whisper-subtitles-generation/whisper-subtitles-generation.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,27 @@
"outputs": [],
"source": [
"import platform\n",
"import importlib.metadata\n",
"import importlib.util\n",
"\n",
"%pip install -q \"nncf>=2.14.0\"\n",
"%pip install -q -U \"openvino>=2024.5.0\" \"openvino-tokenizers>=2024.5.0\" \"openvino-genai>=2024.5.0\"\n",
"%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",
"%pip install -q -U \"yt_dlp>=2024.8.6\" soundfile librosa jiwer\n",
"%pip install -q -U \"yt_dlp>=2024.8.6\" soundfile librosa jiwer packaging\n",
"%pip install -q \"gradio>=4.19\" \"typing_extensions>=4.9\"\n",
"\n",
"if platform.system() == \"Darwin\":\n",
" %pip install -q \"numpy<2.0\""
" %pip install -q \"numpy<2.0\"\n",
"\n",
"\n",
"from packaging import version\n",
"\n",
"if (\n",
" importlib.util.find_spec(\"tensorflow\") is not None\n",
" and version.parse(importlib.metadata.version(\"tensorflow\")) < version.parse(\"2.18.0\")\n",
" and version.parse(importlib.metadata.version(\"numpy\")) >= version.parse(\"2.0.0\")\n",
"):\n",
" %pip uninstall -q -y tensorflow"
]
},
{
Expand Down Expand Up @@ -379,7 +391,10 @@
"metadata": {},
"outputs": [],
"source": [
"from moviepy.editor import VideoFileClip\n",
"try:\n",
" from moviepy import VideoFileClip\n",
"except ImportError:\n",
" from moviepy.editor import VideoFileClip\n",
"from transformers.pipelines.audio_utils import ffmpeg_read\n",
"\n",
"\n",
Expand Down
Loading