From feb08c408f896fac5acbd0633d051f679c54f7fc Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Mon, 10 Apr 2023 16:34:51 +0400 Subject: [PATCH] Return benchmark_tool to openvino-dev wheel (#16834) --- src/bindings/python/wheel/CMakeLists.txt | 6 ++++-- tools/benchmark_tool/setup.py | 2 +- tools/openvino_dev/CMakeLists.txt | 6 ++++-- tools/openvino_dev/setup.py | 17 ++++++++++------- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/bindings/python/wheel/CMakeLists.txt b/src/bindings/python/wheel/CMakeLists.txt index df275df34cb..67697a2055b 100644 --- a/src/bindings/python/wheel/CMakeLists.txt +++ b/src/bindings/python/wheel/CMakeLists.txt @@ -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 diff --git a/tools/benchmark_tool/setup.py b/tools/benchmark_tool/setup.py index 4b5d3145e61..3a0f08211a0 100644 --- a/tools/benchmark_tool/setup.py +++ b/tools/benchmark_tool/setup.py @@ -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: diff --git a/tools/openvino_dev/CMakeLists.txt b/tools/openvino_dev/CMakeLists.txt index f98e5878d1d..f62756f8314 100644 --- a/tools/openvino_dev/CMakeLists.txt +++ b/tools/openvino_dev/CMakeLists.txt @@ -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}" diff --git a/tools/openvino_dev/setup.py b/tools/openvino_dev/setup.py index 081c1e5e1d7..150d659f2be 100644 --- a/tools/openvino_dev/setup.py +++ b/tools/openvino_dev/setup.py @@ -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'