Skip to content

Commit 7c830ff

Browse files
authored
Merge branch 'master' into ov-java-api
2 parents 49ef785 + b0826c5 commit 7c830ff

File tree

74 files changed

+62
-8673
lines changed

Some content is hidden

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

74 files changed

+62
-8673
lines changed

.ci/azure/linux.yml

+1-41
Original file line numberDiff line numberDiff line change
@@ -180,46 +180,6 @@ jobs:
180180
# need to enable sparse_conv tests with new Open3D release
181181
python -m pytest -k "not sparse_conv" tests/run_tests.py
182182
env:
183-
CUSTOM_OP_LIB: $(BIN_DIR)/libopenvino_tokenizers.so
183+
CUSTOM_OP_LIB: $(BIN_DIR)/libuser_ov_extensions.so
184184
workingDirectory: $(REPO_DIR)/modules/custom_operations
185185
displayName: 'Custom user operation tests'
186-
187-
- script: |
188-
set -e
189-
source $(WORK_DIR)/.env3/bin/activate && source $(SETUPVARS)
190-
python -m pip install build
191-
python -m build --wheel --outdir $(BUILD_WHEEL_DIR) $(REPO_DIR)/modules/custom_operations
192-
env:
193-
CMAKE_ARGS: '-DBUILD_FAST_TOKENIZERS=ON'
194-
CMAKE_GENERATOR: 'Unix Makefiles'
195-
workingDirectory: $(WORK_DIR)
196-
displayName: 'Build tokenizers wheel'
197-
198-
- publish: $(BUILD_WHEEL_DIR)
199-
artifact: Wheels
200-
201-
- script: |
202-
set -e
203-
source $(WORK_DIR)/.env3/bin/activate
204-
# Find and install wheel
205-
pushd $(BUILD_WHEEL_DIR)
206-
wheel_name=$(find . -name 'openvino_tokenizers*.whl')
207-
python3 -m pip install $wheel_name[all]
208-
popd
209-
workingDirectory: $(WORK_DIR)
210-
displayName: 'Install tokenizers wheel'
211-
212-
- script: |
213-
set -e
214-
source $(WORK_DIR)/.env3/bin/activate
215-
bandit -c pyproject.toml -r user_ie_extensions/tokenizer/python/
216-
workingDirectory: $(REPO_DIR)/modules/custom_operations
217-
displayName: 'Tokenizers Bandit Check'
218-
219-
- script: |
220-
set -e
221-
source $(WORK_DIR)/.env3/bin/activate
222-
python -m pytest tokenizers_test.py
223-
continueOnError: true
224-
workingDirectory: $(REPO_DIR)/modules/custom_operations/user_ie_extensions/tokenizer/python/tests/
225-
displayName: 'Tokenizers extension regression test'

.ci/azure/mac.yml

-27
Original file line numberDiff line numberDiff line change
@@ -179,32 +179,5 @@ jobs:
179179
workingDirectory: $(WORK_DIR)
180180
displayName: 'Create virtual env'
181181
182-
- script: |
183-
set -e
184-
source $(WORK_DIR)/venv/bin/activate && source $(SETUPVARS)
185-
python -m pip install build
186-
python -m build --wheel --outdir $(BUILD_WHEEL_DIR) $(REPO_DIR)/modules/custom_operations
187-
workingDirectory: $(WORK_DIR)
188-
displayName: 'Build tokenizers wheel'
189-
190182
- publish: $(BUILD_WHEEL_DIR)
191183
artifact: Wheels
192-
193-
- script: |
194-
set -e
195-
source $(WORK_DIR)/venv/bin/activate
196-
# Find and install wheel
197-
pushd $(BUILD_WHEEL_DIR)
198-
wheel_name=$(find . -name 'openvino_tokenizers*.whl')
199-
python3 -m pip install $wheel_name[all]
200-
popd
201-
workingDirectory: $(WORK_DIR)
202-
displayName: 'Install tokenizers wheel'
203-
204-
- script: |
205-
set -e
206-
source $(WORK_DIR)/venv/bin/activate
207-
python -m pytest tokenizers_test.py
208-
continueOnError: true
209-
workingDirectory: $(REPO_DIR)/modules/custom_operations/user_ie_extensions/tokenizer/python/tests/
210-
displayName: 'Tokenizers extension regression test'

.ci/azure/windows.yml

+1-32
Original file line numberDiff line numberDiff line change
@@ -178,37 +178,6 @@ jobs:
178178
$(PYTHON_EXE) -m pip install -r $(REPO_DIR)\modules\custom_operations\tests\requirements.txt
179179
$(PYTHON_EXE) -m pytest -k "not sparse_conv" tests\run_tests.py
180180
env:
181-
CUSTOM_OP_LIB: $(BUILD_DIR_CONTRIB)\user_ie_extensions\openvino_tokenizers.dll
181+
CUSTOM_OP_LIB: $(BUILD_DIR_CONTRIB)\user_ie_extensions\user_ov_extensions.dll
182182
workingDirectory: $(REPO_DIR)\modules\custom_operations
183183
displayName: 'Custom user operation tests'
184-
185-
- script: |
186-
call $(SETUPVARS)
187-
$(PYTHON_EXE) -m pip install build
188-
$(PYTHON_EXE) -m build --wheel --outdir $(BUILD_WHEEL_DIR) $(REPO_DIR)\modules\custom_operations
189-
workingDirectory: $(WORK_DIR)
190-
displayName: 'Build tokenizers wheel'
191-
192-
- publish: $(BUILD_WHEEL_DIR)
193-
artifact: Wheels
194-
195-
- powershell: |
196-
# Find and install the core OV wheel
197-
$ovCoreWheelPath=Get-ChildItem -Path "$(INSTALL_DIR)\tools" -Filter openvino-*.whl | % { $_.FullName }
198-
$(PYTHON_EXE) -m pip install "$ovCoreWheelPath"
199-
workingDirectory: $(WORK_DIR)
200-
displayName: 'Install OpenVINO Python wheels'
201-
202-
- powershell: |
203-
# Find and install the wheel
204-
$wheelPath=Get-ChildItem -Path "$(BUILD_WHEEL_DIR)" -Filter openvino_tokenizers*.whl | % { $_.FullName }
205-
$(PYTHON_EXE) -m pip install "$wheelPath[all]"
206-
workingDirectory: $(WORK_DIR)
207-
displayName: 'Install tokenizers wheel'
208-
209-
- script: |
210-
call $(SETUPVARS) -pyver 3.8 && ^
211-
$(PYTHON_EXE) -m pytest tokenizers_test.py
212-
continueOnError: true
213-
workingDirectory: $(REPO_DIR)\modules\custom_operations\user_ie_extensions\tokenizer\python\tests
214-
displayName: 'Tokenizers extension regression test'

.github/workflows/assign_issue.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Take Issue
2+
3+
on:
4+
issue_comment:
5+
types:
6+
- created
7+
- edited
8+
9+
jobs:
10+
take-issue:
11+
name: Take issue
12+
runs-on: ubuntu-latest
13+
permissions:
14+
issues: write
15+
timeout-minutes: 10
16+
steps:
17+
- name: take an issue
18+
uses: bdougie/take-action@v1.6.1
19+
with:
20+
message: Thank you for looking into this issue! Please let us know if you have any questions or require any help.
21+
issueCurrentlyAssignedMessage: Thanks for being interested in this issue. It looks like this ticket is already assigned to a contributor. Please communicate with the assigned contributor to confirm the status of the issue.
22+
trigger: .take
23+
token: ${{ secrets.GITHUB_TOKEN }}

modules/custom_operations/CMakeLists.txt

-10
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,4 @@ project(openvino_extensions)
88

99
include(cmake/platforms.cmake)
1010

11-
# Find OpenVINODeveloperPackage first to compile with SDL flags
12-
find_package(OpenVINODeveloperPackage QUIET)
13-
if(NOT OpenVINODeveloperPackage_FOUND)
14-
find_package(OpenVINO REQUIRED COMPONENTS Runtime)
15-
endif()
16-
17-
# set the project version using OpenVINO major, minor and patch versions
18-
set(CMAKE_PROJECT_VERSION_TWEAK 0)
19-
set(CMAKE_PROJECT_VERSION "${OpenVINO_VERSION}.${CMAKE_PROJECT_VERSION_TWEAK}")
20-
2111
add_subdirectory(user_ie_extensions)

modules/custom_operations/LICENSE

-201
This file was deleted.

modules/custom_operations/SECURITY.md

-12
This file was deleted.

0 commit comments

Comments
 (0)