test=develop, update protobuf

6 years ago · fe7ffedc1a
parent 5a03b515ae
commit fe7ffedc1a
2 changed files with 3 additions and 3 deletions
--- a/cmake/external/protobuf.cmake
+++ b/cmake/external/protobuf.cmake
@ -203,7 +203,7 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST)
    ENDIF()

    SET(PROTOBUF_REPO "https://github.com/google/protobuf.git")
-    SET(PROTOBUF_TAG "9f75c5aa851cd877fb0d93ccc31b8567a6706546")
+    SET(PROTOBUF_TAG "v3.6.1")

    ExternalProject_Add(
        ${TARGET_NAME}
@ -231,7 +231,7 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST)
    )
 ENDFUNCTION()

-SET(PROTOBUF_VERSION 3.1)
+SET(PROTOBUF_VERSION 3.6.1)

 IF(NOT PROTOBUF_FOUND)
    build_protobuf(extern_protobuf FALSE)
--- a/python/requirements.txt
+++ b/python/requirements.txt
@ -1,6 +1,6 @@
 requests==2.9.2
 numpy>=1.12
-protobuf==3.1
+protobuf>=3.6
 recordio>=0.1.0
 matplotlib==2.2.3 # TODO: let python3 paddlepaddle package use latest matplotlib
 rarfile