Skip to content

Commit

Permalink
Merge branch 'main' of github.com:microsoft/onnxruntime into sajandhy…
Browse files Browse the repository at this point in the history
…/webgpu_upgrade_emsdk_from_3.1.59_to_3.1.62
  • Loading branch information
satyajandhyala committed Jul 30, 2024
2 parents 53595ec + 530a2d7 commit 1e3c765
Show file tree
Hide file tree
Showing 390 changed files with 10,203 additions and 5,911 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/05-performance.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Performance
description: issues related to performance
title: "[Performance] "
labels: ["performance"]
body:
- type: markdown
attributes:
Expand Down
31 changes: 18 additions & 13 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
api:javascript: '/\bjavascript\b/i'
api:CSharp: '/(\bc\s*sharp\b|\bc#)/i'
api:java: '/\bjava\b/i'
api:javascript: '/\bjavascript\b/i'
ep:ACL: '/\bacl\b/i'
ep:ArmNN: '/\barmnn\b/i'
ep:CUDA: '/\bcuda\b/i'
ep:DML: '/(\bdirectml\b|\bdml\b)/i'
ep:MIGraphX: '/\bmigraphx\b/i'
ep:oneDNN: '/\bonednn\b/i'
ep:CANN: '/\bcann\b/i'
ep:CoreML: '/\bcore\s*ml\b/i'
ep:DML: '/(\bdirect\s*ml\b|\bdml\b)/i'
ep:MIGraphX: '/\bmi\s*graph\s*x\b/i'
ep:oneDNN: '/\bone\s*dnn\b/i'
ep:OpenVINO: '/\bopen\s*vino\b/i'
ep:RockchipNPU: '/\brockchip\b/i'
ep:QNN: '/\bqnn\b/i'
ep:RockchipNPU: '/\brockchip(?:npu)?\b/i'
ep:ROCm: '/\brocm\b/i'
ep:TensorRT: '/(\btensor\s*rt\b|\btrt\b)/i'
ep:SNPE: '/\bsnpe\b/i'
ep:tvm: '/\btvm\b/i'
ep:VitisAI: '/\bvitis(?:ai)?\b/i'
platform:jetson: '/\bjetson\b/i'
platform:mobile: '/(\bobj(?:ective)?-?c\b|\bnnapi\b|\bcore-?ml\b|\bmobile\b|\bandroid\b|\bios\b|\bxamarin\b|\bmaui\b)/i'
platform:web: '/(\bwebgl\b|\bweb-?gpu\b|\bwasm\b|\bonnxruntime-node\b|\bonnxruntime-web\b)/i'
platform:windows: '/(\bwindows\b|\bwinrt\b|\bwinml\b)/i'
model:transformer: '/(\bbert\b|\bgpt-?2\b|\bhugging-?face\b|\blong-?former\b|\bt5\b)/i'
quantization: '/(is this a quantized model\?\n\nYes|\bquantization\b)/i'
ep:WebGPU: '/\bwebgpu\b/i'
ep:WebNN: '/\bwebnn\b/i'
ep:Xnnpack: '/\bxnn\s*pack\b/i'
.NET: '/(\bdot\s*net\b|\bnuget\b|\.net\b)/i'
platform:jetson: '/(\bjetson\b|\bjetpack\b)/i'
platform:mobile: '/(\bobj(?:ective)?-?c\b|\bnnapi\b|\bmobile\b|\bandroid\b|\bios\b|\bxamarin\b|\bmaui\b)/i'
platform:web: '/(\bwebgl\b|\bweb-?gpu\b|\bwasm\b|\bonnxruntime-node\b|\bonnxruntime-web\b|\bonnxruntime-react-native\b|\bnpm\b|\btransformers\.js\b)/i'
model:transformer: '/\btransformers(?!\.js)\b/i'
4 changes: 4 additions & 0 deletions .github/title-only-labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ep:CUDA: '/\bcuda\b/i'
ep:TensorRT: '/(\btensor\s*rt\b|\btrt\b)/i'
platform:windows: '/(\bwindows\b|\bwinrt\b|\bwinml\b)/i'
quantization: '/(quant|\bqdq\b)/i'
5 changes: 3 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
checkout_path: ${{ github.workspace }}

lint-cpp:
name: Lint C++
name: Optional Lint C++
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
Expand All @@ -89,10 +89,11 @@ jobs:
- name: Generate ONNX protobuf files
run: cmake --build build/Debug --config Debug --target onnx_proto
- uses: reviewdog/action-cpplint@master
continue-on-error: true
with:
github_token: ${{ secrets.github_token }}
reporter: github-pr-check
level: warning
level: info
flags: --linelength=120
--exclude=java/src/main/native/*.c
--exclude=onnxruntime/core/mlas/inc/*
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/title-only-labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: "Title Only Issue Labeler"
on:
issues:
types: [opened, edited]

permissions:
issues: write

jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: github/[email protected]
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/title-only-labeler.yml
not-before: 2020-01-15T02:54:32Z
enable-versioned-regex: 0
include-title: 1
include-body: 0
1 change: 1 addition & 0 deletions .lintrunner.toml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ exclude_patterns = [
'onnxruntime/core/mickey/gemm/**', # CUTLASS based libs recommends NO automatic code formatting
'winml/lib/Api.Image/shaders/**', # Contains data chunks
'onnxruntime/contrib_ops/cuda/bert/flash_attention/flash_fwd_launch_template.h', # Bool Switches hang Clang
'onnxruntime/core/providers/coreml/mlprogram_test_scripts/**', # test scripts only
]
command = [
'python',
Expand Down
2 changes: 1 addition & 1 deletion cgmanifests/generate_cgmanifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def add_github_dep(name, parsed_url):
return
# Make a REST call to convert to tag to a git commit
url = f"https://api.github.com/repos/{org_name}/{repo_name}/git/refs/tags/{tag}"
print("requesting %s ..." % url)
print(f"requesting {url} ...")
res = requests.get(url, auth=(args.username, args.token))
response_json = res.json()
tag_object = response_json["object"]
Expand Down
2 changes: 1 addition & 1 deletion cgmanifests/generated/cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
"component": {
"type": "git",
"git": {
"commitHash": "06adf4461ac84035bee658c6cf5df39f7ab6071d",
"commitHash": "f161f95883b4ebd8cb789de5efc67b73c0a6e694",
"repositoryUrl": "https://github.com/onnx/onnx-tensorrt.git"
},
"comments": "onnx_tensorrt"
Expand Down
4 changes: 2 additions & 2 deletions cmake/deps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ mimalloc;https://github.com/microsoft/mimalloc/archive/refs/tags/v2.1.1.zip;d5ee
mp11;https://github.com/boostorg/mp11/archive/refs/tags/boost-1.82.0.zip;9bc9e01dffb64d9e0773b2e44d2f22c51aace063
neural_speed;https://github.com/intel/neural-speed/archive/refs/tags/v0.3.zip;5ec64e3071edc7347ebd8a81679cf06e2bb9b851
onnx;https://github.com/onnx/onnx/archive/refs/tags/v1.16.1.zip;2eb9198bb352757d5ff13977cbe0634898e0837c
#use the latest commit of 10.0-GA
onnx_tensorrt;https://github.com/onnx/onnx-tensorrt/archive/06adf4461ac84035bee658c6cf5df39f7ab6071d.zip;46dceef659d75d276e7914a8057c2282269d5e7b
#use the latest commit of 10.2-GA
onnx_tensorrt;https://github.com/onnx/onnx-tensorrt/archive/f161f95883b4ebd8cb789de5efc67b73c0a6e694.zip;2148d0c79a171abf2b9451f3bfec164e85caf2ef
protobuf;https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.12.zip;7cf2733949036c7d52fda017badcab093fe73bfa
protoc_win64;https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-win64.zip;b4521f7ada5b260380f94c4bd7f1b7684c76969a
protoc_win32;https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-win32.zip;3688010318192c46ce73213cdfb6b3e5656da874
Expand Down
3 changes: 0 additions & 3 deletions cmake/external/onnxruntime_external_deps.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ if (onnxruntime_BUILD_UNIT_TESTS)
if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
set(gtest_disable_pthreads ON)
endif()
if (${CMAKE_SYSTEM_NAME} MATCHES "AIX")
set(gtest_disable_pthreads ON CACHE BOOL "gtest_disable_pthreads" FORCE)
endif()
set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
if (IOS OR ANDROID)
# on mobile platforms the absl flags class dumps the flag names (assumably for binary size), which breaks passing
Expand Down
1 change: 1 addition & 0 deletions cmake/onnxruntime.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ function(get_c_cxx_api_headers HEADERS_VAR)
"${REPO_ROOT}/include/onnxruntime/core/session/onnxruntime_float16.h"
"${REPO_ROOT}/include/onnxruntime/core/session/onnxruntime_run_options_config_keys.h"
"${REPO_ROOT}/include/onnxruntime/core/session/onnxruntime_session_options_config_keys.h"
"${REPO_ROOT}/include/onnxruntime/core/session/onnxruntime_lite_custom_op.h"
)

if (onnxruntime_ENABLE_TRAINING_APIS)
Expand Down
4 changes: 3 additions & 1 deletion cmake/onnxruntime_framework.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,9 @@ if (WIN32)
target_compile_definitions(onnxruntime_framework PRIVATE _SCL_SECURE_NO_WARNINGS)
endif()

if (NOT onnxruntime_BUILD_SHARED_LIB)
if (onnxruntime_BUILD_SHARED_LIB)
install(FILES ${PROJECT_SOURCE_DIR}/../include/onnxruntime/core/framework/provider_options.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/onnxruntime/)
else()
install(DIRECTORY ${PROJECT_SOURCE_DIR}/../include/onnxruntime/core/framework DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/onnxruntime/core)
install(TARGETS onnxruntime_framework
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
Expand Down
4 changes: 2 additions & 2 deletions cmake/onnxruntime_providers_openvino.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

# Header paths
find_package(OpenVINO REQUIRED COMPONENTS Runtime ONNX)
if(OpenVINO_VERSION VERSION_LESS 2023.0)
message(FATAL_ERROR "OpenVINO 2023.0 and newer are supported. Please, latest OpenVINO release")
if(OpenVINO_VERSION VERSION_LESS 2024.0)
message(FATAL_ERROR "OpenVINO 2024.0 and newer are supported. Please, use latest OpenVINO release")
endif()

if (WIN32)
Expand Down
8 changes: 6 additions & 2 deletions cmake/onnxruntime_python.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,12 @@ endif()

onnxruntime_add_include_to_target(onnxruntime_pybind11_state Python::Module Python::NumPy)
target_include_directories(onnxruntime_pybind11_state PRIVATE ${ONNXRUNTIME_ROOT} ${pybind11_INCLUDE_DIRS})
if(onnxruntime_USE_CUDA AND onnxruntime_CUDNN_HOME)
target_include_directories(onnxruntime_pybind11_state PRIVATE ${onnxruntime_CUDNN_HOME}/include)
if(onnxruntime_USE_CUDA)
target_include_directories(onnxruntime_pybind11_state PRIVATE ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
# cudnn_home is optional for Window when cuda and cudnn are installed in the same directory.
if(onnxruntime_CUDNN_HOME)
target_include_directories(onnxruntime_pybind11_state PRIVATE ${onnxruntime_CUDNN_HOME}/include)
endif()
endif()
if(onnxruntime_USE_CANN)
target_include_directories(onnxruntime_pybind11_state PRIVATE ${onnxruntime_CANN_HOME}/include)
Expand Down
5 changes: 4 additions & 1 deletion cmake/onnxruntime_unittests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,10 @@ if(onnxruntime_USE_RKNPU)
endif()

if(onnxruntime_USE_COREML)
list(APPEND onnxruntime_test_framework_src_patterns ${TEST_SRC_DIR}/providers/coreml/*)
list(APPEND onnxruntime_test_framework_src_patterns ${TEST_SRC_DIR}/providers/coreml/*.cc)
if(APPLE)
list(APPEND onnxruntime_test_framework_src_patterns ${TEST_SRC_DIR}/providers/coreml/*.mm)
endif()
list(APPEND onnxruntime_test_framework_libs onnxruntime_providers_coreml coreml_proto)
list(APPEND onnxruntime_test_providers_dependencies onnxruntime_providers_coreml coreml_proto)
list(APPEND onnxruntime_test_providers_libs onnxruntime_providers_coreml coreml_proto)
Expand Down
2 changes: 1 addition & 1 deletion cmake/onnxruntime_webassembly.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ else()
"SHELL:-s EXPORT_ALL=0"
"SHELL:-s VERBOSE=0"
"SHELL:-s FILESYSTEM=0"
"SHELL:-s INCOMING_MODULE_JS_API=[preRun,locateFile,arguments,onExit,wasmMemory,buffer,instantiateWasm,mainScriptUrlOrBlob]"
"SHELL:-s INCOMING_MODULE_JS_API=[locateFile,instantiateWasm,wasmBinary]"
"SHELL:-s WASM_BIGINT=1"
${WASM_API_EXCEPTION_CATCHING}
--no-entry
Expand Down
Loading

0 comments on commit 1e3c765

Please sign in to comment.