From 651f9ce9c9398e3662e9c07693c6a438835cdf6b Mon Sep 17 00:00:00 2001 From: chensuyue Date: Thu, 19 Oct 2023 16:16:29 +0800 Subject: [PATCH 1/2] refine binary build for 3.0 API Signed-off-by: chensuyue --- setup.cfg | 4 ++ setup.py | 158 ++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 103 insertions(+), 59 deletions(-) create mode 100644 setup.cfg diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 00000000000..b00c17fa1f4 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,4 @@ +[metadata] +license_files = + LICENSE + third-party-programs.txt diff --git a/setup.py b/setup.py index b145f162dca..1c9aa4f61ac 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,6 @@ import re import sys from io import open - from setuptools import find_packages, setup @@ -17,68 +16,106 @@ def fetch_requirements(path): except Exception as error: assert False, "Error: Could not open '%s' due %s\n" % (filepath, error) -neural_insights = False -if "neural_insights" in sys.argv: - neural_insights = True - sys.argv.remove("neural_insights") +PKG_INSTALL_CFG = { + "neural_compressor_2x": { + "project_name": "neural_compressor", + "include_packages": find_packages( + include=["neural_compressor", "neural_compressor.*", "neural_coder", "neural_coder.*"], + exclude=["neural_compressor.template", "neural_compressor.common", "neural_compressor.common.*", + "neural_compressor.torch", "neural_compressor.torch.*", + "neural_compressor.tensorflow", "neural_compressor.tensorflow.*"], + ), + "package_data": {"": ["*.yaml"]}, + "install_requires": fetch_requirements("requirements.txt"), + "extras_require": { + "pt": [f'neural_compressor_3x_pt=={__version__}'], + "tf": [f'neural_compressor_3x_tf=={__version__}'], + "ort": [f'neural_compressor_3x_ort=={__version__}'], + } + }, + "neural_compressor_3x_pt": { + "project_name": "neural_compressor_3x_pt", + "include_packages": find_packages( + include=["neural_compressor.common", "neural_compressor.common.*", "neural_compressor.version.py", + "neural_compressor.torch", "neural_compressor.torch.*"], + ), + }, + "neural_compressor_3x_tf": { + "project_name": "neural_compressor_3x_tf", + "include_packages": find_packages( + include=["neural_compressor.common", "neural_compressor.common.*", "neural_compressor.version.py", + "neural_compressor.tensorflow", "neural_compressor.tensorflow.*"], + ), + }, + "neural_compressor_3x_ort": { + "project_name": "neural_compressor_3x_ort", + "include_packages": find_packages( + include=["neural_compressor.common", "neural_compressor.common.*", "neural_compressor.version.py", + "neural_compressor.onnxrt", "neural_compressor.onnxrt.*"], + ), + }, + "neural_insights": { + "project_name": "neural_insights", + "include_packages": find_packages(include=["neural_insights", "neural_insights.*"], exclude=["test.*", "test"]), + "package_data": { + "neural_insights": [ + "bin/*", + "*.yaml", + "web/app/*.*", + "web/app/static/css/*", + "web/app/static/js/*", + "web/app/static/media/*", + "web/app/icons/*", + ] + }, + "install_requires": fetch_requirements("neural_insights/requirements.txt"), + "entry_points": {"console_scripts": ["neural_insights = neural_insights.bin.neural_insights:execute"]}, + }, + "neural_solution": { + "project_name": "neural_solution", + "include_packages": find_packages(include=["neural_solution", "neural_solution.*"]), + "package_data": { + "neural_solution": [ + "scripts/*.*", + "frontend/*.json", + ] + }, + "install_requires": fetch_requirements("neural_solution/requirements.txt"), + "entry_points": {"console_scripts": ["neural_solution = neural_solution.bin.neural_solution:exec"]} + } +} -neural_solution = False -if "neural_solution" in sys.argv: - neural_solution = True - sys.argv.remove("neural_solution") -# define include packages -include_packages = find_packages( - include=["neural_compressor", "neural_compressor.*", "neural_coder", "neural_coder.*"], - exclude=["neural_compressor.template"], -) -neural_insights_packages = find_packages(include=["neural_insights", "neural_insights.*"], exclude=["test.*", "test"]) -neural_solution_packages = find_packages(include=["neural_solution", "neural_solution.*"]) +if __name__ == "__main__": -# define package data -package_data = {"": ["*.yaml"]} -neural_insights_data = { - "neural_insights": [ - "bin/*", - "*.yaml", - "web/app/*.*", - "web/app/static/css/*", - "web/app/static/js/*", - "web/app/static/media/*", - "web/app/icons/*", - ] -} -neural_solution_data = { - "neural_solution": [ - "scripts/*.*", - "frontend/*.json", - ] -} + cfg_key = "neural_compressor_2x" + if "neural_insights" in sys.argv: + sys.argv.remove("neural_insights") + cfg_key = "neural_insights" -# define install requirements -install_requires_list = fetch_requirements("requirements.txt") -neural_insights_requires = fetch_requirements("neural_insights/requirements.txt") -neural_solution_requires = fetch_requirements("neural_solution/requirements.txt") + if "neural_solution" in sys.argv: + sys.argv.remove("neural_solution") + cfg_key = "neural_solution" -# define entry points -entry_points = {} + if "pt" in sys.argv: + sys.argv.remove("pt") + cfg_key = "neural_compressor_3x_pt" -if neural_insights: - project_name = "neural_insights" - package_data = neural_insights_data - install_requires_list = neural_insights_requires - include_packages = neural_insights_packages - entry_points = {"console_scripts": ["neural_insights = neural_insights.bin.neural_insights:execute"]} -elif neural_solution: - project_name = "neural_solution" - package_data = neural_solution_data - install_requires_list = neural_solution_requires - include_packages = neural_solution_packages - entry_points = {"console_scripts": ["neural_solution = neural_solution.bin.neural_solution:exec"]} -else: - project_name = "neural_compressor" + if "tf" in sys.argv: + sys.argv.remove("tf") + cfg_key = "neural_compressor_3x_tf" + + if "ort" in sys.argv: + sys.argv.remove("ort") + cfg_key = "neural_compressor_3x_ort" + + project_name = PKG_INSTALL_CFG[cfg_key].get("project_name") + include_packages = PKG_INSTALL_CFG[cfg_key].get("include_packages") or {} + package_data = PKG_INSTALL_CFG[cfg_key].get("package_data") or {} + install_requires = PKG_INSTALL_CFG[cfg_key].get("install_requires") or [] + entry_points = PKG_INSTALL_CFG[cfg_key].get("entry_points") or {} + extras_require = PKG_INSTALL_CFG[cfg_key].get("extras_require") or {} -if __name__ == "__main__": setup( name=project_name, version=__version__, @@ -87,15 +124,17 @@ def fetch_requirements(path): description="Repository of Intel® Neural Compressor", long_description=open("README.md", "r", encoding="utf-8").read(), long_description_content_type="text/markdown", - keywords="quantization, auto-tuning, post-training static quantization, post-training dynamic quantization, quantization-aware training", + keywords="quantization,auto-tuning,post-training static quantization," + "post-training dynamic quantization,quantization-aware training", license="Apache 2.0", url="https://github.com/intel/neural-compressor", packages=include_packages, include_package_data=True, package_data=package_data, - install_requires=install_requires_list, + install_requires=install_requires, entry_points=entry_points, - python_requires=">=3.6.0", + extras_require=extras_require, + python_requires=">=3.7.0", classifiers=[ "Intended Audience :: Science/Research", "Programming Language :: Python :: 3", @@ -103,3 +142,4 @@ def fetch_requirements(path): "License :: OSI Approved :: Apache Software License", ], ) + From d748ce7e523dd92b8fa39619e5c2f8675dee5cff Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 19 Oct 2023 08:33:07 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- setup.py | 56 ++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/setup.py b/setup.py index 1c9aa4f61ac..e860161bd61 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,7 @@ import re import sys from io import open + from setuptools import find_packages, setup @@ -21,37 +22,58 @@ def fetch_requirements(path): "project_name": "neural_compressor", "include_packages": find_packages( include=["neural_compressor", "neural_compressor.*", "neural_coder", "neural_coder.*"], - exclude=["neural_compressor.template", "neural_compressor.common", "neural_compressor.common.*", - "neural_compressor.torch", "neural_compressor.torch.*", - "neural_compressor.tensorflow", "neural_compressor.tensorflow.*"], + exclude=[ + "neural_compressor.template", + "neural_compressor.common", + "neural_compressor.common.*", + "neural_compressor.torch", + "neural_compressor.torch.*", + "neural_compressor.tensorflow", + "neural_compressor.tensorflow.*", + ], ), "package_data": {"": ["*.yaml"]}, "install_requires": fetch_requirements("requirements.txt"), "extras_require": { - "pt": [f'neural_compressor_3x_pt=={__version__}'], - "tf": [f'neural_compressor_3x_tf=={__version__}'], - "ort": [f'neural_compressor_3x_ort=={__version__}'], - } + "pt": [f"neural_compressor_3x_pt=={__version__}"], + "tf": [f"neural_compressor_3x_tf=={__version__}"], + "ort": [f"neural_compressor_3x_ort=={__version__}"], + }, }, "neural_compressor_3x_pt": { "project_name": "neural_compressor_3x_pt", "include_packages": find_packages( - include=["neural_compressor.common", "neural_compressor.common.*", "neural_compressor.version.py", - "neural_compressor.torch", "neural_compressor.torch.*"], + include=[ + "neural_compressor.common", + "neural_compressor.common.*", + "neural_compressor.version.py", + "neural_compressor.torch", + "neural_compressor.torch.*", + ], ), }, "neural_compressor_3x_tf": { "project_name": "neural_compressor_3x_tf", "include_packages": find_packages( - include=["neural_compressor.common", "neural_compressor.common.*", "neural_compressor.version.py", - "neural_compressor.tensorflow", "neural_compressor.tensorflow.*"], + include=[ + "neural_compressor.common", + "neural_compressor.common.*", + "neural_compressor.version.py", + "neural_compressor.tensorflow", + "neural_compressor.tensorflow.*", + ], ), }, "neural_compressor_3x_ort": { "project_name": "neural_compressor_3x_ort", "include_packages": find_packages( - include=["neural_compressor.common", "neural_compressor.common.*", "neural_compressor.version.py", - "neural_compressor.onnxrt", "neural_compressor.onnxrt.*"], + include=[ + "neural_compressor.common", + "neural_compressor.common.*", + "neural_compressor.version.py", + "neural_compressor.onnxrt", + "neural_compressor.onnxrt.*", + ], ), }, "neural_insights": { @@ -81,13 +103,12 @@ def fetch_requirements(path): ] }, "install_requires": fetch_requirements("neural_solution/requirements.txt"), - "entry_points": {"console_scripts": ["neural_solution = neural_solution.bin.neural_solution:exec"]} - } + "entry_points": {"console_scripts": ["neural_solution = neural_solution.bin.neural_solution:exec"]}, + }, } if __name__ == "__main__": - cfg_key = "neural_compressor_2x" if "neural_insights" in sys.argv: sys.argv.remove("neural_insights") @@ -125,7 +146,7 @@ def fetch_requirements(path): long_description=open("README.md", "r", encoding="utf-8").read(), long_description_content_type="text/markdown", keywords="quantization,auto-tuning,post-training static quantization," - "post-training dynamic quantization,quantization-aware training", + "post-training dynamic quantization,quantization-aware training", license="Apache 2.0", url="https://github.com/intel/neural-compressor", packages=include_packages, @@ -142,4 +163,3 @@ def fetch_requirements(path): "License :: OSI Approved :: Apache Software License", ], ) -