Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade protobuf to 3.20.2 and onnx to 1.13 #14279

Merged
merged 33 commits into from
Jan 31, 2023
Merged

upgrade protobuf to 3.20.2 and onnx to 1.13 #14279

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
79c6d37
upgrade protobuf
mszhanyi Jan 13, 2023
a926c22
gcmanifest.json
mszhanyi Jan 13, 2023
488b7f4
update
mszhanyi Jan 13, 2023
6e488ad
add one log
mszhanyi Jan 13, 2023
79e9f3b
update artifacts
mszhanyi Jan 13, 2023
b5a7f28
update protobuf 3.20.2
mszhanyi Jan 13, 2023
d73d925
minor update
mszhanyi Jan 13, 2023
3b45872
update
mszhanyi Jan 16, 2023
56f7d8d
update
mszhanyi Jan 16, 2023
aa0ea4a
Merge branch 'main' of https://github.com/microsoft/onnxruntime into …
mszhanyi Jan 17, 2023
a92be8e
update cmake.patch
mszhanyi Jan 18, 2023
0dd4358
revert eigen
mszhanyi Jan 18, 2023
0c1f723
fix tvm
mszhanyi Jan 18, 2023
0fb4e5d
fix rocm
mszhanyi Jan 19, 2023
42c2f85
-Wno-unused-parameter for eager
mszhanyi Jan 19, 2023
c47f71f
Merge branch 'main' of https://github.com/microsoft/onnxruntime into …
mszhanyi Jan 19, 2023
bb09daa
Merge branch 'main' of https://github.com/microsoft/onnxruntime into …
mszhanyi Jan 24, 2023
a5d45bf
c-api-cpu
mszhanyi Jan 24, 2023
a05dc54
update cmakelist
mszhanyi Jan 25, 2023
1b845e9
Merge branch 'main' of https://github.com/microsoft/onnxruntime into …
mszhanyi Jan 25, 2023
a7e1ad3
update one 3.20.1 to 3.20.2
mszhanyi Jan 25, 2023
9c503d4
minor fix
mszhanyi Jan 25, 2023
9f42643
diables test
mszhanyi Jan 26, 2023
b07d385
merge with main
mszhanyi Jan 26, 2023
544524a
Revert "fix tvm"
mszhanyi Jan 26, 2023
1845b4e
Revert "fix rocm"
mszhanyi Jan 26, 2023
9043929
Revert "-Wno-unused-parameter for eager"
mszhanyi Jan 26, 2023
48270e4
Revert "c-api-cpu"
mszhanyi Jan 27, 2023
39efc46
Merge branch 'main' of https://github.com/microsoft/onnxruntime into …
mszhanyi Jan 27, 2023
a14f672
revert change in cmakelist
mszhanyi Jan 28, 2023
96843a4
update protobuf patch
mszhanyi Jan 29, 2023
1d21267
update onnx.patch
mszhanyi Jan 29, 2023
70d671b
update onnx.patch
mszhanyi Jan 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion cgmanifests/generated/cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"component": {
"type": "git",
"git": {
"commitHash": "5a5f8a5935762397aa68429b5493084ff970f774",
"commitHash": "9b7bca2a723ff94edcd007d93b5d0cf1838591dc",
"repositoryUrl": "https://github.com/onnx/onnx.git"
},
"comments": "git submodule at cmake/external/onnx"
Expand Down Expand Up @@ -318,6 +318,16 @@
"comments": "onnx_tensorrt"
}
},
{
"component": {
"type": "git",
"git": {
"commitHash": "a20c65f2cd549445fda907f7b83894c8eb7427d6",
"repositoryUrl": "https://github.com/protocolbuffers/protobuf.git"
},
"comments": "protobuf"
}
},
{
"component": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions cmake/deps.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ microsoft_gsl;https://github.com/microsoft/GSL/archive/refs/tags/v4.0.0.zip;cf36
microsoft_wil;https://github.com/microsoft/wil/archive/5f4caba4e7a9017816e47becdd918fcc872039ba.zip;fd119887d0d17c37adf1fc227b054befa28158ad
mimalloc;https://github.com/microsoft/mimalloc/archive/refs/tags/v2.0.3.zip;e4f37b93b2da78a5816c2495603a4188d316214b
mp11;https://github.com/boostorg/mp11/archive/refs/tags/boost-1.79.0.zip;c8f04e378535ededbe5af52c8f969d2dedbe73d5
onnx;https://github.com/onnx/onnx/archive/1ba785612a79fe749aa1e478336e534743372639.zip;6c22c32fabafac81107186ea6bedb31741a3142d
onnx;https://github.com/onnx/onnx/archive/refs/tags/v1.13.0.zip;8dda5079cdb5a134b08b0c73f4592a6404fc2dc6
snnn marked this conversation as resolved.
Show resolved Hide resolved
#use the commit where it's several commits after 8.5-GA branch (https://github.com/onnx/onnx-tensorrt/commit/369d6676423c2a6dbf4a5665c4b5010240d99d3c)
onnx_tensorrt;https://github.com/onnx/onnx-tensorrt/archive/369d6676423c2a6dbf4a5665c4b5010240d99d3c.zip;62119892edfb78689061790140c439b111491275
protobuf;https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.18.3.zip;b95bf7e9de9c2249b6c1f2ca556ace49999e90bd
protobuf;https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.20.2.zip;9f71dad95fb83438e88822a9969fc93773fd8c48
psimd;https://github.com/Maratyszcza/psimd/archive/072586a71b55b7f8c584153d223e95687148a900.zip;1f5454b01f06f9656b77e4a5e2e31d7422487013
pthreadpool;https://github.com/Maratyszcza/pthreadpool/archive/1787867f6183f056420e532eec640cba25efafea.zip;e43e80781560c5ab404a4da20f34d846f5f5d101
pybind11;https://github.com/pybind/pybind11/archive/refs/tags/v2.10.1.zip;769b6aa67a77f17a770960f604b727645b6f6a13
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/templates/download-deps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ steps:
packageType: upack
feed: '/7424c8e4-5c62-490e-95c4-79446f31017c'
definition: '517c4f6f-5437-4392-a70d-4f15ec5be2f0'
version: 1.0.18
version: 1.0.21
downloadPath: $(Build.BinariesDirectory)/deps

# The private ADO project
Expand All @@ -22,7 +22,7 @@ steps:
packageType: upack
feed: '/4c7631f5-24c0-4307-8822-1aa8f180c325'
definition: 'fd9dd5ad-b73e-4678-890e-edcf680dbc1a'
version: 1.0.18
version: 1.0.21
downloadPath: $(Build.BinariesDirectory)/deps

# You can add more ADO accounts at here.
2 changes: 1 addition & 1 deletion tools/ci_build/github/linux/docker/inference/x64/python/cpu/scripts/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ pytest
setuptools>=41.4.0
wheel
git+http://github.com/onnx/onnx.git@5a5f8a5935762397aa68429b5493084ff970f774#egg=onnx
protobuf==3.18.3
protobuf==3.20.2
sympy==1.10.1
flatbuffers
2 changes: 1 addition & 1 deletion tools/ci_build/github/linux/docker/scripts/manylinux/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ pytest
setuptools>=41.4.0
wheel
onnx==1.12.0
protobuf==3.18.3
protobuf==3.20.2
sympy==1.10.1
flatbuffers
4 changes: 2 additions & 2 deletions tools/ci_build/github/linux/docker/scripts/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ onnx==1.12.0
argparse
sympy==1.10.1
flatbuffers
protobuf==3.18.1
packaging
protobuf==3.19.6
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this one different?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thx. fixed.

packaging
4 changes: 2 additions & 2 deletions tools/ci_build/github/linux/tvm/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ scipy
wheel
setuptools
onnx==1.11.0
protobuf==3.18.3
protobuf==3.20.2
flatbuffers
tornado
psutil
xgboost
cloudpickle
pytest
pytest
1 change: 1 addition & 0 deletions tools/ci_build/github/windows/helpers.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@ function Install-Protobuf {

pushd .
$url=Get-DownloadURL -name protobuf -src_root $src_root
Write-Host "Downloading protobuf from $url"
$temp_dir = Get-TempDirectory
$protobuf_src_dir = Join-Path $temp_dir "protobuf"
$download_finished = DownloadAndExtract -Uri $url -InstallDirectory $protobuf_src_dir -Force
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/windows/install_third_party_deps.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Install-Pybind -cmake_path $cmake_path -src_root $ort_src_root -build_config $bu
Install-Protobuf -cmake_path $cmake_path -src_root $ort_src_root -build_config $build_config -cmake_extra_args $cmake_extra_args

# TODO: parse it from deps.txt
$protobuf_version="3.18.3"
$protobuf_version="3.20.2"

# ONNX doesn't allow us to specify CMake's path
Install-ONNX -build_config $build_config -src_root $ort_src_root -protobuf_version $protobuf_version