From 38604b7cb5f11929377281ee733eaed781072a24 Mon Sep 17 00:00:00 2001 From: Jiabin Yang Date: Thu, 14 Mar 2019 15:38:30 +0800 Subject: [PATCH] test=release/1.3, cherry-pick protobuf update (#15983) --- cmake/external/protobuf.cmake | 2 +- python/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/external/protobuf.cmake b/cmake/external/protobuf.cmake index e05b7694ddf..4c79d9d72a8 100644 --- 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 index 5a70f1aa3ff..36bd5d4261c 100644 --- 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 -- GitLab