Skip to content

Commit 64381ae

Browse files
tianleiwutianleiwu
committed
Merge branch 'main' into tlwu/layer_norm_broadcast
2 parents 5b2290f + 436dfc3 commit 64381ae

File tree

192 files changed

+5883
-994
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+5883
-994
lines changed

‎.github/workflows/mac.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,13 @@ jobs:
125125
with:
126126
vcpkgDirectory: "${{ runner.temp }}/vcpkg"
127127
vcpkgGitCommitId: "b322364f06308bdd24823f9d8f03fe0cc86fd46f" # 2024.12.16
128-
runVcpkgInstall: true # vcpkg install --x-manifest-root cmake --x-install-root .build --overlay-triplets cmake/vcpkg-triplets
128+
runVcpkgInstall: true # vcpkg install --x-manifest-root cmake --x-install-root .build --overlay-triplets cmake/vcpkg-triplets/default
129129
vcpkgJsonGlob: "cmake/vcpkg.json"
130130
vcpkgConfigurationJsonGlob: "cmake/vcpkg-configuration.json"
131131
env:
132132
VCPKG_INSTALLED_DIR: "${{ github.workspace }}/.build"
133133
VCPKG_DEFAULT_TRIPLET: "x64-osx"
134-
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/cmake/vcpkg-triplets"
134+
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/cmake/vcpkg-triplets/default"
135135
# VCPKG_BINARY_SOURCES: "default" # https://learn.microsoft.com/en-us/vcpkg/reference/binarycaching
136136

137137
- name: "Run compile_schema.py"
@@ -168,21 +168,21 @@ jobs:
168168
--cmake_extra_defines "VCPKG_INSTALLED_DIR:PATH=${{ github.workspace }}/.build" \
169169
--cmake_extra_defines "VCPKG_INSTALL_OPTIONS=--x-feature=tests"
170170
env:
171-
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/cmake/vcpkg-triplets"
171+
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/cmake/vcpkg-triplets/default"
172172
shell: bash
173173

174174
- name: "Run vcpkg(arm64-osx)"
175175
uses: lukka/run-vcpkg@v11
176176
with:
177177
vcpkgDirectory: "${{ runner.temp }}/vcpkg"
178178
doNotUpdateVcpkg: true
179-
runVcpkgInstall: true # vcpkg install --x-manifest-root cmake --x-install-root .build --overlay-triplets cmake/vcpkg-triplets
179+
runVcpkgInstall: true # vcpkg install --x-manifest-root cmake --x-install-root .build --overlay-triplets cmake/vcpkg-triplets/default
180180
vcpkgJsonGlob: "cmake/vcpkg.json"
181181
vcpkgConfigurationJsonGlob: "cmake/vcpkg-configuration.json"
182182
env:
183183
VCPKG_INSTALLED_DIR: "${{ github.workspace }}/.build"
184184
VCPKG_DEFAULT_TRIPLET: "arm64-osx"
185-
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/cmake/vcpkg-triplets"
185+
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/cmake/vcpkg-triplets/default"
186186
# VCPKG_BINARY_SOURCES: "default" # https://learn.microsoft.com/en-us/vcpkg/reference/binarycaching
187187

188188
- name: "Run build.py(arm64-osx)"
@@ -201,7 +201,7 @@ jobs:
201201
--cmake_extra_defines "VCPKG_INSTALLED_DIR:PATH=${{ github.workspace }}/.build" \
202202
--cmake_extra_defines "VCPKG_INSTALL_OPTIONS=--x-feature=tests"
203203
env:
204-
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/cmake/vcpkg-triplets"
204+
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/cmake/vcpkg-triplets/default"
205205
shell: bash
206206

207207
Objective-C-StaticAnalysis:

‎.github/workflows/windows.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ jobs:
5757
with:
5858
vcpkgDirectory: "C:/vcpkg" # use VCPKG_INSTALLATION_ROOT of the image
5959
vcpkgGitCommitId: "b322364f06308bdd24823f9d8f03fe0cc86fd46f" # 2024.12.16
60-
runVcpkgInstall: true # vcpkg install --x-manifest-root cmake --x-install-root .build --overlay-triplets cmake/vcpkg-triplets
60+
runVcpkgInstall: true # vcpkg install --x-manifest-root cmake --x-install-root .build --overlay-triplets cmake/vcpkg-triplets/default
6161
vcpkgJsonGlob: "cmake/vcpkg.json"
6262
vcpkgConfigurationJsonGlob: "cmake/vcpkg-configuration.json"
6363
env:
6464
VCPKG_INSTALLED_DIR: "${{ github.workspace }}/.build"
6565
VCPKG_DEFAULT_TRIPLET: "x64-windows"
66-
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/cmake/vcpkg-triplets"
66+
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/cmake/vcpkg-triplets/default"
6767
# VCPKG_BINARY_SOURCES: "default" # https://learn.microsoft.com/en-us/vcpkg/reference/binarycaching
6868

6969
- name: "Run compile_schema.py"
@@ -102,21 +102,21 @@ jobs:
102102
--cmake_extra_defines "VCPKG_INSTALLED_DIR:PATH=${{ github.workspace }}/.build" `
103103
--cmake_extra_defines "VCPKG_INSTALL_OPTIONS=--x-feature=tests"
104104
env:
105-
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/cmake/vcpkg-triplets"
105+
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/cmake/vcpkg-triplets/default"
106106
shell: pwsh
107107

108108
- name: "Run vcpkg(arm64-windows)"
109109
uses: lukka/run-vcpkg@v11
110110
with:
111111
vcpkgDirectory: "C:/vcpkg" # use VCPKG_INSTALLATION_ROOT of the image
112112
doNotUpdateVcpkg: true
113-
runVcpkgInstall: true # vcpkg install --x-manifest-root cmake --x-install-root .build --overlay-triplets cmake/vcpkg-triplets
113+
runVcpkgInstall: true # vcpkg install --x-manifest-root cmake --x-install-root .build --overlay-triplets cmake/vcpkg-triplets/default
114114
vcpkgJsonGlob: "cmake/vcpkg.json"
115115
vcpkgConfigurationJsonGlob: "cmake/vcpkg-configuration.json"
116116
env:
117117
VCPKG_INSTALLED_DIR: "${{ github.workspace }}/.build"
118118
VCPKG_DEFAULT_TRIPLET: "arm64-windows"
119-
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/cmake/vcpkg-triplets"
119+
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/cmake/vcpkg-triplets/default"
120120
# VCPKG_BINARY_SOURCES: "default" # https://learn.microsoft.com/en-us/vcpkg/reference/binarycaching
121121

122122
- name: "Run build.py(arm64-windows)"
@@ -134,5 +134,5 @@ jobs:
134134
--cmake_extra_defines "VCPKG_INSTALLED_DIR:PATH=${{ github.workspace }}/.build" `
135135
--cmake_extra_defines "VCPKG_INSTALL_OPTIONS=--x-feature=tests"
136136
env:
137-
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/cmake/vcpkg-triplets"
137+
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/cmake/vcpkg-triplets/default"
138138
shell: pwsh

‎cmake/adjust_global_compile_flags.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,10 @@ else()
338338
# suppress warnings from flatbuffers
339339
string(APPEND CMAKE_CXX_FLAGS " -Wno-restrict ")
340340
string(APPEND CMAKE_C_FLAGS " -Wno-restrict ")
341+
if(onnxruntime_USE_XNNPACK)
342+
# https://github.com/google/XNNPACK/issues/7650
343+
string(APPEND CMAKE_C_FLAGS " -Wno-incompatible-pointer-types ")
344+
endif()
341345
endif()
342346
# Check support for AVX and f16c.
343347
include(CheckCXXCompilerFlag)

‎cmake/onnxruntime_optimizer.cmake‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ if (onnxruntime_EXTERNAL_TRANSFORMER_SRC_PATH)
106106
file(GLOB onnxruntime_external_transformer_src ${onnxruntime_external_transformer_src_patterns})
107107
list(APPEND onnxruntime_optimizer_srcs ${onnxruntime_external_transformer_src})
108108
endif()
109+
if(HAS_MAYBE_UNINITIALIZED)
110+
set_source_files_properties("${ONNXRUNTIME_ROOT}/core/optimizer/selectors_actions/selector_action_transformer.cc" PROPERTIES COMPILE_FLAGS "-Wno-maybe-uninitialized")
111+
endif()
109112

110113
onnxruntime_add_static_library(onnxruntime_optimizer ${onnxruntime_optimizer_srcs})
111114

‎cmake/vcpkg-triplets/arm64-osx.cmake‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎cmake/vcpkg-triplets/arm64-windows.cmake‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎cmake/vcpkg-triplets/asan/arm64-linux.cmake‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Copyright (c) Microsoft Corporation. All rights reserved.
2+
# Licensed under the MIT License.
3+
set(VCPKG_TARGET_ARCHITECTURE arm64)
4+
set(VCPKG_CRT_LINKAGE dynamic)
5+
set(VCPKG_LIBRARY_LINKAGE static)
6+
set(VCPKG_C_FLAGS "-fsanitize=address")
7+
set(VCPKG_CXX_FLAGS "-fsanitize=address")
8+
set(VCPKG_CMAKE_SYSTEM_NAME Linux)
9+
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
10+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error -DBENCHMARK_ENABLE_WERROR=OFF)
11+
set(VCPKG_LINKER_FLAGS "-fsanitize=address")
12+
if(PORT MATCHES "onnx")
13+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
14+
"-DONNX_DISABLE_STATIC_REGISTRATION=ON"
15+
)
16+
endif()
17+
if(PORT MATCHES "benchmark")
18+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
19+
"-DBENCHMARK_ENABLE_WERROR=OFF"
20+
)
21+
endif()

‎cmake/vcpkg-triplets/asan/arm64-osx.cmake‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Copyright (c) Microsoft Corporation. All rights reserved.
2+
# Licensed under the MIT License.
3+
set(VCPKG_TARGET_ARCHITECTURE arm64)
4+
set(VCPKG_CRT_LINKAGE dynamic)
5+
set(VCPKG_LIBRARY_LINKAGE static)
6+
set(VCPKG_C_FLAGS "-fsanitize=address")
7+
set(VCPKG_CXX_FLAGS "-fsanitize=address")
8+
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
9+
set(VCPKG_OSX_ARCHITECTURES "arm64")
10+
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
11+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error -DBENCHMARK_ENABLE_WERROR=OFF)
12+
set(VCPKG_LINKER_FLAGS "-fsanitize=address")
13+
if(PORT MATCHES "onnx")
14+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
15+
"-DONNX_DISABLE_STATIC_REGISTRATION=ON"
16+
)
17+
endif()
18+
if(PORT MATCHES "benchmark")
19+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
20+
"-DBENCHMARK_ENABLE_WERROR=OFF"
21+
)
22+
endif()

‎cmake/vcpkg-triplets/asan/arm64-windows-static-md.cmake‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Copyright (c) Microsoft Corporation. All rights reserved.
2+
# Licensed under the MIT License.
3+
set(VCPKG_TARGET_ARCHITECTURE arm64)
4+
set(VCPKG_CRT_LINKAGE dynamic)
5+
set(VCPKG_LIBRARY_LINKAGE static)
6+
set(VCPKG_C_FLAGS "/MP /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /fsanitize=address")
7+
set(VCPKG_CXX_FLAGS "/MP /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /fsanitize=address /Zc:__cplusplus")
8+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error)
9+
if(PORT MATCHES "onnx")
10+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
11+
"-DONNX_DISABLE_STATIC_REGISTRATION=ON"
12+
)
13+
endif()
14+
if(PORT MATCHES "benchmark")
15+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
16+
"-DBENCHMARK_ENABLE_WERROR=OFF"
17+
)
18+
endif()

‎cmake/vcpkg-triplets/asan/arm64-windows-static.cmake‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Copyright (c) Microsoft Corporation. All rights reserved.
2+
# Licensed under the MIT License.
3+
set(VCPKG_TARGET_ARCHITECTURE arm64)
4+
set(VCPKG_CRT_LINKAGE static)
5+
set(VCPKG_LIBRARY_LINKAGE static)
6+
set(VCPKG_C_FLAGS "/MP /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /fsanitize=address")
7+
set(VCPKG_CXX_FLAGS "/MP /DWIN32 /D_WINDOWS /DWINAPI_FAMILY=100 /DWINVER=0x0A00 /D_WIN32_WINNT=0x0A00 /DNTDDI_VERSION=0x0A000000 /fsanitize=address /Zc:__cplusplus")
8+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS --compile-no-warning-as-error)
9+
if(PORT MATCHES "onnx")
10+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
11+
"-DONNX_DISABLE_STATIC_REGISTRATION=ON"
12+
)
13+
endif()
14+
if(PORT MATCHES "benchmark")
15+
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
16+
"-DBENCHMARK_ENABLE_WERROR=OFF"
17+
)
18+
endif()

0 commit comments

Comments
 (0)