Skip to content

Commit afb4ad0

Browse files
ilya-lavrenovilya-lavrenov
authored
Removed WAs for OpenVINO: pass properties as is (#1396)
Merge after openvinotoolkit/openvino#28066
1 parent b041c15 commit afb4ad0

37 files changed

+141
-184
lines changed

‎.github/workflows/causal_lm_cpp.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ concurrency:
1616
cancel-in-progress: true
1717

1818
env:
19-
l_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17709-688f0428cfc/l_openvino_toolkit_ubuntu20_2025.0.0.dev20241224_x86_64.tgz
20-
l_u22_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17709-688f0428cfc/l_openvino_toolkit_ubuntu22_2025.0.0.dev20241224_x86_64.tgz
21-
m_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17709-688f0428cfc/m_openvino_toolkit_macos_12_6_2025.0.0.dev20241224_x86_64.tgz
22-
w_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17709-688f0428cfc/w_openvino_toolkit_windows_2025.0.0.dev20241224_x86_64.zip
19+
l_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17726-9ab2c1a18e7/l_openvino_toolkit_ubuntu20_2025.0.0.dev20241230_x86_64.tgz
20+
l_u22_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17726-9ab2c1a18e7/l_openvino_toolkit_ubuntu22_2025.0.0.dev20241230_x86_64.tgz
21+
m_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17726-9ab2c1a18e7/m_openvino_toolkit_macos_12_6_2025.0.0.dev20241230_x86_64.tgz
22+
w_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17726-9ab2c1a18e7/w_openvino_toolkit_windows_2025.0.0.dev20241230_x86_64.zip
2323
jobs:
2424
cpp-multinomial-greedy_causal_lm-ubuntu:
2525
runs-on: ubuntu-20.04-8-cores

‎.github/workflows/job_vlm_sample_llava.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
type: string
1212

1313
env:
14-
l_u22_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17709-688f0428cfc/l_openvino_toolkit_ubuntu22_2025.0.0.dev20241224_x86_64.tgz
14+
l_u22_ov_link: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17726-9ab2c1a18e7/l_openvino_toolkit_ubuntu22_2025.0.0.dev20241230_x86_64.tgz
1515

1616
jobs:
1717
visual_language_chat_sample-ubuntu-llava:

‎.github/workflows/lcm_dreamshaper_cpp.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ concurrency:
1818

1919
env:
2020
PYTHON_VERSION: '3.9'
21-
LINUX_OV_ARCHIVE_URL: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17709-688f0428cfc/l_openvino_toolkit_ubuntu22_2025.0.0.dev20241224_x86_64.tgz
22-
WINDOWS_OV_ARCHIVE_URL: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17709-688f0428cfc/w_openvino_toolkit_windows_2025.0.0.dev20241224_x86_64.zip
21+
LINUX_OV_ARCHIVE_URL: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17726-9ab2c1a18e7/l_openvino_toolkit_ubuntu22_2025.0.0.dev20241230_x86_64.tgz
22+
WINDOWS_OV_ARCHIVE_URL: https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2025.0.0-17726-9ab2c1a18e7/w_openvino_toolkit_windows_2025.0.0.dev20241230_x86_64.zip
2323
OV_INSTALL_DIR: ${{ github.workspace }}/ov
2424

2525
jobs:

‎.github/workflows/linux.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ jobs:
109109
merge-multiple: true
110110

111111
- name: CMake Build
112-
run: |
112+
run: |
113113
source ${{ env.OV_INSTALL_DIR }}/setupvars.sh
114114
cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -S ${{ env.SRC_DIR}} -B ${{ env.BUILD_DIR }}
115-
cmake --build ${{ env.BUILD_DIR}} --config ${{ matrix.build-type }} --parallel $(nproc)
115+
cmake --build ${{ env.BUILD_DIR}} --config ${{ matrix.build-type }} --parallel $(nproc) --verbose
116116
cmake --install ${{ env.BUILD_DIR }} --config ${{ matrix.build-type }} --prefix ${{ env.INSTALL_DIR }}
117117
118118
- name: Pack Artifacts

‎.github/workflows/mac.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ jobs:
219219
run: |
220220
source ${OV_INSTALL_DIR}/setupvars.sh
221221
cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/
222-
cmake --build ./build/ --config Release -j
222+
cmake --build ./build/ --config Release --parallel --verbose
223223
224224
- name: Test bindings
225225
run: |
@@ -284,7 +284,7 @@ jobs:
284284
run: |
285285
source ${OV_INSTALL_DIR}/setupvars.sh
286286
cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/
287-
cmake --build ./build/ --config Release --target py_openvino_genai -j
287+
cmake --build ./build/ --config Release --target py_openvino_genai --parallel --verbose
288288
289289
- name: Test bindings
290290
run: |
@@ -350,7 +350,7 @@ jobs:
350350
run: |
351351
source ${OV_INSTALL_DIR}/setupvars.sh
352352
cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -S ./ -B ./build/
353-
cmake --build ./build/ --config ${{ matrix.build-type }} --target package -j
353+
cmake --build ./build/ --config ${{ matrix.build-type }} --target package --parallel --verbose
354354
355355
- name: Build and Install dependencies
356356
run: |

‎.github/workflows/stable_diffusion_1_5_cpp.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ jobs:
122122
source openvino_sd_cpp/bin/activate
123123
optimum-cli export openvino --model dreamlike-art/dreamlike-anime-1.0 --weight-format fp16 --task stable-diffusion models/dreamlike-art-dreamlike-anime-1.0/FP16
124124
wget -O ./models/soulcard.safetensors https://civitai.com/api/download/models/72591
125+
env:
126+
HF_HUB_ENABLE_HF_TRANSFER: 1
125127

126128
- name: Run text2image app
127129
run: |
@@ -198,6 +200,8 @@ jobs:
198200
. "./openvino_sd_cpp/Scripts/Activate.ps1"
199201
optimum-cli export openvino --model dreamlike-art/dreamlike-anime-1.0 --task stable-diffusion --weight-format fp16 models/dreamlike-art-dreamlike-anime-1.0/FP16
200202
Invoke-WebRequest -Uri 'https://civitai.com/api/download/models/72591' -OutFile 'models/soulcard.safetensors'
203+
env:
204+
HF_HUB_ENABLE_HF_TRANSFER: 1
201205

202206
- name: Run text2image app
203207
run: |

‎.github/workflows/windows.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ jobs:
230230
run: |
231231
. "${{ env.OV_INSTALL_DIR }}/setupvars.ps1"
232232
cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/
233-
cmake --build ./build/ --config Release -j
233+
cmake --build ./build/ --config Release --parallel --verbose
234234
235235
- name: Test bindings
236236
run: |
@@ -295,7 +295,7 @@ jobs:
295295
run: |
296296
. "${{ env.OV_INSTALL_DIR }}/setupvars.ps1"
297297
cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/
298-
cmake --build ./build/ --config Release --target py_openvino_genai -j
298+
cmake --build ./build/ --config Release --target py_openvino_genai --parallel --verbose
299299
300300
- name: Test bindings
301301
run: |
@@ -360,7 +360,7 @@ jobs:
360360
run: |
361361
. "${{ env.OV_INSTALL_DIR }}/setupvars.ps1"
362362
cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/
363-
cmake --build ./build/ --config Release --target py_openvino_genai -j
363+
cmake --build ./build/ --config Release --target py_openvino_genai --parallel --verbose
364364
365365
- name: Test bindings
366366
run: |

‎CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ if(MSVC AND MSVC_VERSION GREATER_EQUAL 1930 AND MSVC_VERSION LESS 1941)
8585
add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
8686
endif()
8787

88-
8988
add_subdirectory(thirdparty)
9089
add_subdirectory(src)
9190
if(EXISTS "${OpenVINOGenAI_SOURCE_DIR}/samples")

‎samples/export-requirements.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ diffusers==0.32.1 # For image generation pipelines
1010
timm==1.0.12 # For exporting InternVL2
1111
torchvision # For visual language models
1212
transformers>=4.43 # For Whisper
13+
hf_transfer # for faster models download, should used with env var HF_HUB_ENABLE_HF_TRANSFER=1

‎src/cpp/CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,13 @@ ov_genai_build_jinja2cpp()
5959
file(GLOB_RECURSE SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/src/*.c")
6060

6161
set(TARGET_NAME openvino_genai)
62+
6263
add_library(${TARGET_NAME} SHARED ${SOURCE_FILES})
64+
add_library(openvino::genai ALIAS ${TARGET_NAME})
65+
6366
if(TARGET openvino_tokenizers)
6467
add_dependencies(${TARGET_NAME} openvino_tokenizers)
6568
endif()
66-
add_library(openvino::genai ALIAS ${TARGET_NAME})
6769

6870
target_include_directories(${TARGET_NAME}
6971
PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" "$<INSTALL_INTERFACE:runtime/include>"
@@ -81,6 +83,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES
8183
LIBRARY_OUTPUT_DIRECTORY "$<1:${CMAKE_BINARY_DIR}/openvino_genai/>"
8284
RUNTIME_OUTPUT_DIRECTORY "$<1:${CMAKE_BINARY_DIR}/openvino_genai/>"
8385
)
86+
8487
# Extract two last digits from OpenVINOGenAI_VERSION_MAJOR because SOVERSION can only contain up to 4 symbols.
8588
string(REGEX MATCH [=[[0-9][0-9]$]=] MAJOR_SUFFIX ${OpenVINOGenAI_VERSION_MAJOR})
8689
if(DEFINED PY_BUILD_CMAKE_PACKAGE_NAME AND LINUX)

0 commit comments

Comments
 (0)