Skip to content

Commit 5dc54e9

Browse files
authored
[wwb][llm-bench] Fix version of required dependency in requirements.txt (openvinotoolkit#3314)
## Description - fix version of modules for wwb and llm_bench - removed separate requirements.txt for llm-bench (content from requirements_conversion.txt was added to main requirements, requirements_gptq.txt‎ was removed) - add extras_require for minicpm-o (to discuss) <!-- Jira ticket number (e.g., 123). Delete if there's no ticket. --> CVS-181062 ## Checklist: - [x] This PR follows GenAI Contributing guidelines. <!-- Always follow https://github.com/openvinotoolkit/openvino.genai?tab=contributing-ov-file#contributing. If there are deviations, explain what and why. --> - [NA] Tests have been updated or added to cover the new code. <!-- Specify exactly which tests were added or updated. If the change isn't maintenance related, update the tests at https://github.com/openvinotoolkit/openvino.genai/tree/master/tests or explain in the description why the tests don't need an update. --> - [x] This PR fully addresses the ticket. <!--- If not, explain clearly what is covered and what is not. If follow-up pull requests are needed, specify in the description. --> - [NA] I have made corresponding changes to the documentation. <!-- Run github.com/\<username>/openvino.genai/actions/workflows/deploy_gh_pages.yml on your fork with your branch as a parameter to deploy a test version with the updated content. Replace this comment with the link to the built docs. If the documentation is updated in a separate PR, clearly specify it. -->
1 parent fa9ff03 commit 5dc54e9

File tree

6 files changed

+77
-47
lines changed

6 files changed

+77
-47
lines changed

tools/llm_bench/requirements.txt

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,43 @@
11
--extra-index-url https://download.pytorch.org/whl/cpu
2-
numpy
2+
numpy==1.26.4; platform_system == "Darwin" and platform_machine == "x86_64"
3+
numpy>=1.16.6,<=2.4.2; platform_system != "Darwin" or platform_machine != "x86_64"
34
--extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
45
openvino
56
openvino-tokenizers
67
openvino_genai
7-
pillow
8-
torch
9-
transformers[sentencepiece]>=4.40.0
10-
diffusers>=0.22.0
11-
#optimum is in dependency list of optimum-intel
12-
optimum-intel[nncf]>=1.25.0
13-
packaging
8+
# Image processing for VLMs
9+
pillow==12.1.1
10+
torch>=2.1.0,<=2.10
11+
transformers[sentencepiece]>=4.40.0,<=4.57.0
12+
diffusers>=0.22.0,<=0.36.0
13+
# optimum is in dependency list of optimum-intel
14+
optimum-intel[nncf]>=1.25.0,<=1.27.0
15+
packaging>=20.0,<=26.0
1416
psutil
15-
timm
16-
tiktoken
17-
librosa # For Whisper
18-
matplotlib
19-
jinja2>=3.1.0
20-
scipy
21-
gguf_parser
22-
gguf>=0.10
23-
num2words
24-
opencv-python
17+
timm==1.0.24
18+
tiktoken>=0.3.0,<=0.12.0
19+
librosa==0.11.0 # For Whisper
20+
matplotlib>=3.3.4,<=3.10.8
21+
jinja2>=3.1.0,<=3.1.6
22+
# For text_rerank model types
23+
scipy>=1.3.2,<=1.17.0
24+
gguf_parser==0.1.1
25+
gguf>=0.10,<=0.17.1
26+
# For smolvlm2-256m-video-instruct model
27+
num2words==0.5.14
28+
# For video-to-text VLM sample
29+
opencv-python<=4.13.0.92
30+
# For Qwen
31+
bitsandbytes==0.49.1
32+
transformers_stream_generator==0.0.5
33+
einops==0.8.2
34+
# For microsoft/Phi-3.5-vision-instruct
35+
backoff==2.2.1
36+
# For openbmb/MiniCPM-o-2_6
37+
# Please, be advised that MiniCPM-o-2_6 requires transformers>=4.50,<=4.51.3
38+
vector-quantize-pytorch==1.27.20
39+
vocos==0.1.0
40+
torchaudio>=2.1.0,<=2.10.0
41+
torchcodec==0.7.0; sys_platform == "linux"
42+
torchvision>=0.16,<=0.25.0
43+
soundfile==0.13.1

tools/llm_bench/requirements/requirements_conversion.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

tools/llm_bench/requirements/requirements_gptq.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

tools/who_what_benchmark/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ PIP_PRE=1 \
3434
PIP_EXTRA_INDEX_URL=https://storage.openvinotoolkit.org/simple/wheels/nightly \
3535
pip install .
3636
```
37+
Some models require specific module versions, WWB supports installing certain configurations. For more information, please refer to `extras_require` in setup.py.
38+
For example:
39+
```
40+
pip install .[minicpm-o-2_6]
41+
```
3742

3843
## Usage
3944
### Compare Text-generation Models (LLMs)
Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
1-
accelerate>=0.26.0
2-
transformers>=4.35.2
3-
sentence-transformers>=2.2.2
1+
accelerate>=0.26.0,<=1.12.0
2+
transformers[sentencepiece]>=4.35.2,<=4.57.0
3+
sentence-transformers>=2.2.2,<=5.2.2
44
openvino-genai
5-
optimum-intel[nncf]>=1.19.0
6-
pandas>=2.0.3
7-
numpy>=1.23.5
8-
tqdm>=4.66.1
9-
diffusers
10-
datasets>=3.6.0
11-
sentencepiece
12-
jinja2>=3.1.0
13-
scipy
14-
opencv-python
15-
imageio[pyav]
16-
imageio-ffmpeg
17-
torchaudio
18-
torchvision
19-
soundfile
20-
librosa
21-
vocos
22-
vector_quantize_pytorch
23-
lpips
24-
scikit-image
5+
optimum-intel[nncf]>=1.19.0,<=1.27.0
6+
pandas>=2.0.3,<=2.3.1
7+
numpy==1.26.4; platform_system == "Darwin" and platform_machine == "x86_64"
8+
numpy>=1.16.6,<=2.4.2; platform_system != "Darwin" or platform_machine != "x86_64"
9+
tqdm>=4.66.1,<=4.67.1
10+
diffusers>=0.22.0,<=0.36.0
11+
datasets>=3.6.0,<=4.5.0
12+
jinja2>=3.1.0,<=3.1.6
13+
scipy>=1.3.2,<=1.17.0
14+
# For video-to-text VLM sample/VideoGen
15+
opencv-python<=4.13.0.92
16+
imageio[pyav]<=2.37.2
17+
imageio-ffmpeg<=0.6.0
18+
lpips==0.1.4
19+
scikit-image<=0.26.0
20+
# - openbmb/MiniCPM-o-2_6
21+
soundfile==0.13.1
22+
librosa==0.11.0
23+
torchcodec<=0.10.0; sys_platform == "linux"
24+
vocos==0.1.0
25+
vector-quantize-pytorch==1.27.20
26+
torchaudio>=2.1.0,<=2.10.0
27+
torchvision>=0.16,<=0.25.0

tools/who_what_benchmark/setup.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,13 @@ def set_version(base_version: str):
4343
install_requires=required,
4444
entry_points={"console_scripts": ["wwb=whowhatbench.wwb:main"]},
4545
package_data={"whowhatbench": ["prompts/*.yaml", "prompts/*.json"]},
46+
extras_require={
47+
"minicpm-o-2_6": [
48+
"torch==2.10.0",
49+
"torchvision==0.25.0",
50+
"torchaudio==2.10.0",
51+
"transformers>=4.50,<=4.51.3",
52+
"optimum-intel==1.27.0",
53+
],
54+
},
4655
)

0 commit comments

Comments
 (0)