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

JiabinYang · web-flow · commit 38604b7cb5f1 · 2019-03-14T15:38:30.000+08:00
diff --git 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)
diff --git a/python/requirements.txt b/python/requirements.txt
@@ -1,6 +1,6 @@
 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

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST)`
`231`	`231`	`)`
`232`	`232`	`ENDFUNCTION()`
`233`	`233`
`234`		`-SET(PROTOBUF_VERSION 3.1)`
	`234`	`+SET(PROTOBUF_VERSION 3.1.0)`
`235`	`235`
`236`	`236`	`IF(NOT PROTOBUF_FOUND)`
`237`	`237`	`build_protobuf(extern_protobuf FALSE)`