update protobuf on windows (PaddlePaddle#60195)

* fix bug * fix bug * Update requirements.txt
Difers · Jan 25, 2024 · 6847cec · 6847cec
1 parent 85e60e9
commit 6847cec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/cmake/external/protobuf.cmake b/cmake/external/protobuf.cmake
@@ -237,11 +237,11 @@ function(build_protobuf TARGET_NAME)
   elseif(WIN32)
     set(PROTOBUF_REPOSITORY ${GIT_URL}/protocolbuffers/protobuf.git)
     # Change the tag to support building with vs2019
-    set(PROTOBUF_TAG 01a05a53f40ca2ac5f0af10c6cc0810bee39b792)
+    set(PROTOBUF_TAG v21.12)
   else()
     if(WITH_PSLIB)
       set(PROTOBUF_REPOSITORY "${GIT_URL}/google/protobuf.git")
-      set(PROTOBUF_TAG "9f75c5aa851cd877fb0d93ccc31b8567a6706546")
+      set(PROTOBUF_TAG v21.12)
     else()
       set(PROTOBUF_REPOSITORY ${GIT_URL}/protocolbuffers/protobuf.git)
       set(PROTOBUF_TAG v21.12)
@@ -323,7 +323,7 @@ elseif(WITH_ARM_BRPC)
   set(PROTOBUF_VERSION 21.12-baidu-ee-common)
 elseif(WIN32)
   #Lower version prootbuf is used for widows
-  set(PROTOBUF_VERSION 3.2)
+  set(PROTOBUF_VERSION 21.12)
 else()
   set(PROTOBUF_VERSION 21.12)
   if(WITH_GPU)

diff --git a/python/requirements.txt b/python/requirements.txt
@@ -1,7 +1,6 @@
 httpx
 numpy>=1.13, <2.0
-protobuf>=3.20.2 ; platform_system != "Windows"
-protobuf>=3.1.0, <=3.20.2 ; platform_system == "Windows"
+protobuf>=3.20.2 
 Pillow
 decorator
 astor