Skip to content

Commit 8e6c01f

Browse files
mryzhovmryzhov
authored
Merge branch 'master' into medium_runner
2 parents a0933a1 + 8f1f166 commit 8e6c01f

File tree

6 files changed

+119
-64
lines changed

6 files changed

+119
-64
lines changed

‎.github/dependency_review.yml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
fail-on-severity: 'low'
2+
allow-licenses:
3+
- 'BSD-2-Clause'
4+
- 'BSD-3-Clause'
5+
- 'MIT'
6+
- 'Apache-2.0'
7+
- 'ISC'
8+
- 'BlueOak-1.0.0'
9+
- '0BSD'
10+
- 'Python-2.0'
11+
fail-on-scopes:
12+
- 'runtime'
13+
- 'development'
14+
- 'unknown'
15+
license-check: true
16+
vulnerability-check: true

‎.github/workflows/genai-tools.yml

+1-55
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,6 @@ jobs:
7070
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
7171
with:
7272
python-version: ${{ matrix.python-version }}
73-
- name: Lint with flake8
74-
run: |
75-
python -m pip install --upgrade pip
76-
python -m pip install flake8 pytest black
77-
# stop the build if there are Python syntax errors or undefined names
78-
python -m flake8 ${{ env.LLM_BENCH_PYPATH }} --config=${{ env.LLM_BENCH_PYPATH }}/setup.cfg
7973
- name: Download OpenVINO package
8074
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
8175
with:
@@ -170,57 +164,9 @@ jobs:
170164
python ./tools/llm_bench/benchmark.py -m ./ov_models/tiny-random-llava -pf ./tools/llm_bench/prompts/llava-1.5-7b.jsonl -ic 4
171165
rm -rf ./ov_models
172166
173-
wwb:
174-
name: 'WWB tests'
175-
defaults:
176-
run:
177-
shell: bash
178-
runs-on: ubuntu-22.04-8-cores
179-
strategy:
180-
fail-fast: false
181-
matrix:
182-
python-version: ["3.11"]
183-
needs: [ openvino_download ]
184-
env:
185-
OV_INSTALL_DIR: ${{ github.workspace }}/ov
186-
SRC_DIR: ${{ github.workspace }}
187-
WWB_PATH: ${{ github.workspace }}/tools/who_what_benchmark
188-
189-
steps:
190-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
191-
with:
192-
submodules: recursive
193-
- name: Set up Python ${{ matrix.python-version }}
194-
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
195-
with:
196-
python-version: ${{ matrix.python-version }}
197-
- name: Lint with flake8
198-
run: |
199-
python -m pip install --upgrade pip
200-
python -m pip install flake8 pytest black
201-
# stop the build if there are Python syntax errors or undefined names
202-
python -m flake8 ${{ env.WWB_PATH }} --config=${{ env.WWB_PATH }}/setup.cfg
203-
- name: Download OpenVINO package
204-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
205-
with:
206-
name: ${{ needs.openvino_download.outputs.ov_artifact_name }}
207-
path: ${{ env.OV_INSTALL_DIR }}
208-
merge-multiple: true
209-
- name: Install dependencies
210-
run: |
211-
python -m pip install ${{ env.SRC_DIR }}/thirdparty/openvino_tokenizers -v ${{ needs.openvino_download.outputs.ov_wheel_source }}
212-
python -m pip install ${{ env.SRC_DIR }} -v ${{ needs.openvino_download.outputs.ov_wheel_source }}
213-
python -m pip install -r ${{ env.WWB_PATH }}/requirements.txt ${{ needs.openvino_download.outputs.ov_wheel_source }}
214-
python -m pip install git+https://github.com/huggingface/optimum-intel.git@main
215-
working-directory: ${{ env.OV_INSTALL_DIR }}
216-
- name: WWB Tests
217-
run: |
218-
python -m pip install -v ${{ env.WWB_PATH }}
219-
python -m pytest -v ${{ env.WWB_PATH }}/tests
220-
221167
Overall_Status:
222168
name: ci/gha_overall_status_llm_bench
223-
needs: [openvino_download, llm_bench, wwb]
169+
needs: [openvino_download, llm_bench]
224170
if: ${{ always() }}
225171
runs-on: ubuntu-latest
226172
steps:

‎.github/workflows/linux.yml

+11-4
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,17 @@ jobs:
335335
cmd: 'tests/python_tests/test_kv_cache_eviction.py'
336336
timeout: 60
337337
- name: 'LLM & VLM'
338-
cmd: 'tests/python_tests --ignore tests/python_tests/test_whisper_pipeline.py --ignore tests/python_tests/test_kv_cache_eviction.py --ignore tests/python_tests/test_whisper_pipeline_static.py'
339-
timeout: 90
338+
cmd: 'tests/python_tests/test_llm_pipeline.py tests/python_tests/test_llm_pipeline_static.py tests/python_tests/test_vlm_pipeline.py'
339+
timeout: 60
340+
- name: 'Tokenizer tests'
341+
cmd: 'tests/python_tests/test_tokenizer.py'
342+
timeout: 60
343+
- name: 'API tests'
344+
cmd: 'tests/python_tests/test_continuous_batching.py tests/python_tests/test_generation_config.py tests/python_tests/test_sampling.py tests/python_tests/test_text_streamer.py'
345+
timeout: 60
346+
- name: 'WWB tests'
347+
cmd: '/tools/who_what_benchmark/tests'
348+
timeout: 60
340349
defaults:
341350
run:
342351
shell: bash
@@ -351,8 +360,6 @@ jobs:
351360
INSTALL_DIR: ${{ github.workspace }}/install
352361
SRC_DIR: ${{ github.workspace }}/src
353362
BUILD_DIR: ${{ github.workspace }}/build
354-
TRANSFORMERS_CACHE: ${{ github.workspace }}/models # Hugging Face transformers cache
355-
HF_HOME: ${{ github.workspace }}/datasets # Hugging Face datasets cache
356363

357364
steps:
358365
- name: Clone openvino.genai

‎.github/workflows/mac.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,16 @@ jobs:
346346
timeout: 45
347347
- name: 'Cacheopt E2E'
348348
cmd: 'tests/python_tests/test_kv_cache_eviction.py'
349-
timeout: 60
349+
timeout: 60
350350
- name: 'LLM & VLM'
351-
cmd: 'tests/python_tests --ignore tests/python_tests/test_whisper_pipeline.py --ignore tests/python_tests/test_kv_cache_eviction.py --ignore tests/python_tests/test_whisper_pipeline_static.py'
352-
timeout: 90
351+
cmd: 'tests/python_tests/test_llm_pipeline.py tests/python_tests/test_llm_pipeline_static.py tests/python_tests/test_vlm_pipeline.py'
352+
timeout: 60
353+
- name: 'Tokenizer tests'
354+
cmd: 'tests/python_tests/test_tokenizer.py'
355+
timeout: 60
356+
- name: 'API tests'
357+
cmd: 'tests/python_tests/test_continuous_batching.py tests/python_tests/test_generation_config.py tests/python_tests/test_sampling.py tests/python_tests/test_text_streamer.py'
358+
timeout: 60
353359
defaults:
354360
run:
355361
shell: bash

‎.github/workflows/sdl.yml

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: SDL tests
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
merge_group:
6+
push:
7+
branches:
8+
- master
9+
- 'releases/**'
10+
11+
permissions: read-all
12+
13+
concurrency:
14+
# github.ref is not unique in post-commit
15+
group: ${{ github.event_name == 'push' && github.run_id || github.ref }}-linux-sdl
16+
cancel-in-progress: true
17+
18+
env:
19+
PYTHON_VERSION: '3.11'
20+
21+
jobs:
22+
sdl_tests:
23+
name: SDL tests
24+
timeout-minutes: 10
25+
defaults:
26+
run:
27+
shell: bash
28+
runs-on: ubuntu-latest
29+
permissions:
30+
actions: read
31+
contents: read
32+
security-events: write
33+
34+
steps:
35+
- name: Clone sources and tests
36+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
37+
38+
- name: Setup Python ${{ env.PYTHON_VERSION }}
39+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
40+
with:
41+
python-version: ${{ env.PYTHON_VERSION }}
42+
cache: 'pip'
43+
44+
- name: Install Python tests dependencies
45+
run: |
46+
python3 -m pip install flake8 pytest black bandit
47+
48+
- name: Lint with flake8 (WWB)
49+
run: |
50+
# stop the build if there are Python syntax errors or undefined names
51+
python -m flake8 . --config=./setup.cfg
52+
working-directory: ${{ github.workspace }}/tools/who_what_benchmark
53+
54+
- name: Lint with flake8 (LLM)
55+
run: |
56+
# stop the build if there are Python syntax errors or undefined names
57+
python -m flake8 . --config=./setup.cfg
58+
working-directory: ${{ github.workspace }}/tools/llm_bench
59+
60+
- name: Bandit tests
61+
run: python -m bandit --recursive --configfile bandit.yml .
62+
63+
- name: Run Trivy vulnerability scanner in fs mode
64+
uses: aquasecurity/trivy-action@18f2510ee396bbf400402947b394f2dd8c87dbb0 # v0.29.0
65+
with:
66+
scan-type: 'fs'
67+
scan-ref: '.'
68+
69+
- name: Dependency Review
70+
if: ${{ github.event_name == 'pull_request' }}
71+
uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0
72+
with:
73+
config-file: './.github/dependency_review.yml'
74+

‎.github/workflows/windows.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -381,8 +381,14 @@ jobs:
381381
cmd: 'tests/python_tests/test_kv_cache_eviction.py'
382382
timeout: 60
383383
- name: 'LLM & VLM'
384-
cmd: 'tests/python_tests --ignore tests/python_tests/test_whisper_pipeline.py --ignore tests/python_tests/test_whisper_pipeline_static.py --ignore tests/python_tests/test_kv_cache_eviction.py'
385-
timeout: 90
384+
cmd: 'tests/python_tests/test_llm_pipeline.py tests/python_tests/test_llm_pipeline_static.py tests/python_tests/test_vlm_pipeline.py'
385+
timeout: 60
386+
- name: 'Tokenizer tests'
387+
cmd: 'tests/python_tests/test_tokenizer.py'
388+
timeout: 60
389+
- name: 'API tests'
390+
cmd: 'tests/python_tests/test_continuous_batching.py tests/python_tests/test_generation_config.py tests/python_tests/test_sampling.py tests/python_tests/test_text_streamer.py'
391+
timeout: 60
386392
defaults:
387393
run:
388394
shell: pwsh

0 commit comments

Comments
 (0)