Skip to content

Commit

Permalink
Merge pull request #8 from mryzhov/ci_fixes
Browse files Browse the repository at this point in the history
[CI] Win and mac test fixes
  • Loading branch information
mryzhov authored Feb 7, 2024
2 parents 6768fd8 + 9d9522e commit f13718b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 19 deletions.
15 changes: 4 additions & 11 deletions .github/workflows/mac.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: macOS (12, Python 3.11)
name: macOS (13, Python 3.11)
on:
workflow_dispatch:
pull_request:
Expand All @@ -23,7 +23,6 @@ jobs:
shell: bash
runs-on: 'macos-13-large'
env:
DEBIAN_FRONTEND: noninteractive # to prevent apt-get from waiting user input
CMAKE_BUILD_TYPE: 'Release'
CMAKE_GENERATOR: 'Ninja Multi-Config'
CMAKE_CXX_COMPILER_LAUNCHER: ccache
Expand Down Expand Up @@ -71,9 +70,9 @@ jobs:
# github.ref_name is 'ref/PR_#' in case of the PR, and 'branch_name' when executed on push
save: ${{ github.ref_name == 'master' && 'true' || 'false' }}
verbose: 2
key: linux-ubuntu
key: ccache-mac
restore-keys: |
linux-ubuntu
ccache-mac
- name: CMake configure - OpenVINO
run: |
Expand Down Expand Up @@ -204,7 +203,7 @@ jobs:
env:
CMAKE_ARGS: '-DBUILD_FAST_TOKENIZERS=OFF'
CMAKE_BUILD_PARALLEL_LEVEL: '4'
SKBUILD_WHEEL_BUILD_TAG: ${{github.run_attempt}}
SKBUILD_WHEEL_BUILD_TAG: ${{ github.run_attempt }}

#
# Upload build artifacts
Expand Down Expand Up @@ -279,13 +278,7 @@ jobs:
python3 -m pip install $wheel_name[dev]
popd
- name: Tokenizers Bandit tests
run: |
bandit -c pyproject.toml -r python
working-directory: ${{ env.OPENVINO_TOKENIZERS_REPO }}

- name: Tokenizers regression tests
run: |
python3 -m pytest tokenizers_test.py
working-directory: ${{ env.OPENVINO_TOKENIZERS_REPO }}/tests

8 changes: 1 addition & 7 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,7 @@ jobs:
run: |
# Find and install wheel
$ovCoreWheelPath=Get-ChildItem -Path "${{ env.INSTALL_DIR }}\\ov_tokenizers" -Filter openvino_tokenizers*.whl | % { $_.FullName }
python3 -m pip install "$ovCoreWheelPath"
- name: Tokenizers Bandit tests
run: |
bandit -c pyproject.toml -r python
working-directory: ${{ env.OPENVINO_TOKENIZERS_REPO }}
python3 -m pip install "$ovCoreWheelPath[all]"
- name: Tokenizers regression tests
run: |
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
set(TARGET_NAME "openvino_tokenizers")

FILE(GLOB SRC *.cpp)
add_library(${TARGET_NAME} MODULE ${SRC})
add_library(${TARGET_NAME} SHARED ${SRC})
target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_OPENVINO_EXTENSION_API)
target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime)

Expand Down

0 comments on commit f13718b

Please sign in to comment.