Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WHEEL] Toml build #27227

Draft
wants to merge 43 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
e348c1f
toml init
mryzhov Jul 29, 2024
6522fd3
abs path fix
mryzhov Jul 29, 2024
05891e9
set dafault build dir
mryzhov Oct 18, 2024
953bc98
changed toml dir
mryzhov Oct 22, 2024
a00198d
move metadata to toml
mryzhov Oct 22, 2024
a4d0610
cibuildwheel
mryzhov Oct 24, 2024
36898f8
build-verbosity = 1
mryzhov Oct 24, 2024
812db03
dynamic fields
mryzhov Oct 24, 2024
3f3d670
upload wheels
mryzhov Oct 24, 2024
ea85604
fixed deb packaging
mryzhov Oct 25, 2024
4f5b7cf
add prefix
mryzhov Oct 25, 2024
1d87d7e
use python 3.9 on ubuntu 20
mryzhov Nov 4, 2024
6193cdd
exclude deps and __pycache__
mryzhov Nov 5, 2024
6cf2ccf
set --python "/usr/bin/python3"
mryzhov Nov 5, 2024
6fa44f0
use target = ov_install_lib
mryzhov Nov 5, 2024
c2dd026
Update src/bindings/python/pyproject.toml
mryzhov Nov 14, 2024
8645410
depricate WHEEL_BUILD
mryzhov Nov 14, 2024
16c1c73
Merge branch 'master' into toml_build
mryzhov Nov 14, 2024
bc9a1af
Revert "depricate WHEEL_BUILD"
mryzhov Nov 15, 2024
b8df434
custom bdist_wheel
mryzhov Nov 15, 2024
1c4b705
fix for ov_dev package
mryzhov Nov 15, 2024
f8368bb
use -m pip wheel only
mryzhov Nov 15, 2024
df2622f
Apply suggestions from code review
mryzhov Nov 15, 2024
031bbef
Merge branch 'master' into toml_build
mryzhov Nov 15, 2024
9489196
set log level
mryzhov Nov 15, 2024
721ac43
Merge branch 'toml_build' of https://github.com/mryzhov/openvino into…
mryzhov Nov 15, 2024
97b8be2
extend custom install
mryzhov Nov 15, 2024
0a84c9e
SETUPTOOLS_INSTALL_LIB
mryzhov Nov 15, 2024
2945a8a
set build executable
mryzhov Nov 18, 2024
9bacfb0
Merge branch 'master' into toml_build
mryzhov Nov 22, 2024
052ade2
limit pip versions by >=22.3
mryzhov Nov 22, 2024
cfb9f1f
revert SETUPTOOLS_BUILD_EXECUTABLE
mryzhov Nov 22, 2024
06f4c0a
revert [tool.black]
mryzhov Nov 22, 2024
de0a860
Merge branch 'toml_build' of https://github.com/mryzhov/openvino into…
mryzhov Nov 22, 2024
3f37e7b
removed tmp code
mryzhov Nov 22, 2024
799ae1c
Revert "revert SETUPTOOLS_BUILD_EXECUTABLE"
mryzhov Nov 22, 2024
6126623
break-system-packages
mryzhov Nov 25, 2024
8a3125c
update setuptools requirements
mryzhov Nov 25, 2024
9f570ed
upgrade pip in riscv
mryzhov Nov 25, 2024
428c1ec
Revert "update setuptools requirements"
mryzhov Nov 25, 2024
9bef0bf
update docker tag pr-27227
mryzhov Nov 25, 2024
83343ee
use separate pip cache for riscv
mryzhov Nov 25, 2024
1cc6766
Merge branch 'master' into toml_build
mryzhov Nov 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/dockerfiles/docker_tag
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pr-27430
pr-27227
2 changes: 2 additions & 0 deletions .github/dockerfiles/ov_build/ubuntu_22_04_riscv/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,5 @@ ENV PIP_VERSION="24.0"
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
python3 get-pip.py --no-cache-dir pip==${PIP_VERSION} && \
rm -f get-pip.py

ENV PIP_CACHE_DIR=/mount/caches/pip/linux_riscv/${PIP_VERSION}
4 changes: 2 additions & 2 deletions .github/workflows/job_build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ jobs:
run: |
# Ubuntu 24 does not allow using the system Python directly so
# we have to use Python from the virtual environment created in Docker
[[ ${{ inputs.os }} == "ubuntu_24_04" ]] && python_exec=/venv/bin/python3 || python_exec=/usr/bin/python3
[[ ${{ inputs.os }} == "ubuntu_22_04" ]] && python_exec=/usr/bin/python3 || python_exec=/venv/bin/python3
$python_exec -m pip install -U pip
$python_exec -m pip install -r ${OPENVINO_REPO}/src/bindings/python/wheel/requirements-dev.txt
cmake -UPython* -U_Python* -UPYTHON* \
Expand Down Expand Up @@ -265,7 +265,7 @@ jobs:
if-no-files-found: 'error'

- name: Upload openvino wheels
if: ${{ inputs.os != 'debian_10' && inputs.arch != 'arm' }}
if: ${{ !cancelled() && inputs.os != 'debian_10' && inputs.arch != 'arm' }}
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: openvino_wheels
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/linux_riscv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ jobs:

python3 -m venv ${OPENVINO_BUILD_DIR}/env
source ${OPENVINO_BUILD_DIR}/env/bin/activate
python3 -m pip install --upgrade pip
python3 -m pip install -r ${OPENVINO_REPO}/src/bindings/python/wheel/requirements-dev.txt
python3 -m pip install conan

Expand Down
201 changes: 201 additions & 0 deletions src/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
32 changes: 17 additions & 15 deletions src/bindings/python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ macro(ov_define_setup_py_packaging_vars)
WHEEL_VERSION=${WHEEL_VERSION}
WHEEL_BUILD=${WHEEL_BUILD}
# build locations
OPENVINO_SOURCE_DIR=${OpenVINO_SOURCE_DIR}
OPENVINO_BINARY_DIR=${OpenVINO_BINARY_DIR}
OPENVINO_PYTHON_BINARY_DIR=${OpenVINOPython_BINARY_DIR}
# to create proper directories for BA, OVC tools
Expand Down Expand Up @@ -274,9 +275,10 @@ macro(ov_define_setup_py_dependencies)

list(APPEND ov_setup_py_deps
${openvino_py_files}
"${CMAKE_CURRENT_SOURCE_DIR}/wheel/setup.py"
"${CMAKE_CURRENT_SOURCE_DIR}/pyproject.toml"
"${CMAKE_CURRENT_SOURCE_DIR}/setup.py"
"${OpenVINOPython_SOURCE_DIR}/requirements.txt"
"${OpenVINOPython_SOURCE_DIR}/wheel/readme.txt"
"${OpenVINOPython_SOURCE_DIR}/readme.txt"
"${OpenVINO_SOURCE_DIR}/LICENSE"
"${OpenVINO_SOURCE_DIR}/licensing/onednn_third-party-programs.txt"
"${OpenVINO_SOURCE_DIR}/licensing/runtime-third-party-programs.txt"
Expand Down Expand Up @@ -318,26 +320,26 @@ if(ENABLE_PYTHON_PACKAGING)
set(openvino_meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info")
set(openvino_meta_info_file "${ov_install_lib}/${openvino_meta_info_subdir}/PKG-INFO")

execute_process(COMMAND ${Python3_EXECUTABLE} -m pip --version
OUTPUT_VARIABLE pip_version OUTPUT_STRIP_TRAILING_WHITESPACE)

string(REGEX MATCH "pip[ ]+([\\.0-9]*)" pip_version "${pip_version}")
set(pip_version ${CMAKE_MATCH_1})

if(pip_version VERSION_LESS 23.0)
message(FATAL_ERROR "pip version ${pip_version} is not supported. Please update pip to version 23.0 or higher.")
endif()

add_custom_command(OUTPUT ${openvino_meta_info_file}
COMMAND ${CMAKE_COMMAND} -E remove_directory
"${ov_python_package_prefix}"
COMMAND ${setup_py_env}
# variables to reflect options (extensions only or full wheel package)
PYTHON_EXTENSIONS_ONLY=ON
SKIP_RPATH=ON
"${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/wheel/setup.py"
--no-user-cfg
--quiet
build
--executable "/usr/bin/python3"
build_ext
install
--no-compile
--prefix "${ov_python_package_prefix}"
--install-lib "${ov_install_lib}"
--install-scripts "${ov_python_package_prefix}/bin"
--single-version-externally-managed
--record=installed.txt
SETUPTOOLS_INSTALL_LIB=${ov_install_lib}
SETUPTOOLS_INSTALL_SCRIPTS=${ov_python_package_prefix}/bin
"${Python3_EXECUTABLE}" -m pip --python=/usr/bin/python3 install --verbose --ignore-requires-python --no-deps --no-compile --break-system-packages --prefix "${ov_python_package_prefix}" "${CMAKE_CURRENT_SOURCE_DIR}"
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
DEPENDS ${ov_setup_py_deps}
COMMENT "Create python package with ${openvino_meta_info_subdir} folder")
Expand Down
46 changes: 46 additions & 0 deletions src/bindings/python/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,49 @@
[project]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't pyproject.toml placed to the root of the repo to cover also tools/benchmark_app?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is discussible, I thought about that too, but at this case we would need to put in the root setup.py too until we drop it at all

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agree about moving to the root.

name = "openvino"
dynamic = ["version", "entry-points", "scripts"]
description = "OpenVINO(TM) Runtime"
readme = {file = "README.md", content-type="text/markdown"}
license = {text = "OSI Approved :: Apache Software License"}
authors = [
{ name = "OpenVINO Developers", email = "[email protected]" },
]
classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
]
requires-python = ">=3.9"

dependencies = [
"numpy>=1.16.6,<2.2.0",
"openvino-telemetry>=2023.2.1",
"packaging"
]

[build-system]
requires = ["setuptools>=70,<=75", "wheel", "cmake"]
build-backend = "setuptools.build_meta"

[tool.setuptools]
license-files = [
"readme.txt",
"../../../LICENSE",
"../../../licensing/runtime-third-party-programs.txt",
"../../../licensing/onetbb_third-party-programs.txt",
"../../../licensing/onednn_third-party-programs.txt",
]

[tool.black]
mryzhov marked this conversation as resolved.
Show resolved Hide resolved
line-length = 160
include = '\.pyi?$'

[tool.cibuildwheel]
before-all = "uname -a"
build = "cp311*manylinux_x86_64*"
build-frontend = { name = "pip", args = ["--verbose", "--no-deps", "--extra-index-url=https://storage.openvinotoolkit.org/simple/wheels/nightly"] }
environment = { http_proxy = "http://proxy-dmz.intel.com:911", https_proxy = "http://proxy-dmz.intel.com:912" }
repair-wheel-command = ""
archs = ["x86_64"]
build-verbosity = 1
File renamed without changes.
Loading
Loading