From f9d120ac702f8d0996238ce77721e5aca75613f2 Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Wed, 7 Feb 2024 20:29:08 +0100 Subject: [PATCH 1/5] removed bandit tests --- .github/workflows/mac.yml | 6 ------ .github/workflows/windows.yml | 6 ------ 2 files changed, 12 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 445eea7a4..3f38620ed 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -279,13 +279,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 - \ No newline at end of file diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e9ecb680f..e0d66f0e6 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -279,12 +279,6 @@ jobs: $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 }} - - name: Tokenizers regression tests run: | python3 -m pytest tokenizers_test.py From 93bb9715ce164e5d22fc5bfc31fe2ac612a1a491 Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Wed, 7 Feb 2024 20:32:47 +0100 Subject: [PATCH 2/5] renamed cache --- .github/workflows/mac.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 3f38620ed..520e99e75 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -71,9 +71,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: | From 3d4d38c96e30dda158d867d382d4989ee24e3108 Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Wed, 7 Feb 2024 21:07:18 +0100 Subject: [PATCH 3/5] win test deps --- .github/workflows/mac.yml | 2 +- .github/workflows/windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 520e99e75..7e4d35725 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -1,4 +1,4 @@ -name: macOS (12, Python 3.11) +name: macOS (13, Python 3.11) on: workflow_dispatch: pull_request: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e0d66f0e6..dadc5301c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -277,7 +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" + python3 -m pip install "$ovCoreWheelPath[all]" - name: Tokenizers regression tests run: | From 3f1e360bbc66fbd9e71c9bf1426595b3f28084a0 Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Wed, 7 Feb 2024 21:13:03 +0100 Subject: [PATCH 4/5] mac fix --- .github/workflows/mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 7e4d35725..168c2b8eb 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -204,7 +204,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 From 9d9522e94047d81b4dc7db84b3d86bbe0737d60b Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Wed, 7 Feb 2024 22:07:12 +0100 Subject: [PATCH 5/5] dylib --- .github/workflows/mac.yml | 1 - src/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 168c2b8eb..2b19c87c4 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -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 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d9c3794d3..bddc64a1a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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)