test=release/1.3, cherry-pick protobuf update (#15983)

38604b7c · Jiabin Yang · GitHub · 618a0141 · 38604b7c · 38604b7c
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

cmake/external/protobuf.cmake cmake/external/protobuf.cmake +1 -1

python/requirements.txt python/requirements.txt +1 -1

未找到文件。
--- a/cmake/external/protobuf.cmake
+++ b/cmake/external/protobuf.cmake
@@ -231,7 +231,7 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST)
    )
 ENDFUNCTION()

-SET(PROTOBUF_VERSION 3.1)
+SET(PROTOBUF_VERSION 3.1.0)

 IF(NOT PROTOBUF_FOUND)
    build_protobuf(extern_protobuf FALSE)

--- a/python/requirements.txt
+++ b/python/requirements.txt
 requests==2.9.2
 numpy>=1.12
-protobuf==3.1
+protobuf>=3.1.0
 recordio>=0.1.0
 matplotlib==2.2.3 # TODO: let python3 paddlepaddle package use latest matplotlib
 rarfile