mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-05-29 23:06:41 +00:00
### Description This PR is to update the win-ort-main branch to the tip main branch as of 2025-01-23. ### PR List ddf0d377a7 [QNN EP] Add LoggingManager::HasDefaultLogger() to provider bridge API (#23467) 05fbbdf91f [QNN EP] Make QNN EP a shared library (#23120) 1336566d7f Add custom vcpkg ports (#23456) 2e1173c411 Update the compile flags for vcpkg packages (#23455) 1f628a9858 [Mobile] Add BrowserStack Android MAUI Test (#23383) 009cae0ec8 [js/webgpu] Optimize ConvTranspose (Continue) (#23429) 04a4a694cb Use onnx_protobuf.h to suppress some GCC warnings (#23453) 2e3b62b4b0 Suppress some strict-aliasing related warnings in WebGPU EP (#23454) b708f9b1dc Bump ruff from 0.9.1 to 0.9.2 (#23427) c0afc66b2a [WebNN] Remove workarounds for TFLite backend (#23406) 8a821ff7f9 Bump vite from 6.0.7 to 6.0.11 in /js/web/test/e2e/exports/testcases/vite-default (#23446) 220c1a203e Make ORT and Dawn use the same protobuf/abseil source code (#23447) b7b5792147 Change MacOS-13 to ubuntu on for android-java-api-aar-test.yml. (#23444) 19d0d2a30f WIP: Dp4MatMulNBits accuracy level 4 matmul for WebGPU EP (#23365) 95b8effbc4 [QNN EP]: Clean up QNN logging resources if an error occurs during initialization (#23435) 626134c5b5 Bump clang-format from 19.1.6 to 19.1.7 (#23428) 0cf975301f Fix eigen external deps (#23439) f9440aedce Moving RN_CI Android Testing to Linux (#23422) 1aa5902ff4 [QNN EP] workaround for QNN validation bug for Tanh with uint16 quantized output (#23432) 7f5582a0e2 Seperate RN andriod and IOS into 2 separated Stages. (#23400) 73deac2e7f Implement some missing element wise Add/Sub/Mul/Div/Neg operations for CPU and CUDA EPs (#23090) 949fe42af4 Upgrade Java version from react-native/android to Java 17 (#23066) 0892c23463 Update Qnn SDK default version to 2.30 (#23411) 94c099bcec Fix type cast build error (#23423) d633e571d1 [WebNN EP] Fix AddInitializersToSkip issues (#23354) e988ef00e2 [QNN EP] Fix regression for MatMul with two quantized/dynamic uint16 inputs (#23419) 7538795f6b Update onnxruntime binary size checks ci pipeline's docker image (#23405) 6c5ea41cad Revert "[QNN EP] Clean up correctly from a partial setup (#23320)" (#23420) e866804bbe Enable comprehension simplification in ruff rules (#23414) 0a5f1f392c bugfix: string_view of invalid memory (#23417) 4cc38e0277 fix crash when first input of BatchNormalization is 1-D (#23387) 033441487f Target py310 and modernize codebase with ruff (#23401) 87341ac010 [QNN EP] Fix segfault when unregistering HTP shared memory handles (#23402) ### Motivation and Context This update includes the change to make QNN-EP a shared library. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Adrian Lizarraga <adlizarraga@microsoft.com> Co-authored-by: Justin Chu <justinchuby@users.noreply.github.com> Co-authored-by: Yulong Wang <7679871+fs-eire@users.noreply.github.com> Co-authored-by: Edward Chen <18449977+edgchen1@users.noreply.github.com> Co-authored-by: Changming Sun <chasun@microsoft.com> Co-authored-by: Peishen Yan <peishen.yan@intel.com> Co-authored-by: Tianlei Wu <tlwu@microsoft.com> Co-authored-by: Hector Li <hecli@microsoft.com> Co-authored-by: Jian Chen <cjian@microsoft.com> Co-authored-by: Alexis Tsogias <1114095+Zyrin@users.noreply.github.com> Co-authored-by: junchao-zhao <68935141+junchao-loongson@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: sushraja-msft <44513542+sushraja-msft@users.noreply.github.com> Co-authored-by: Wanming Lin <wanming.lin@intel.com> Co-authored-by: Jiajia Qin <jiajiaqin@microsoft.com> Co-authored-by: Caroline Zhu <wolfivyaura@gmail.com>
165 lines
5.8 KiB
Python
165 lines
5.8 KiB
Python
# Copyright (c) Microsoft Corporation. All rights reserved.
|
|
# Licensed under the MIT License.
|
|
|
|
import enum
|
|
import json
|
|
import os
|
|
import pathlib
|
|
import re
|
|
import shutil
|
|
|
|
_script_dir = pathlib.Path(__file__).parent.resolve(strict=True)
|
|
repo_root = _script_dir.parents[3]
|
|
|
|
|
|
class PackageVariant(enum.Enum):
|
|
Full = 0 # full ORT build with all opsets, ops, and types
|
|
Training = 1 # full ORT build with all opsets, ops, and types, plus training APIs
|
|
|
|
@classmethod
|
|
def release_variant_names(cls):
|
|
return [v.name for v in cls if v.value >= 0]
|
|
|
|
@classmethod
|
|
def all_variant_names(cls):
|
|
return [v.name for v in cls]
|
|
|
|
|
|
_template_variable_pattern = re.compile(r"@(\w+)@") # match "@var@"
|
|
|
|
|
|
def gen_file_from_template(
|
|
template_file: pathlib.Path, output_file: pathlib.Path, variable_substitutions: dict[str, str], strict: bool = True
|
|
):
|
|
"""
|
|
Generates a file from a template file.
|
|
The template file may contain template variables that will be substituted
|
|
with the provided values in the generated output file.
|
|
In the template file, template variable names are delimited by "@"'s,
|
|
e.g., "@var@".
|
|
|
|
:param template_file The template file path.
|
|
:param output_file The generated output file path.
|
|
:param variable_substitutions The mapping from template variable name to value.
|
|
:param strict Whether to require the set of template variable names in the file and the keys of
|
|
`variable_substitutions` to be equal.
|
|
"""
|
|
with open(template_file) as template:
|
|
content = template.read()
|
|
|
|
variables_in_file = set()
|
|
|
|
def replace_template_variable(match):
|
|
variable_name = match.group(1)
|
|
variables_in_file.add(variable_name)
|
|
return variable_substitutions.get(variable_name, match.group(0))
|
|
|
|
content = _template_variable_pattern.sub(replace_template_variable, content)
|
|
|
|
if strict and variables_in_file != variable_substitutions.keys():
|
|
variables_in_substitutions = set(variable_substitutions.keys())
|
|
raise ValueError(
|
|
f"Template file variables and substitution variables do not match. "
|
|
f"Only in template file: {sorted(variables_in_file - variables_in_substitutions)}. "
|
|
f"Only in substitutions: {sorted(variables_in_substitutions - variables_in_file)}."
|
|
)
|
|
|
|
with open(output_file, mode="w") as output:
|
|
output.write(content)
|
|
|
|
|
|
def filter_files(all_file_patterns: list[str], excluded_file_patterns: list[str]):
|
|
"""
|
|
Filters file paths based on inclusion and exclusion patterns
|
|
|
|
:param all_file_patterns The list of file paths to filter.
|
|
:param excluded_file_patterns The list of exclusion patterns.
|
|
|
|
:return The filtered list of file paths
|
|
"""
|
|
# get all files matching the patterns in all_file_patterns
|
|
all_files = [str(path.relative_to(repo_root)) for pattern in all_file_patterns for path in repo_root.glob(pattern)]
|
|
|
|
# get all files matching the patterns in excluded_file_patterns
|
|
exclude_files = [
|
|
str(path.relative_to(repo_root)) for pattern in excluded_file_patterns for path in repo_root.glob(pattern)
|
|
]
|
|
|
|
# return the difference
|
|
return list(set(all_files) - set(exclude_files))
|
|
|
|
|
|
def copy_repo_relative_to_dir(patterns: list[str], dest_dir: pathlib.Path):
|
|
"""
|
|
Copies file paths relative to the repo root to a directory.
|
|
The given paths or path patterns are relative to the repo root, and the
|
|
repo root-relative intermediate directory structure is maintained.
|
|
|
|
:param patterns The paths or path patterns relative to the repo root.
|
|
:param dest_dir The destination directory.
|
|
"""
|
|
paths = [path for pattern in patterns for path in repo_root.glob(pattern)]
|
|
for path in paths:
|
|
repo_relative_path = path.relative_to(repo_root)
|
|
dst_path = dest_dir / repo_relative_path
|
|
os.makedirs(dst_path.parent, exist_ok=True)
|
|
shutil.copy(path, dst_path)
|
|
|
|
|
|
def load_json_config(json_config_file: pathlib.Path):
|
|
"""
|
|
Loads configuration info from a JSON file.
|
|
|
|
:param json_config_file The JSON configuration file path.
|
|
:return The configuration info values.
|
|
"""
|
|
with open(json_config_file) as config:
|
|
return json.load(config)
|
|
|
|
|
|
def get_podspec_values(framework_info):
|
|
"""
|
|
Get the podspec deployement targets and weak framework info from the dictionary that load_json_config returned.
|
|
Looks for iphonesimulator, iphoneos and macos settings.
|
|
Handles missing platforms and checks consistency.
|
|
Returns empty string for deployment target if that platofrm is not enabled.
|
|
|
|
:return (ios_deployment_target, macos_deployment_target, weak_framework)
|
|
"""
|
|
ios_deployment_target = ""
|
|
macos_deployment_target = ""
|
|
weak_framework = "" # should be the same for all platforms
|
|
# get info, allowing for a subset of platforms to be specified
|
|
for framework in ("iphonesimulator", "iphoneos", "macosx"):
|
|
if framework not in framework_info:
|
|
continue
|
|
|
|
target = framework_info[framework]["APPLE_DEPLOYMENT_TARGET"]
|
|
weak = framework_info[framework]["WEAK_FRAMEWORK"]
|
|
|
|
if not weak_framework:
|
|
weak_framework = weak
|
|
else:
|
|
# should be consistent
|
|
assert weak == weak_framework
|
|
|
|
if framework == "macosx":
|
|
macos_deployment_target = target
|
|
else:
|
|
if not ios_deployment_target:
|
|
ios_deployment_target = target
|
|
else:
|
|
# should be consistent
|
|
assert ios_deployment_target == target
|
|
|
|
return (ios_deployment_target, macos_deployment_target, weak_framework)
|
|
|
|
|
|
def get_ort_version():
|
|
"""
|
|
Gets the ONNX Runtime version string from the repo.
|
|
|
|
:return The ONNX Runtime version string.
|
|
"""
|
|
with open(repo_root / "VERSION_NUMBER") as version_file:
|
|
return version_file.read().strip()
|