saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-27 20:02:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update protobuf to 3.16 (#7616)

Browse source
This commit is contained in:
Changming Sun 2021-05-07 14:09:23 -07:00 committed by GitHub
parent 3c39fcc1fa
commit 41e370c2b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cgmanifests/submodules/cgmanifest.json
View file

@ -352,7 +352,7 @@
"component": {
"type": "git",
"git": {
"commitHash": "436bd7880e458532901c58f4d9d1ea23fa7edd52",
"commitHash": "2dc747c574b68a808ea4699d26942c8132fe2b09",
"repositoryUrl": "https://github.com/protocolbuffers/protobuf.git"
},
"comments": "git submodule at cmake/external/protobuf"

2
cmake/external/protobuf vendored

@ -1 +1 @@
Subproject commit 436bd7880e458532901c58f4d9d1ea23fa7edd52
Subproject commit 2dc747c574b68a808ea4699d26942c8132fe2b09

4
tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml
View file

@ -1070,8 +1070,8 @@ stages:
sudo rm -rf /mnt/toolchains
sudo mkdir /mnt/toolchains
sudo tar -Jxf $(Build.BinariesDirectory)/toolchains.tar.xz -C /mnt/toolchains
aria2c -q https://github.com/protocolbuffers/protobuf/releases/download/v3.15.8/protoc-3.15.8-linux-x86_64.zip
unzip protoc-3.15.8-linux-x86_64.zip
aria2c -q https://github.com/protocolbuffers/protobuf/releases/download/v3.16.0/protoc-3.16.0-linux-x86_64.zip
unzip protoc-3.16.0-linux-x86_64.zip
sudo cp /mnt/toolchains/manylinux2014_aarch64/usr/include/stdlib.h /mnt/toolchains/gcc-linaro-7.5.0-2019.12-x86_64_aarch64-linux-gnu/aarch64-linux-gnu/libc/usr/include/
#The PYTHON_EXECUTABLE cmake variable is only used for generating ONNX's protobuf definition file.(Invoking the onnx/gen_proto.py file in ONNX's source folder)
cmake \

6
tools/ci_build/github/linux/docker/scripts/install_protobuf.sh
View file

@ -34,9 +34,9 @@ function GetFile {
return $?
}
GetFile https://github.com/protocolbuffers/protobuf/archive/v3.15.8.tar.gz /tmp/src/v3.15.8.tar.gz
tar -xf /tmp/src/v3.15.8.tar.gz -C /tmp/src
cd /tmp/src/protobuf-3.15.8
GetFile https://github.com/protocolbuffers/protobuf/archive/v3.16.0.tar.gz /tmp/src/v3.16.0.tar.gz
tar -xf /tmp/src/v3.16.0.tar.gz -C /tmp/src
cd /tmp/src/protobuf-3.16.0
cmake ./cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_POSITION_INDEPENDENT_CODE=ON -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Relwithdebinfo
make -j$(getconf _NPROCESSORS_ONLN)
make install

2
tools/ci_build/github/linux/docker/scripts/install_server_deps.sh
View file

@ -42,7 +42,7 @@ rm -rf /tmp/googletest
echo "Installing protobuf from source"
git clone https://github.com/protocolbuffers/protobuf.git
cd protobuf
git checkout v3.15.8
git checkout v3.16.0
mkdir b
cd b
cmake ../cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_POSITION_INDEPENDENT_CODE=ON -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Debug