Skip to content

Commit 22eb791

Browse files
committed
test ubuntu
1 parent 14413f2 commit 22eb791

File tree

4 files changed

+28
-23
lines changed

4 files changed

+28
-23
lines changed

.github/workflows/genai_package.yml

+18-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: genai_package
22
on: pull_request
33
jobs:
4-
genai_package_ubuntu:
4+
ubuntu_genai_package:
55
runs-on: ubuntu-20.04
66
steps:
77
- uses: actions/checkout@v4
@@ -11,12 +11,18 @@ jobs:
1111
with:
1212
python-version: 3.8
1313
- run: mkdir ./ov/
14-
- run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2024.1.0-14758-22bd6ff0494/l_openvino_toolkit_centos7_2024.1.0.dev20240315_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz # Install CentOS7 instead of Ubuntu to match PyPI distribution ABI
14+
- run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2024.2.0-15349-765302e0de1/l_openvino_toolkit_ubuntu20_2024.2.0.dev20240515_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz
1515
- run: sudo ./ov/install_dependencies/install_openvino_dependencies.sh
1616
- run: source ./ov/setupvars.sh && cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/
1717
- run: source ./ov/setupvars.sh && cmake --build ./build/ --config Release --target package -j
18+
- run: source ./ov/setupvars.sh && cmake --install ./build/ --config Release --prefix ov
19+
- run: ov/samples/cpp/build_samples.sh -b "${{ github.workspace }}/s pace"
20+
- run: source ./ov/setupvars.sh && python -m pip install --upgrade-strategy eager -r text_generation/causal_lm/cpp/requirements.txt
21+
- run: source ./ov/setupvars.sh && python -m pip install ./thirdparty/openvino_tokenizers/[transformers]
22+
- run: source ./ov/setupvars.sh && optimum-cli export openvino --trust-remote-code --weight-format fp16 --model TinyLlama/TinyLlama-1.1B-Chat-v1.0 TinyLlama-1.1B-Chat-v1.0
23+
- run: source ./ov/setupvars.sh && timeout 50s "${{ github.workspace }}/s pace/intel64/Release/greedy_causal_lm" .\TinyLlama-1.1B-Chat-v1.0\ ""
1824

19-
genai_package_windows:
25+
windows_genai_package:
2026
runs-on: windows-latest
2127
defaults:
2228
run:
@@ -28,13 +34,13 @@ jobs:
2834
- uses: actions/setup-python@v4
2935
with:
3036
python-version: 3.8
31-
- run: curl --output ov.zip https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2024.1.0-14645-e6dc0865128/w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64.zip
37+
- run: curl --output ov.zip https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2024.2.0-15349-765302e0de1/w_openvino_toolkit_windows_2024.2.0.dev20240515_x86_64.zip
3238
- run: unzip ov.zip
33-
- run: call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/
34-
- run: call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && cmake --build ./build/ --config Release --target package -j
35-
- run: call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && cmake --install ./build/ --config Release --prefix w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64
36-
- run: call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\samples\cpp\build_samples_msvc.bat -b ${{ github.workspace }}/samples-build
37-
- run: call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && python -m pip install --upgrade-strategy eager -r text_generation/causal_lm/cpp/requirements.txt
38-
- run: call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && python -m pip install ./thirdparty/openvino_tokenizers/[transformers]
39-
- run: call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && optimum-cli export openvino --trust-remote-code --weight-format fp16 --model TinyLlama/TinyLlama-1.1B-Chat-v1.0 TinyLlama-1.1B-Chat-v1.0
40-
- run: call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && ${{ github.workspace }}/samples-build/intel64/Release/greedy_causal_lm .\TinyLlama-1.1B-Chat-v1.0\ ""
39+
- run: call w_openvino_toolkit_windows_2024.2.0.dev20240515_x86_64\setupvars.bat && cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/
40+
- run: call w_openvino_toolkit_windows_2024.2.0.dev20240515_x86_64\setupvars.bat && cmake --build ./build/ --config Release --target package -j
41+
- run: call w_openvino_toolkit_windows_2024.2.0.dev20240515_x86_64\setupvars.bat && cmake --install ./build/ --config Release --prefix w_openvino_toolkit_windows_2024.2.0.dev20240515_x86_64
42+
- run: call w_openvino_toolkit_windows_2024.2.0.dev20240515_x86_64\samples\cpp\build_samples.ps1 -b "${{ github.workspace }}/s pace"
43+
- run: call w_openvino_toolkit_windows_2024.2.0.dev20240515_x86_64\setupvars.bat && python -m pip install --upgrade-strategy eager -r text_generation/causal_lm/cpp/requirements.txt
44+
- run: call w_openvino_toolkit_windows_2024.2.0.dev20240515_x86_64\setupvars.bat && python -m pip install ./thirdparty/openvino_tokenizers/[transformers]
45+
- run: call w_openvino_toolkit_windows_2024.2.0.dev20240515_x86_64\setupvars.bat && optimum-cli export openvino --trust-remote-code --weight-format fp16 --model TinyLlama/TinyLlama-1.1B-Chat-v1.0 TinyLlama-1.1B-Chat-v1.0
46+
- run: call w_openvino_toolkit_windows_2024.2.0.dev20240515_x86_64\setupvars.bat && "${{ github.workspace }}/s pace/intel64/Release/greedy_causal_lm" .\TinyLlama-1.1B-Chat-v1.0\ ""
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
name: genai_lib
1+
name: genai_python_lib
22
on: pull_request
33
jobs:
4-
genai_lib_ubuntu:
4+
ubuntu_genai_python_lib:
55
runs-on: ubuntu-20.04
66
steps:
77
- uses: actions/checkout@v4
@@ -11,7 +11,7 @@ jobs:
1111
with:
1212
python-version: 3.8
1313
- run: mkdir ./ov/
14-
- run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2024.1.0-14758-22bd6ff0494/l_openvino_toolkit_centos7_2024.1.0.dev20240315_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz # Install CentOS7 instead of Ubuntu to match PyPI distribution ABI
14+
- run: curl https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2024.2.0-15349-765302e0de1/l_openvino_toolkit_centos7_2024.2.0.dev20240515_x86_64.tgz | tar --directory ./ov/ --strip-components 1 -xz # Install CentOS7 instead of Ubuntu to match PyPI distribution ABI
1515
- run: sudo ./ov/install_dependencies/install_openvino_dependencies.sh
1616
- run: source ./ov/setupvars.sh && cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/
1717
- run: source ./ov/setupvars.sh && cmake --build ./build/ --config Release -j
@@ -20,7 +20,7 @@ jobs:
2020
- run: source ./ov/setupvars.sh && python -m pip install --pre . --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/nightly
2121
- run: python -c "from openvino_genai.py_generate_pipeline import LLMPipeline"
2222

23-
genai_lib_windows:
23+
windows_genai_python_lib:
2424
runs-on: windows-latest
2525
defaults:
2626
run:
@@ -32,11 +32,11 @@ jobs:
3232
- uses: actions/setup-python@v4
3333
with:
3434
python-version: 3.8
35-
- run: curl --output ov.zip https://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2024.1.0-14645-e6dc0865128/w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64.zip
35+
- run: curl --output ov.ziphttps://storage.openvinotoolkit.org/repositories/openvino/packages/nightly/2024.2.0-15349-765302e0de1/w_openvino_toolkit_windows_2024.2.0.dev20240515_x86_64.zip
3636
- run: unzip ov.zip
37-
- run: call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/
38-
- run: call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && cmake --build ./build/ --config Release -j
37+
- run: call /w_openvino_toolkit_windows_2024.2.0.dev20240515_x86_64\setupvars.bat && cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/
38+
- run: call /w_openvino_toolkit_windows_2024.2.0.dev20240515_x86_64\setupvars.bat && cmake --build ./build/ --config Release -j
3939
- run: python -m pip install "numpy<1.27"
40-
- run: set "PYTHONPATH=./src/python;" && call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && python -c "from openvino_genai.py_generate_pipeline import LLMPipeline" # cmd evaluates variables in a different way. Setting PYTHONPATH before setupvars.bat instead of doing that after solves that.
41-
- run: call w_openvino_toolkit_windows_2024.1.0.dev20240304_x86_64\setupvars.bat && python -m pip install .
40+
- run: set "PYTHONPATH=./src/python;" && call /w_openvino_toolkit_windows_2024.2.0.dev20240515_x86_64\setupvars.bat && python -c "from openvino_genai.py_generate_pipeline import LLMPipeline" # cmd evaluates variables in a different way. Setting PYTHONPATH before setupvars.bat instead of doing that after solves that.
41+
- run: call /w_openvino_toolkit_windows_2024.2.0.dev20240515_x86_64\setupvars.bat && python -m pip install .
4242
- run: python -c "from openvino_genai.py_generate_pipeline import LLMPipeline"

src/python/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,3 @@ add_custom_command(TARGET py_generate_pipeline POST_BUILD
4343
"$<TARGET_FILE:py_generate_pipeline>"
4444
"${CMAKE_CURRENT_SOURCE_DIR}/openvino_genai/$<TARGET_FILE_NAME:py_generate_pipeline>"
4545
COMMENT "Copy py_generate_pipeline to src/python/openvino_genai/")
46-
# TODO: install python into archive

text_generation/causal_lm/cpp/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ endif()
1212

1313
find_package(openvino_genai REQUIRED PATHS
1414
"${CMAKE_BINARY_DIR}" # Reuse the package from the build.
15-
# ${OpenVINO_DIR} # GenAI may be installed alogside OpenVINO.
15+
${OpenVINO_DIR} # GenAI may be installed alogside OpenVINO.
1616
)
1717

1818
add_executable(greedy_causal_lm greedy_causal_lm.cpp)

0 commit comments

Comments
 (0)