Skip to content

Commit 13f1b44

Browse files
ilya-lavrenovilya-lavrenov
authored
Try to drop --pre (openvinotoolkit#1269)
- `--pre` is not required for OpenVINO wheels as `~=2025.0.0.0.dev` already ensures that pre-releases can be installed - `--pre` affects all other packages, which leads to installation of unstable versions and broken whisper CI https://github.com/openvinotoolkit/openvino.genai/actions/runs/12056078081/job/33618027551?pr=1267
1 parent 86068a5 commit 13f1b44

10 files changed

+49
-51
lines changed

‎.github/actions/install_python_deps/action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ runs:
1111
shell: bash
1212
run: |
1313
source ${{ inputs.ov_dir }}/setupvars.sh
14-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
15-
python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt
14+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
15+
python -m pip install -r ./samples/requirements.txt

‎.github/workflows/causal_lm_cpp.yml

+30-30
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ jobs:
4646
- name: Download and convert and model
4747
run: |
4848
source ./ov/setupvars.sh
49-
python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt
50-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
49+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
50+
python -m pip install -r ./samples/requirements.txt
5151
optimum-cli export openvino --trust-remote-code --weight-format fp16 --model openlm-research/open_llama_3b_v2 open_llama_3b_v2
5252
optimum-cli export openvino -m TinyLlama/TinyLlama-1.1B-intermediate-step-1431k-3T TinyLlama/TinyLlama-1.1B-intermediate-step-1431k-3T
5353
wget https://huggingface.co/smangrul/tinyllama_lora_sql/resolve/main/adapter_model.safetensors?download=true -O adapter_model.safetensors
@@ -105,8 +105,8 @@ jobs:
105105
- name: Download and convert and model
106106
run: |
107107
source ./ov/setupvars.sh
108-
python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt
109-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
108+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
109+
python -m pip install -r ./samples/requirements.txt
110110
optimum-cli export openvino --trust-remote-code --weight-format fp16 --model TinyLlama/TinyLlama-1.1B-Chat-v1.0 TinyLlama-1.1B-Chat-v1.0
111111
- name: Compare
112112
env:
@@ -241,8 +241,8 @@ jobs:
241241
- name: Download and convert model
242242
run: |
243243
call .\ov\setupvars.bat
244-
python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt
245-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
244+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
245+
python -m pip install -r ./samples/requirements.txt
246246
optimum-cli export openvino --trust-remote-code --weight-format fp16 --model TinyLlama/TinyLlama-1.1B-Chat-v1.0 TinyLlama-1.1B-Chat-v1.0
247247
optimum-cli export openvino -m TinyLlama/TinyLlama-1.1B-intermediate-step-1431k-3T TinyLlama/TinyLlama-1.1B-intermediate-step-1431k-3T
248248
curl -o adapter_model.safetensors -s -L https://huggingface.co/smangrul/tinyllama_lora_sql/resolve/main/adapter_model.safetensors?download=true
@@ -299,8 +299,8 @@ jobs:
299299
- name: Download and convert and model
300300
run: |
301301
source ./ov/setupvars.sh
302-
python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt
303-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
302+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
303+
python -m pip install -r ./samples/requirements.txt
304304
optimum-cli export openvino --trust-remote-code --weight-format fp16 --model Qwen/Qwen-7B-Chat Qwen-7B-Chat
305305
- run: >
306306
. ./ov/setupvars.sh
@@ -333,8 +333,8 @@ jobs:
333333
- name: Download and convert and model
334334
run: |
335335
source ./ov/setupvars.sh
336-
python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt
337-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
336+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
337+
python -m pip install -r ./samples/requirements.txt
338338
optimum-cli export openvino --trust-remote-code --weight-format fp16 --model Qwen/Qwen1.5-7B-Chat Qwen1.5-7B-Chat
339339
- run: >
340340
. ./ov/setupvars.sh
@@ -368,8 +368,8 @@ jobs:
368368
- name: Download and convert and model
369369
run: |
370370
source ./ov/setupvars.sh
371-
python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt
372-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
371+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
372+
python -m pip install -r ./samples/requirements.txt
373373
optimum-cli export openvino --trust-remote-code --weight-format fp16 --model microsoft/phi-2 phi-2
374374
- run: >
375375
. ./ov/setupvars.sh
@@ -403,8 +403,8 @@ jobs:
403403
- name: Download and convert and model
404404
run: |
405405
source ./ov/setupvars.sh
406-
python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt
407-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
406+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
407+
python -m pip install -r ./samples/requirements.txt
408408
optimum-cli export openvino --trust-remote-code --weight-format fp16 --model argilla/notus-7b-v1 notus-7b-v1
409409
- run: >
410410
. ./ov/setupvars.sh
@@ -438,8 +438,8 @@ jobs:
438438
- name: Download and convert and model
439439
run: |
440440
source ./ov/setupvars.sh
441-
python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt
442-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
441+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
442+
python -m pip install -r ./samples/requirements.txt
443443
optimum-cli export openvino --trust-remote-code --weight-format fp16 --model databricks/dolly-v2-3b dolly-v2-3b
444444
optimum-cli export openvino --trust-remote-code --weight-format fp16 --model databricks/dolly-v2-7b dolly-v2-7b
445445
- name: run and compare
@@ -488,8 +488,8 @@ jobs:
488488
- name: Download and convert and model
489489
run: |
490490
source ./ov/setupvars.sh
491-
python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt
492-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
491+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
492+
python -m pip install -r ./samples/requirements.txt
493493
optimum-cli export openvino --trust-remote-code --weight-format fp16 --model TinyLlama/TinyLlama-1.1B-Chat-v1.0 TinyLlama-1.1B-Chat-v1.0
494494
optimum-cli export openvino --trust-remote-code --weight-format fp16 --model Qwen/Qwen-7B-Chat Qwen-7B-Chat --task text-generation-with-past
495495
- name: run and compare
@@ -560,8 +560,8 @@ jobs:
560560
- name: Download and convert and model
561561
run: |
562562
source ./ov/setupvars.sh
563-
python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt
564-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
563+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
564+
python -m pip install -r ./samples/requirements.txt
565565
optimum-cli export openvino --trust-remote-code --weight-format fp16 --model microsoft/phi-1_5 phi-1_5
566566
- name: Run Generation
567567
run: |
@@ -615,8 +615,8 @@ jobs:
615615
- name: Download and convert and model
616616
run: |
617617
source ./ov/setupvars.sh
618-
python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt
619-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
618+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
619+
python -m pip install -r ./samples/requirements.txt
620620
optimum-cli export openvino --trust-remote-code --weight-format fp16 --model ikala/redpajama-3b-chat redpajama-3b-chat
621621
- name: Run Generation
622622
run: |
@@ -670,8 +670,8 @@ jobs:
670670
- name: Download and convert and model
671671
run: |
672672
source ./ov/setupvars.sh
673-
python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt
674-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
673+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
674+
python -m pip install -r ./samples/requirements.txt
675675
optimum-cli export openvino --trust-remote-code --weight-format fp16 --model TinyLlama/TinyLlama-1.1B-Chat-v1.0 TinyLlama-1.1B-Chat-v1.0
676676
- name: Compare
677677
env:
@@ -863,8 +863,8 @@ jobs:
863863
- name: Download and convert and model
864864
run: |
865865
source ./ov/setupvars.sh
866-
python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt
867-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
866+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
867+
python -m pip install -r ./samples/requirements.txt
868868
optimum-cli export openvino --trust-remote-code --weight-format fp16 --model TinyLlama/TinyLlama-1.1B-Chat-v1.0 TinyLlama-1.1B-Chat-v1.0
869869
- name: Run gtests
870870
run: |
@@ -909,8 +909,8 @@ jobs:
909909
- name: Download and convert and model
910910
run: |
911911
call .\ov\setupvars.bat
912-
python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt
913-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
912+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
913+
python -m pip install -r ./samples/requirements.txt
914914
optimum-cli export openvino --trust-remote-code --weight-format fp16 --model TinyLlama/TinyLlama-1.1B-Chat-v1.0 TinyLlama-1.1B-Chat-v1.0
915915
- name: Run gtests
916916
run: |
@@ -954,8 +954,8 @@ jobs:
954954
- name: Download and convert and model
955955
run: |
956956
source ./ov/setupvars.sh
957-
python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt
958-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
957+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
958+
python -m pip install -r ./samples/requirements.txt
959959
optimum-cli export openvino --trust-remote-code --weight-format fp16 --model TinyLlama/TinyLlama-1.1B-Chat-v1.0 TinyLlama-1.1B-Chat-v1.0
960960
- name: Run gtests
961961
run: |

‎.github/workflows/lcm_dreamshaper_cpp.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Install python dependencies
6060
run: |
6161
source openvino_lcm_cpp/bin/activate
62-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
62+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
6363
python -m pip install -r ./samples/requirements.txt
6464
6565
- name: Download and convert models and tokenizer
@@ -119,7 +119,7 @@ jobs:
119119
- name: Install python dependencies
120120
run: |
121121
. "./openvino_lcm_cpp/Scripts/Activate.ps1"
122-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
122+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
123123
python -m pip install -r ./samples/requirements.txt
124124
125125
- name: Download and convert models and tokenizer

‎.github/workflows/linux.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ jobs:
258258
- name: Test bindings
259259
run: |
260260
source ${OV_INSTALL_DIR}/setupvars.sh
261-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./tests/python_tests/requirements.txt --find-links ${OV_INSTALL_DIR}/wheels --upgrade-strategy eager
261+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./tests/python_tests/requirements.txt --find-links ${OV_INSTALL_DIR}/wheels
262262
python -m pytest -v ./tests/python_tests/test_chat_generate_api.py::test_set_chat_template
263263
env:
264264
PYTHONPATH: "./build/:$PYTHONPATH"
@@ -349,7 +349,7 @@ jobs:
349349
- name: Test bindings
350350
run: |
351351
source ${OV_INSTALL_DIR}/setupvars.sh
352-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./tests/python_tests/requirements.txt --find-links ${OV_INSTALL_DIR}/wheels --upgrade-strategy eager
352+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./tests/python_tests/requirements.txt --find-links ${OV_INSTALL_DIR}/wheels
353353
python -m pytest -v ./tests/python_tests/test_whisper_generate_api.py -k test_smoke
354354
env:
355355
PYTHONPATH: "./build/:$PYTHONPATH"
@@ -437,7 +437,7 @@ jobs:
437437
run: |
438438
source ${OV_INSTALL_DIR}/setupvars.sh
439439
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --find-links ${OV_INSTALL_DIR}/wheels
440-
python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt --find-links ${OV_INSTALL_DIR}/wheels
440+
python -m pip install -r ./samples/requirements.txt --find-links ${OV_INSTALL_DIR}/wheels
441441
optimum-cli export openvino --trust-remote-code --model TinyLlama/TinyLlama-1.1B-Chat-v1.0 TinyLlama-1.1B-Chat-v1.0
442442
optimum-cli export openvino --trust-remote-code --model openai/whisper-tiny whisper-tiny
443443

‎.github/workflows/mac.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ jobs:
224224
- name: Test bindings
225225
run: |
226226
source ${OV_INSTALL_DIR}/setupvars.sh
227-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./tests/python_tests/requirements.txt --find-links ${OV_INSTALL_DIR}/wheels --upgrade-strategy eager
227+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./tests/python_tests/requirements.txt --find-links ${OV_INSTALL_DIR}/wheels
228228
python -m pytest -v ./tests/python_tests/test_chat_generate_api.py::test_set_chat_template
229229
env:
230230
PYTHONPATH: "./build/:$PYTHONPATH"
@@ -288,7 +288,7 @@ jobs:
288288
- name: Test bindings
289289
run: |
290290
source ${OV_INSTALL_DIR}/setupvars.sh
291-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./tests/python_tests/requirements.txt --find-links ${OV_INSTALL_DIR}/wheels --upgrade-strategy eager
291+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./tests/python_tests/requirements.txt --find-links ${OV_INSTALL_DIR}/wheels
292292
python -m pytest -v ./tests/python_tests/test_whisper_generate_api.py -k test_smoke
293293
env:
294294
PYTHONPATH: "./build/:$PYTHONPATH"
@@ -354,7 +354,7 @@ jobs:
354354
run: |
355355
source ${OV_INSTALL_DIR}/setupvars.sh
356356
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --find-links ${OV_INSTALL_DIR}/wheels
357-
python -m pip install --upgrade-strategy eager -r ./samples/requirements.txt --find-links ${OV_INSTALL_DIR}/wheels
357+
python -m pip install -r ./samples/requirements.txt --find-links ${OV_INSTALL_DIR}/wheels
358358
optimum-cli export openvino --trust-remote-code --model TinyLlama/TinyLlama-1.1B-Chat-v1.0 TinyLlama-1.1B-Chat-v1.0
359359
optimum-cli export openvino --trust-remote-code --model openai/whisper-tiny whisper-tiny
360360

‎.github/workflows/stable_diffusion_1_5_cpp.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Install python dependencies
6060
run: |
6161
source openvino_sd_cpp/bin/activate
62-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
62+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
6363
python -m pip install -r ./samples/requirements.txt
6464
6565
- name: Download and convert models and tokenizer
@@ -133,7 +133,7 @@ jobs:
133133
- name: Install python dependencies
134134
run: |
135135
. "./openvino_sd_cpp/Scripts/Activate.ps1"
136-
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --pre --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
136+
python -m pip install ./thirdparty/openvino_tokenizers/[transformers] --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
137137
python -m pip install -r ./samples/requirements.txt
138138
139139
- name: Download and convert models and tokenizer

0 commit comments

Comments
 (0)