mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-05-17 21:10:43 +00:00
### Description `lintrunner` is a linter runner successfully used by pytorch, onnx and onnx-script. It provides a uniform experience running linters locally and in CI. It supports all major dev systems: Windows, Linux and MacOs. The checks are enforced by the `Python format` workflow. This PR adopts `lintrunner` to onnxruntime and fixed ~2000 flake8 errors in Python code. `lintrunner` now runs all required python lints including `ruff`(replacing `flake8`), `black` and `isort`. Future lints like `clang-format` can be added. Most errors are auto-fixed by `ruff` and the fixes should be considered robust. Lints that are more complicated to fix are applied `# noqa` for now and should be fixed in follow up PRs. ### Notable changes 1. This PR **removed some suboptimal patterns**: - `not xxx in` -> `xxx not in` membership checks - bare excepts (`except:` -> `except Exception`) - unused imports The follow up PR will remove: - `import *` - mutable values as default in function definitions (`def func(a=[])`) - more unused imports - unused local variables 2. Use `ruff` to replace `flake8`. `ruff` is much (40x) faster than flake8 and is more robust. We are using it successfully in onnx and onnx-script. It also supports auto-fixing many flake8 errors. 3. Removed the legacy flake8 ci flow and updated docs. 4. The added workflow supports SARIF code scanning reports on github, example snapshot:  5. Removed `onnxruntime-python-checks-ci-pipeline` as redundant ### Motivation and Context <!-- - Why is this change required? What problem does it solve? - If it fixes an open issue, please link to the issue here. --> Unified linting experience in CI and local. Replacing https://github.com/microsoft/onnxruntime/pull/14306 --------- Signed-off-by: Justin Chu <justinchu@microsoft.com>
168 lines
5.9 KiB
Python
Executable file
168 lines
5.9 KiB
Python
Executable file
#!/usr/bin/env python3
|
|
# Copyright (c) Microsoft Corporation. All rights reserved.
|
|
# Licensed under the MIT License.
|
|
|
|
import argparse
|
|
import pathlib
|
|
import shlex
|
|
import shutil
|
|
import subprocess
|
|
import sys
|
|
|
|
SCRIPT_DIR = pathlib.Path(__file__).parent.resolve()
|
|
DEFAULT_OPS_CONFIG_RELATIVE_PATH = "tools/ci_build/github/android/mobile_package.required_operators.config"
|
|
DEFAULT_BUILD_SETTINGS_RELATIVE_PATH = "tools/ci_build/github/android/default_mobile_aar_build_settings.json"
|
|
|
|
|
|
def run(cmd_arg_list, **kwargs):
|
|
print(f"Running command:\n {shlex.join(cmd_arg_list)}")
|
|
kwargs.update({"check": True})
|
|
return subprocess.run(cmd_arg_list, **kwargs)
|
|
|
|
|
|
def parse_args():
|
|
parser = argparse.ArgumentParser(
|
|
description="""Builds a custom ONNX Runtime Android package.
|
|
This script first builds a Docker image with the ONNX Runtime Android build environment
|
|
dependencies. Then, from a Docker container with that image, it calls the ONNX Runtime build
|
|
scripts to build a custom Android package. The resulting package will be under
|
|
<working_dir>/output/aar_out. See https://onnxruntime.ai/docs/build/custom.html for more
|
|
information about custom builds."""
|
|
)
|
|
|
|
parser.add_argument(
|
|
"working_dir", type=pathlib.Path, help="The directory used to store intermediate and output files."
|
|
)
|
|
|
|
parser.add_argument(
|
|
"--onnxruntime_branch_or_tag",
|
|
help="The ONNX Runtime branch or tag to build. "
|
|
"Supports branches and tags starting from 1.11 (branch rel-1.11.0 or tag v1.11.0). "
|
|
"If unspecified, builds the latest.",
|
|
)
|
|
|
|
parser.add_argument(
|
|
"--onnxruntime_repo_url", help="The ONNX Runtime repo URL. If unspecified, uses the official repo."
|
|
)
|
|
|
|
parser.add_argument(
|
|
"--include_ops_by_config",
|
|
type=pathlib.Path,
|
|
help="The configuration file specifying which ops to include. "
|
|
"Such a configuration file is generated during ONNX to ORT format model conversion. "
|
|
f"The default is {DEFAULT_OPS_CONFIG_RELATIVE_PATH} in the ONNX Runtime repo.",
|
|
)
|
|
|
|
parser.add_argument(
|
|
"--build_settings",
|
|
type=pathlib.Path,
|
|
help="The configuration file specifying the build.py options. "
|
|
f"The default is {DEFAULT_BUILD_SETTINGS_RELATIVE_PATH} in the ONNX Runtime repo.",
|
|
)
|
|
|
|
default_config = "Release"
|
|
parser.add_argument(
|
|
"--config",
|
|
choices=["Debug", "MinSizeRel", "Release", "RelWithDebInfo"],
|
|
default=default_config,
|
|
help="The build configuration. " f"The default is {default_config}.",
|
|
)
|
|
|
|
default_docker_image_tag = "onnxruntime-android-custom-build:latest"
|
|
parser.add_argument(
|
|
"--docker_image_tag",
|
|
default=default_docker_image_tag,
|
|
help="The tag for the Docker image. " f"The default is {default_docker_image_tag}.",
|
|
)
|
|
|
|
parser.add_argument(
|
|
"--docker_container_name",
|
|
help="The name of the Docker container that is run (given to the --name option of `docker run`). "
|
|
"If unspecified, the container will be automatically removed. "
|
|
"Keeping the container may be useful for debugging.",
|
|
)
|
|
|
|
parser.add_argument(
|
|
"--docker_path",
|
|
default=shutil.which("docker"),
|
|
help="The path to docker. If unspecified, docker should be in PATH.",
|
|
)
|
|
|
|
args = parser.parse_args()
|
|
|
|
if args.docker_path is None:
|
|
raise ValueError("Unable to determine docker path. Please provide it with --docker_path.")
|
|
|
|
return args
|
|
|
|
|
|
def main():
|
|
args = parse_args()
|
|
|
|
docker_build_image_args = []
|
|
if args.onnxruntime_branch_or_tag:
|
|
docker_build_image_args += ["--build-arg", f"ONNXRUNTIME_BRANCH_OR_TAG={args.onnxruntime_branch_or_tag}"]
|
|
if args.onnxruntime_repo_url:
|
|
docker_build_image_args += ["--build-arg", f"ONNXRUNTIME_REPO={args.onnxruntime_repo_url}"]
|
|
|
|
docker_build_image_cmd = [
|
|
args.docker_path,
|
|
"build",
|
|
"--tag",
|
|
args.docker_image_tag,
|
|
"--file",
|
|
str(SCRIPT_DIR / "Dockerfile"),
|
|
*docker_build_image_args,
|
|
] + [str(SCRIPT_DIR)]
|
|
|
|
run(docker_build_image_cmd)
|
|
|
|
working_dir = args.working_dir
|
|
working_dir.mkdir(parents=True, exist_ok=True)
|
|
working_dir = working_dir.resolve()
|
|
|
|
# copy over any custom build configuration files
|
|
config_files = [f for f in [args.include_ops_by_config, args.build_settings] if f]
|
|
if config_files:
|
|
input_dir = working_dir / "input"
|
|
input_dir.mkdir(exist_ok=True)
|
|
for config_file in config_files:
|
|
shutil.copy(config_file, input_dir)
|
|
|
|
output_dir = working_dir / "output"
|
|
output_dir.mkdir(exist_ok=True)
|
|
|
|
container_ops_config_file = (
|
|
f"/workspace/shared/input/{args.include_ops_by_config.name}"
|
|
if args.include_ops_by_config
|
|
else f"/workspace/onnxruntime/{DEFAULT_OPS_CONFIG_RELATIVE_PATH}"
|
|
)
|
|
|
|
container_build_settings_file = (
|
|
f"/workspace/shared/input/{args.build_settings.name}"
|
|
if args.build_settings
|
|
else f"/workspace/onnxruntime/{DEFAULT_BUILD_SETTINGS_RELATIVE_PATH}"
|
|
)
|
|
|
|
# enable use of Ctrl-C to stop when running interactively
|
|
docker_run_interactive_args = ["-it"] if sys.stdin.isatty() else []
|
|
|
|
docker_container_build_cmd = [args.docker_path, "run", *docker_run_interactive_args] + [
|
|
f"--name={args.docker_container_name}" if args.docker_container_name is not None else "--rm",
|
|
f"--volume={working_dir}:/workspace/shared",
|
|
args.docker_image_tag,
|
|
"/bin/bash",
|
|
"/workspace/scripts/build.sh",
|
|
args.config,
|
|
container_ops_config_file,
|
|
container_build_settings_file,
|
|
"/workspace/shared/output",
|
|
]
|
|
|
|
run(docker_container_build_cmd)
|
|
|
|
print("Finished building Android package at '{}'.".format(output_dir / "aar_out"))
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|