From b4cfa88bf71441c4decda02aeee08c86f72d1c9e Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Wed, 21 Apr 2021 10:30:06 -0700 Subject: [PATCH] Update protobuf to the latest version (#7396) --- cgmanifests/submodules/cgmanifest.json | 32 ++++++++++++------- cmake/external/protobuf | 2 +- ...rosoft.ML.OnnxRuntime.EndToEndTests.csproj | 2 +- .../Microsoft.ML.OnnxRuntime.Tests.csproj | 2 +- .../templates/py-packaging-stage.yml | 4 +-- .../linux/docker/scripts/install_protobuf.sh | 6 ++-- .../docker/scripts/install_server_deps.sh | 2 +- 7 files changed, 30 insertions(+), 20 deletions(-) diff --git a/cgmanifests/submodules/cgmanifest.json b/cgmanifests/submodules/cgmanifest.json index 33449e2882..dc0c21c409 100644 --- a/cgmanifests/submodules/cgmanifest.json +++ b/cgmanifests/submodules/cgmanifest.json @@ -158,6 +158,16 @@ "comments": "git submodule at cmake/external/date" } }, + { + "component": { + "type": "git", + "git": { + "commitHash": "e1e11e0d555c08bec08a6c7773aa777dfcaae9da", + "repositoryUrl": "https://github.com/dmlc/dlpack.git" + }, + "comments": "git submodule at cmake/external/dlpack" + } + }, { "component": { "type": "git", @@ -168,6 +178,16 @@ "comments": "git submodule at cmake/external/eigen" } }, + { + "component": { + "type": "git", + "git": { + "commitHash": "8b32b7def837a15e766039501630549149d3db41", + "repositoryUrl": "https://github.com/emscripten-core/emsdk.git" + }, + "comments": "git submodule at cmake/external/emsdk" + } + }, { "component": { "type": "git", @@ -332,7 +352,7 @@ "component": { "type": "git", "git": { - "commitHash": "498de9f761bef56a032815ee44b6e6dbe0892cc4", + "commitHash": "436bd7880e458532901c58f4d9d1ea23fa7edd52", "repositoryUrl": "https://github.com/protocolbuffers/protobuf.git" }, "comments": "git submodule at cmake/external/protobuf" @@ -447,16 +467,6 @@ }, "comments": "git submodule at server/external/spdlog" } - }, - { - "component": { - "type": "git", - "git": { - "commitHash": "e1e11e0d555c08bec08a6c7773aa777dfcaae9da", - "repositoryUrl": "https://github.com/dmlc/dlpack.git" - }, - "comments": "git submodule at cmake/external/dlpack" - } } ] } diff --git a/cmake/external/protobuf b/cmake/external/protobuf index 498de9f761..436bd7880e 160000 --- a/cmake/external/protobuf +++ b/cmake/external/protobuf @@ -1 +1 @@ -Subproject commit 498de9f761bef56a032815ee44b6e6dbe0892cc4 +Subproject commit 436bd7880e458532901c58f4d9d1ea23fa7edd52 diff --git a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/Microsoft.ML.OnnxRuntime.EndToEndTests.csproj b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/Microsoft.ML.OnnxRuntime.EndToEndTests.csproj index 302457a4bc..a99b7f6a03 100644 --- a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/Microsoft.ML.OnnxRuntime.EndToEndTests.csproj +++ b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/Microsoft.ML.OnnxRuntime.EndToEndTests.csproj @@ -23,7 +23,7 @@ - + diff --git a/csharp/test/Microsoft.ML.OnnxRuntime.Tests/Microsoft.ML.OnnxRuntime.Tests.csproj b/csharp/test/Microsoft.ML.OnnxRuntime.Tests/Microsoft.ML.OnnxRuntime.Tests.csproj index a584bf8715..ed6cf3490f 100644 --- a/csharp/test/Microsoft.ML.OnnxRuntime.Tests/Microsoft.ML.OnnxRuntime.Tests.csproj +++ b/csharp/test/Microsoft.ML.OnnxRuntime.Tests/Microsoft.ML.OnnxRuntime.Tests.csproj @@ -62,7 +62,7 @@ - + diff --git a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml index b22d1967d6..21ea3fa532 100644 --- a/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml +++ b/tools/ci_build/github/azure-pipelines/templates/py-packaging-stage.yml @@ -788,8 +788,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.11.1/protoc-3.11.1-linux-x86_64.zip - unzip protoc-3.11.1-linux-x86_64.zip + 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 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 \ diff --git a/tools/ci_build/github/linux/docker/scripts/install_protobuf.sh b/tools/ci_build/github/linux/docker/scripts/install_protobuf.sh index 95c457ce87..23e82550d9 100755 --- a/tools/ci_build/github/linux/docker/scripts/install_protobuf.sh +++ b/tools/ci_build/github/linux/docker/scripts/install_protobuf.sh @@ -34,9 +34,9 @@ function GetFile { return $? } -GetFile https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz /tmp/src/v3.13.0.tar.gz -tar -xf /tmp/src/v3.13.0.tar.gz -C /tmp/src -cd /tmp/src/protobuf-3.13.0 +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 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 diff --git a/tools/ci_build/github/linux/docker/scripts/install_server_deps.sh b/tools/ci_build/github/linux/docker/scripts/install_server_deps.sh index 5f520e1944..1458f6d83f 100755 --- a/tools/ci_build/github/linux/docker/scripts/install_server_deps.sh +++ b/tools/ci_build/github/linux/docker/scripts/install_server_deps.sh @@ -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.11.2 +git checkout v3.15.8 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