Skip to content

Commit c9255a0

Browse files
authored
Merge branch 'master' into generate-charsmaps-during-build
2 parents 4dc22b1 + 01c913b commit c9255a0

File tree

77 files changed

+96
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+96
-88
lines changed

.github/workflows/mac.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: macOS (13, Python 3.11)
1+
name: macOS ARM64 (mac-14, Python 3.11)
22
on:
33
workflow_dispatch:
44
pull_request:
@@ -20,7 +20,7 @@ env:
2020
CMAKE_CXX_COMPILER_LAUNCHER: ccache
2121
CMAKE_C_COMPILER_LAUNCHER: ccache
2222
CCACHE_MAXSIZE: 100Mi
23-
BASE_PRODUCT_TYPE: public_darwin
23+
BASE_PRODUCT_TYPE: public_macos_arm64
2424

2525
permissions: read-all
2626

@@ -46,7 +46,8 @@ jobs:
4646
- uses: openvinotoolkit/openvino/.github/actions/openvino_provider@master
4747
id: openvino_download
4848
with:
49-
platform: 'macos_12_6'
49+
platform: macos_14_7
50+
arch: 'arm64'
5051
commit_packages_to_provide: 'wheels,developer_package.tar.gz'
5152
revision: latest_available_commit
5253

@@ -60,7 +61,7 @@ jobs:
6061
defaults:
6162
run:
6263
shell: bash
63-
runs-on: macos-13
64+
runs-on: macos-14
6465

6566
env:
6667
CMAKE_GENERATOR: 'Ninja'
@@ -77,14 +78,21 @@ jobs:
7778
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
7879
with:
7980
path: ${{ env.OPENVINO_TOKENIZERS_REPO }}
80-
81+
82+
- name: Setup Python ${{ env.PYTHON_VERSION }}
83+
uses: openvinotoolkit/openvino/.github/actions/setup_python@master
84+
with:
85+
version: ${{ env.PYTHON_VERSION }}
86+
should-setup-pip-paths: 'false'
87+
self-hosted-runner: 'false'
88+
8189
- name: Generate product manifest
8290
id: create_manifest
8391
uses: openvinotoolkit/openvino/.github/actions/create_manifest@master
8492
with:
8593
repos: ${{ env.OPENVINO_TOKENIZERS_REPO }}
8694
product_type: ${{ env.BASE_PRODUCT_TYPE }}_${{ matrix.build_type }}
87-
target_arch: 'x86_64'
95+
target_arch: 'arm64'
8896
build_type: ${{ matrix.build_type }}
8997
save_to: ${{ env.MANIFEST_PATH }}
9098

@@ -167,7 +175,7 @@ jobs:
167175
defaults:
168176
run:
169177
shell: bash
170-
runs-on: macos-13
178+
runs-on: macos-14
171179

172180
env:
173181
OPENVINO_REPO: ${{ github.workspace }}/openvino
@@ -204,7 +212,7 @@ jobs:
204212
with:
205213
repos: ${{ env.OPENVINO_TOKENIZERS_REPO }}
206214
product_type: ${{ env.BASE_PRODUCT_TYPE }}_release
207-
target_arch: 'x86_64'
215+
target_arch: 'arm64'
208216
build_type: Release
209217
save_to: ${{ env.MANIFEST_PATH }}
210218

@@ -243,7 +251,6 @@ jobs:
243251
python3 -m pip wheel -v \
244252
--no-deps --wheel-dir ${BUILD_DIR} \
245253
--config-settings='override=wheel.build_tag="${{ github.run_number }}"' \
246-
--config-settings=override=cross.arch="macosx_10_12_x86_64" \
247254
${{ needs.openvino_download.outputs.ov_wheel_source }} \
248255
${OPENVINO_TOKENIZERS_REPO}
249256
working-directory: ${{ env.INSTALL_DIR }}
@@ -278,7 +285,7 @@ jobs:
278285
defaults:
279286
run:
280287
shell: bash
281-
runs-on: macos-13
288+
runs-on: macos-14
282289
env:
283290
INSTALL_DIR: ${{ github.workspace }}/openvino/install
284291

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ else()
4242
endif()
4343

4444
project(openvino_tokenizers
45-
VERSION 2026.0.0.0
45+
VERSION 2026.1.0.0
4646
DESCRIPTION "OpenVINO Tokenizers"
4747
HOMEPAGE_URL "https://github.com/openvinotoolkit/openvino_tokenizers"
4848
LANGUAGES CXX C)

benchmark/benchmark.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ def sample_texts(
2828
dataset = [data for data in dataset if len(data["conversations"]) >= 2]
2929
# Keep the first two turns of each conversation
3030
dataset = [
31-
(data["conversations"][0]["value"], data["conversations"][1]["value"]) for data in sample(dataset, k=num_texts)
31+
(data["conversations"][0]["value"], data["conversations"][1]["value"])
32+
for data in sample(dataset, k=num_texts) # nosec
3233
]
3334
shuffle(dataset)
3435
return dataset

cmake/templates/__version__.py.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# Copyright (C) 2018-2025 Intel Corporation
2+
# Copyright (C) 2018-2026 Intel Corporation
33
# SPDX-License-Identifier: Apache-2.0
44

55
__version__ = "@OpenVINOTokenizers_FULL_VERSION@"

cmake/version.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2018-2025 Intel Corporation
1+
# Copyright (C) 2018-2026 Intel Corporation
22
# SPDX-License-Identifier: Apache-2.0
33
#
44

js/README.md

Lines changed: 1 addition & 1 deletion

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "openvino-tokenizers"
3-
version = "2026.0.0.0"
3+
version = "2026.1.0.0"
44
description = "Convert tokenizers into OpenVINO models"
55
requires-python = ">=3.10"
66
readme = { file = "README.md", content-type="text/markdown" }
@@ -37,7 +37,7 @@ classifiers = [
3737

3838
dependencies = [
3939
# support of nightly openvino packages with dev suffix
40-
"openvino~=2026.0.0.dev"
40+
"openvino~=2026.1.0.dev"
4141
]
4242

4343
[project.optional-dependencies]
@@ -98,7 +98,7 @@ python_abi = "none"
9898
requires = [
9999
"py-build-cmake==0.4.3",
100100
"cmake~=3.14",
101-
"openvino~=2026.0.0.dev"
101+
"openvino~=2026.1.0.dev"
102102
]
103103
build-backend = "py_build_cmake.build"
104104

python/openvino_tokenizers/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# Copyright (C) 2018-2025 Intel Corporation
2+
# Copyright (C) 2018-2026 Intel Corporation
33
# SPDX-License-Identifier: Apache-2.0
44
import functools
55
import logging

python/openvino_tokenizers/convert_tokenizer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# Copyright (C) 2018-2025 Intel Corporation
2+
# Copyright (C) 2018-2026 Intel Corporation
33
# SPDX-License-Identifier: Apache-2.0
44

55
import logging

python/openvino_tokenizers/hf_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# Copyright (C) 2018-2022 Intel Corporation
2+
# Copyright (C) 2018-2026 Intel Corporation
33
# SPDX-License-Identifier: Apache-2.0
44
import functools
55
import json

0 commit comments

Comments
 (0)