IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return benchmark_tool to openvino-dev wheel (#16834)

Browse Source
This commit is contained in:
Ilya Lavrenov
2023-04-10 16:34:51 +04:00
committed by GitHub
parent 023dc1fa3d
commit feb08c408f
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/bindings/python/wheel/CMakeLists.txt
View File

@@ -146,11 +146,13 @@ add_custom_command(OUTPUT ${openvino_wheel_path}
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
COMMAND ${CMAKE_COMMAND} -E copy_directory "${OpenVINO_SOURCE_DIR}/licensing" "${CMAKE_BINARY_DIR}/licensing"
COMMAND ${wheel_env}
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" bdist_wheel
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/setup.py"
--quiet
--no-user-cfg
bdist_wheel
--dist-dir ${openvino_wheels_output_dir}
--build-number=${WHEEL_BUILD}
--plat-name=${PLATFORM_TAG}
--quiet
COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/site-packages"
COMMAND ${wheel_env}
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" clean

2
tools/benchmark_tool/setup.py
View File

@@ -12,7 +12,7 @@ import pkg_resources
import re
from setuptools import setup, find_packages
from pathlib import Path
from typing import List
from typing import Dict, List
with open('README.md', 'r', encoding='utf-8') as f:

6
tools/openvino_dev/CMakeLists.txt
View File

@@ -73,10 +73,12 @@ add_custom_command(OUTPUT ${openvino_wheel_path}
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/readme.txt" "${CMAKE_CURRENT_BINARY_DIR}"
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/setup.cfg" "${CMAKE_CURRENT_BINARY_DIR}"
COMMAND ${CMAKE_COMMAND} -E env OPENVINO_VERSION=${WHEEL_VERSION}
${PYTHON_EXECUTABLE} ${SETUP_PY} bdist_wheel
${PYTHON_EXECUTABLE} ${SETUP_PY}
--quiet
--no-user-cfg
bdist_wheel
--dist-dir ${openvino_wheels_output_dir}
--build=${WHEEL_BUILD}
--quiet
COMMAND ${CMAKE_COMMAND} -E env OPENVINO_VERSION=${WHEEL_VERSION}
${PYTHON_EXECUTABLE} ${SETUP_PY} clean
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"

17
tools/openvino_dev/setup.py
View File

@@ -86,14 +86,17 @@ class CustomBuild(build):
BUILD_BASE = Path.cwd() / self.build_base
for cmp, cmp_data in PKG_INSTALL_CFG.items():
self.announce(f'Processing package: {cmp}', level=log.INFO)
if not cmp_data['src_dir'].is_dir():
raise FileNotFoundError(
f'The source directory was not found: {cmp_data["src_dir"]}'
)
subprocess.call([sys.executable, 'setup.py', 'install',
subprocess.run([sys.executable, 'setup.py',
'--quiet',
'--no-user-cfg',
'install',
'--root', str(BUILD_BASE),
'--prefix', str(cmp_data.get("prefix"))],
cwd=str(cmp_data.get('src_dir')))
'--prefix', str(cmp_data.get("prefix")),
'--no-compile'],
check=True,
cwd=str(cmp_data.get('src_dir')),
stdout=sys.stdout,
stderr=sys.stderr)
# grab installed modules
lib_dir = 'lib/site-packages' if platform.system() == 'Windows' else f'lib/{PYTHON_VERSION}/site-packages'