Skip to content

Commit

Permalink
Merge branch 'generate_pipeline' into update-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Wovchena committed May 29, 2024
2 parents f5a95d9 + 88c44fe commit 5fd221b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/genai_python_lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ jobs:
# GitHub Actions already provides what is listed in ./requirements-build.txt but the internal
# build system doesn't. Install ./requirements-build.txt to detect possible conflicts.
- run: source ./ov/setupvars.sh && python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./requirements-build.txt -r ./tests/python_tests/requirements.txt --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/pre-release --verbose --verbose --verbose
- run: source ./ov/setupvars.sh && PYTHONPATH=./build/:$PYTHONPATH python -c "from openvino_genai import LLMPipeline"
- run: source ./ov/setupvars.sh && PYTHONPATH=./build/:$PYTHONPATH python3 -m pytest ./tests/python_tests/test_generate_api.py
- run: source ./ov/setupvars.sh && PYTHONPATH=./build/:$PYTHONPATH python -m pytest ./tests/python_tests/test_generate_api.py
- run: source ./ov/setupvars.sh && python -m pip install . --config-settings=build-dir="build" --verbose --verbose --verbose
- run: python3 -m pytest ./tests/python_tests/test_generate_api.py
- run: python -m pytest ./tests/python_tests/test_generate_api.py

windows_genai_python_lib:
runs-on: windows-latest
Expand All @@ -49,6 +48,6 @@ jobs:
- run: call w_openvino_toolkit_windows_2024.2.0.dev20240524_x86_64\setupvars.bat && cmake -DCMAKE_BUILD_TYPE=Release -S ./ -B ./build/
- run: call w_openvino_toolkit_windows_2024.2.0.dev20240524_x86_64\setupvars.bat && cmake --build ./build/ --config Release -j
- run: call w_openvino_toolkit_windows_2024.2.0.dev20240524_x86_64\setupvars.bat && python -m pip install ./thirdparty/openvino_tokenizers/[transformers] -r ./requirements-build.txt -r ./tests/python_tests/requirements.txt --extra-index-url https://storage.openvinotoolkit.org/simple/wheels/pre-release --verbose --verbose --verbose
- run: set "PYTHONPATH=./build/" && call w_openvino_toolkit_windows_2024.2.0.dev20240524_x86_64\setupvars.bat && python3 -m pytest ./tests/python_tests/test_generate_api.py # cmd evaluates variables in a different way. Setting PYTHONPATH before setupvars.bat instead of doing that after solves that.
- run: set "PYTHONPATH=./build/" && call w_openvino_toolkit_windows_2024.2.0.dev20240524_x86_64\setupvars.bat && python -m pytest ./tests/python_tests/test_generate_api.py # cmd evaluates variables in a different way. Setting PYTHONPATH before setupvars.bat instead of doing that after solves that.
- run: call w_openvino_toolkit_windows_2024.2.0.dev20240524_x86_64\setupvars.bat && python -m pip install . --config-settings=build-dir="build" --verbose --verbose --verbose # --verbose is additive, and can be used up to 3 times.
- run: python3 -m pytest ./tests/python_tests/test_generate_api.py
- run: python -m pytest ./tests/python_tests/test_generate_api.py
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies = [

[tool.scikit-build]
cmake.build-type = "Release"
cmake.targets = ["py_generate_pipeline"] # Adding genai would trigger a Release build and Debug build after it. Luckily, py_generate_pipeline depends on genai and will be built anyway. It's not been investigated why both build types are triggered.
cmake.targets = ["py_generate_pipeline"] # Adding genai would trigger a Release build and Debug build after it. py_generate_pipeline depends on genai and will be built anyway. It's not been investigated why both build types are triggered.
cmake.source-dir = "./"
install.components = ["wheel_genai"]
sdist.cmake = true
Expand Down

0 comments on commit 5fd221b

Please sign in to comment.