Update protoc and revert onnx/onnx#2482

tools/onnx

@@ -52,32 +52,18 @@ install() {
         linux*)
             [ -x "$(command -v cmake)" ] || sudo apt install -y cmake
             [ -x "$(command -v protoc)" ] || sudo apt install -y protobuf-compiler libprotoc-dev
-            protobuf=protobuf
             ;;
         darwin*)
             brew list cmake > /dev/null 2>&1 || brew install cmake > /dev/null
-            brew list [email protected] > /dev/null 2>&1 || brew install [email protected] > /dev/null
-            export PATH=/usr/local/opt/[email protected]/bin:${PATH}
-            protobuf="protobuf==3.7.1"
+            brew list protobuf > /dev/null 2>&1 || brew install protobuf > /dev/null
             ;;
         msys*)
-            # [ -x "$(command -v protoc)" ] || $(choco install --yes protoc --version=3.8.0) > /dev/null
-            protoc_version=3.8.0
-            protoc_dir=./third_party/bin/protobuf/v${protoc_version}
-            if [ ! -f "${protoc_dir}/bin/protoc.exe" ]; then
-                mkdir -p "${protoc_dir}"
-                pushd "${protoc_dir}" > /dev/null
-                curl -sL -O https://github.com/protocolbuffers/protobuf/releases/download/v${protoc_version}/protoc-${protoc_version}-win32.zip
-                unzip protoc-${protoc_version}-win32.zip > /dev/null
-                rm protoc-${protoc_version}-win32.zip
-                popd > /dev/null
-            fi
-            export PATH=${protoc_dir}/bin:${PATH}
-            protobuf="protobuf==${protoc_version}"
+            [ -x "$(command -v protoc)" ] || $(choco install --yes protoc) > /dev/null
+            [ -x "$(command -v cmake)" ] || $(choco install --yes cmake) > /dev/null
             ;;
     esac
     venv
-    ${python} -m pip install --quiet --upgrade ${protobuf}
+    ${python} -m pip install --quiet --upgrade protobuf
     export ONNX_ML=1
     export ONNX_NAMESPACE=onnx
     ${python} -m pip install --quiet "./third_party/src/onnx"

tools/tf

@@ -80,32 +80,21 @@ metadata() {
     case "${OSTYPE}" in
         linux*)
             [ -x "$(command -v protoc)" ] || sudo apt install -y protobuf-compiler libprotoc-dev
-            protoc=protoc
             ;;
         darwin*)
             brew list protobuf > /dev/null 2>&1 || brew install protobuf > /dev/null
-            protoc=protoc
             ;;
         msys*)
-            protoc_version=$(curl -s https://api.github.com/repos/protocolbuffers/protobuf/releases/latest | grep tag_name | cut -f 2 -d : | cut -f 2 -d '"' | cut -f 2 -d v)
-            protoc_dir=./third_party/bin/protobuf/v${protoc_version}
-            if [ ! -f "${protoc_dir}/bin/protoc.exe" ]; then
-                mkdir -p "${protoc_dir}"
-                pushd "${protoc_dir}" > /dev/null
-                curl -sL -O https://github.com/protocolbuffers/protobuf/releases/download/v${protoc_version}/protoc-${protoc_version}-win32.zip
-                unzip protoc-${protoc_version}-win32.zip > /dev/null
-                popd > /dev/null
-            fi
-            protoc=${protoc_dir}/bin/protoc
+            [ -x "$(command -v protoc)" ] || $(choco install --yes protoc) > /dev/null
             ;;
     esac
-    ${protoc} --proto_path ./third_party/src/tensorflow ./third_party/src/tensorflow/tensorflow/core/framework/attr_value.proto --python_out=./tools
-    ${protoc} --proto_path ./third_party/src/tensorflow ./third_party/src/tensorflow/tensorflow/core/framework/tensor.proto --python_out=./tools
-    ${protoc} --proto_path ./third_party/src/tensorflow ./third_party/src/tensorflow/tensorflow/core/framework/types.proto --python_out=./tools
-    ${protoc} --proto_path ./third_party/src/tensorflow ./third_party/src/tensorflow/tensorflow/core/framework/tensor_shape.proto --python_out=./tools
-    ${protoc} --proto_path ./third_party/src/tensorflow ./third_party/src/tensorflow/tensorflow/core/framework/resource_handle.proto --python_out=./tools
-    ${protoc} --proto_path ./third_party/src/tensorflow ./third_party/src/tensorflow/tensorflow/core/framework/api_def.proto --python_out=./tools
-    ${protoc} --proto_path ./third_party/src/tensorflow ./third_party/src/tensorflow/tensorflow/core/framework/op_def.proto --python_out=./tools
+    protoc --proto_path ./third_party/src/tensorflow ./third_party/src/tensorflow/tensorflow/core/framework/attr_value.proto --python_out=./tools
+    protoc --proto_path ./third_party/src/tensorflow ./third_party/src/tensorflow/tensorflow/core/framework/tensor.proto --python_out=./tools
+    protoc --proto_path ./third_party/src/tensorflow ./third_party/src/tensorflow/tensorflow/core/framework/types.proto --python_out=./tools
+    protoc --proto_path ./third_party/src/tensorflow ./third_party/src/tensorflow/tensorflow/core/framework/tensor_shape.proto --python_out=./tools
+    protoc --proto_path ./third_party/src/tensorflow ./third_party/src/tensorflow/tensorflow/core/framework/resource_handle.proto --python_out=./tools
+    protoc --proto_path ./third_party/src/tensorflow ./third_party/src/tensorflow/tensorflow/core/framework/api_def.proto --python_out=./tools
+    protoc --proto_path ./third_party/src/tensorflow ./third_party/src/tensorflow/tensorflow/core/framework/op_def.proto --python_out=./tools
     touch ./tools/tensorflow/__init__.py
     touch ./tools/tensorflow/core/__init__.py
     touch ./tools/tensorflow/core/framework/__init__.py