Skip to content

Commit c31edee

Browse files
authored
Merge branch 'main' into titaiwang/public_op_shape_inference
2 parents 7951ae5 + a0722c3 commit c31edee

File tree

1,412 files changed

+8784
-5615
lines changed

Some content is hidden

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

1,412 files changed

+8784
-5615
lines changed

.github/workflows/auto_update_doc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
git diff -- . ':(exclude)onnx/onnx-data.proto' ':(exclude)onnx/onnx-data.proto3'
5555
5656
- name: Commit changes with updated files
57-
uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0
57+
uses: stefanzweifel/git-auto-commit-action@778341af668090896ca464160c2def5d1d1a3eb0 # v6.0.1
5858
with:
5959
commit_message: CI:apply auto updated documentation/backend test data
6060
commit_options: "--signoff"

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
6161
# Initializes the CodeQL tools for scanning.
6262
- name: Initialize CodeQL
63-
uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
63+
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
6464
with:
6565
languages: ${{ matrix.language }}
6666
queries: security-extended,security-and-quality
@@ -91,6 +91,6 @@ jobs:
9191
# ./location_of_script_within_repo/buildscript.sh
9292

9393
- name: Perform CodeQL Analysis
94-
uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
94+
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
9595
with:
9696
category: "/language:${{matrix.language}}"

.github/workflows/copilot-setup-steps.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
paths:
1212
- .github/workflows/copilot-setup-steps.yml
1313

14+
permissions:
15+
contents: read
16+
1417
jobs:
1518
# The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
1619
copilot-setup-steps:

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
# To toggle linter comments in the files page, press `i` on the keyboard
104104
if: always()
105105
continue-on-error: true
106-
uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
106+
uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
107107
with:
108108
# Path to SARIF file relative to the root of the repository
109109
sarif_file: lintrunner.sarif

.github/workflows/pixi_build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99
# run weekly on Sunday 23:59
1010
- cron: '29 23 * * SUN'
1111

12+
permissions:
13+
contents: read
14+
1215
concurrency:
1316
group: ${{ github.workflow }}-${{ github.ref }}
1417
cancel-in-progress: false
@@ -34,7 +37,7 @@ jobs:
3437
submodules: recursive
3538
fetch-depth: 0
3639
- name: Set up pixi
37-
uses: prefix-dev/setup-pixi@v0.8.8
40+
uses: prefix-dev/setup-pixi@v0.8.10
3841
with:
3942
environments: ${{ matrix.environment }}
4043
- name: Install repository

.github/workflows/release_mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ permissions:
2525
jobs:
2626
build:
2727
if: github.event_name != 'pull_request' || startsWith( github.base_ref, 'rel-') || contains( github.event.pull_request.labels.*.name, 'run release CIs')
28-
runs-on: macos-latest
28+
runs-on: macos-14
2929
strategy:
3030
matrix:
3131
python-version: ['3.14-dev', '3.13t', '3.13', '3.12', '3.11', '3.10', '3.9']

.github/workflows/release_win_x86_64.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
if: github.event_name != 'pull_request' || startsWith( github.base_ref, 'rel-') || contains( github.event.pull_request.labels.*.name, 'run release CIs')
2323
runs-on: windows-2022
2424
strategy:
25+
fail-fast: false
2526
matrix:
2627
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.13t']
2728
architecture: ['x64', 'x86']
@@ -79,17 +80,17 @@ jobs:
7980
python -m build --wheel
8081
Get-ChildItem -Path dist/*.whl | foreach {python -m pip install --upgrade $_.fullname}
8182
82-
- name: Test the installed wheel
83-
if: steps.build_wheel.outcome == 'success'
84-
run: |
85-
python -m pip install -q -r requirements-release_test.txt
86-
pytest
87-
8883
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
8984
if: steps.build_wheel.outcome == 'success'
9085
with:
9186
name: wheels-${{ inputs.os }}-${{ matrix.python-version }}-${{matrix.architecture}}
9287
path: ./dist
88+
89+
- name: Test the installed wheel
90+
if: steps.build_wheel.outcome == 'success'
91+
run: |
92+
python -m pip install -q -r requirements-release_test.txt
93+
pytest
9394
9495
- name: Verify ONNX with the latest numpy
9596
if: steps.build_wheel.outcome == 'success'

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ jobs:
7171

7272
# Upload the results to GitHub's code scanning dashboard.
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
74+
uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
7575
with:
7676
sarif_file: results.sarif

.lintrunner.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ include_patterns = [
7474
exclude_patterns = [
7575
'onnx/backend/test/**',
7676
'onnx/reference/ops/**', # FIXME: Enable this once typing is fixed
77-
'onnx/test/parser_test.py',
78-
'onnx/test/numpy_helper_test.py',
77+
'onnx/test/**', # Disable mypy for tests
7978
'onnx/reference/reference_evaluator.py',
8079
]
8180
command = [

CMakeLists.txt

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@ if(MSVC)
117117
string(APPEND CMAKE_C_FLAGS " /EHsc /wd26812")
118118
endif()
119119
add_compile_options(/MP /utf-8 /nologo)
120+
add_compile_options(
121+
/wd5287 # https://developercommunity.visualstudio.com/t/warning-C5287:-operands-are-different-e/10877942?sort=newest
122+
/Zc:lambda # https://developercommunity.visualstudio.com/t/fatal--error-C1001:-Internal-compiler-er/10906076
123+
)
120124
endif()
121125

122126
if(ONNX_DISABLE_EXCEPTIONS)
@@ -271,8 +275,8 @@ if(NOT ONNX_PROTOC_EXECUTABLE)
271275
set(ONNX_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
272276
# Use this setting to build third-party libs.
273277
set(BUILD_SHARED_LIBS ${ONNX_USE_PROTOBUF_SHARED_LIBS})
274-
set(ProtobufURL https://github.com/protocolbuffers/protobuf/releases/download/v31.0/protobuf-31.0.tar.gz)
275-
set(ProtobufSHA1 c0cecb7cfc881f56a5b09f00a965aae408265fd0)
278+
set(ProtobufURL https://github.com/protocolbuffers/protobuf/releases/download/v31.1/protobuf-31.1.tar.gz)
279+
set(ProtobufSHA1 da10aaa3bf779735a8a9acde1256a47ce5d148be)
276280
FetchContent_Declare(
277281
Protobuf
278282
URL ${ProtobufURL}
@@ -282,7 +286,7 @@ if(NOT ONNX_PROTOC_EXECUTABLE)
282286
message(STATUS "Download and build Protobuf from ${ProtobufURL}")
283287
FetchContent_MakeAvailable(Protobuf)
284288
set(ONNX_PROTOC_EXECUTABLE $<TARGET_FILE:protobuf::protoc>)
285-
set(Protobuf_VERSION "6.31.0")
289+
set(Protobuf_VERSION "6.31.1")
286290
# Change back the BUILD_SHARED_LIBS to control the onnx project.
287291
set(BUILD_SHARED_LIBS ${ONNX_BUILD_SHARED_LIBS})
288292
set(PROTOBUF_DIR "${protobuf_BINARY_DIR}")
@@ -428,14 +432,14 @@ target_include_directories(onnx_proto PUBLIC
428432
if(MSVC)
429433
# For disabling Protobuf related warnings
430434
target_compile_options(onnx_proto PUBLIC
431-
/wd4146 # unary minus operator applied to unsigned type,
432-
# result still unsigned
433-
/wd4244 # 'argument': conversion from 'google::
434-
# protobuf::uint64' to 'int', possible
435-
# loss of data
436-
/wd4267 # Conversion from 'size_t' to 'int',
437-
# possible loss of data
438-
/wd4141 # 'inline': used more than once
435+
/wd4146 # unary minus operator applied to unsigned type,
436+
# result still unsigned
437+
/wd4244 # 'argument': conversion from 'google::
438+
# protobuf::uint64' to 'int', possible
439+
# loss of data
440+
/wd4267 # Conversion from 'size_t' to 'int',
441+
# possible loss of data
442+
/wd4141 # 'inline': used more than once
439443
)
440444
endif()
441445

0 commit comments

Comments
 (0)