Upgrade protobuf to 4.21.x #49168
Upgrade protobuf to 4.21.x #49168
Conversation
… upgrate_protobuf
… upgrate_protobuf
… upgrate_protobuf
|
你的PR提交成功，感谢你对开源项目的贡献! |
|
✅ This PR's description meets the template requirements! |
risemeup1
force-pushed
the
protobuf
branch
2 times, most recently
from
b512d98
to
74fe2ed
Compare
| atomicMin( | ||
| reinterpret_cast<unsigned long long int*>(&key_index[pos]), // NOLINT | ||
| static_cast<unsigned long long int>(index)); // NOLINT | ||
| atomicMin(reinterpret_cast<unsigned int*>(&key_index[pos]), // NOLINT |
There was a problem hiding this comment.
多谢review，这个之前实验的时候改的数据类型，忘了改回来，下个PR把这个改回来。
| COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} -I${CMAKE_CURRENT_SOURCE_DIR} | ||
| --cpp_out "${CMAKE_CURRENT_BINARY_DIR}" ${ABS_FIL} | ||
| COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} -I${PADDLE_SOURCE_DIR} --cpp_out | ||
| "${PADDLE_BINARY_DIR}" ${ABS_FIL} |
There was a problem hiding this comment.
protoc编译的时候，推荐使用根目录，然后以绝对路径import文件
| elseif(WITH_IPU) | ||
| set(PROTOBUF_REPOSITORY ${GIT_URL}/protocolbuffers/protobuf.git) | ||
| set(PROTOBUF_TAG d750fbf648256c7c631f51ffdbf67d7c18b0114e) |
There was a problem hiding this comment.
ASCEND和IPU这些新硬件设备应该不用改tag吧？不过新硬件设备上编译时可能没有走这些分支。
| elseif(WITH_IPU) | ||
| set(PROTOBUF_REPOSITORY ${GIT_URL}/protocolbuffers/protobuf.git) | ||
| set(PROTOBUF_TAG d750fbf648256c7c631f51ffdbf67d7c18b0114e) | ||
| set(PROTOBUF_TAG v21.12) | ||
| elseif(WIN32) | ||
| set(PROTOBUF_REPOSITORY ${GIT_URL}/protocolbuffers/protobuf.git) | ||
| # Change the tag to support building with vs2019 | ||
| set(PROTOBUF_TAG 01a05a53f40ca2ac5f0af10c6cc0810bee39b792) |
There was a problem hiding this comment.
Windows目前没有升级protobuf版本，后续有计划升级吗？对windows上支持gcc12有影响吗？
There was a problem hiding this comment.
后续有升级计划，威哥在跟进，对windows上gcc12是否有影响我要验证一下
There was a problem hiding this comment.
paddle window 下 protobuf版本过低已经和其他依赖发生冲突了，这块是否有新进度？
如果需要，如何支持？
| else() | ||
| set(PROTOBUF_VERSION 3.1.0) |
There was a problem hiding this comment.
不重要，这里windows上的PROTOBUF_VERSION不是21.12？
There was a problem hiding this comment.
不是，还是之前的低版本protobuf_version
There was a problem hiding this comment.
是否需要为windows加一个PROTOBUF_VERSION的判断逻辑？
There was a problem hiding this comment.
ok，我下一个PR加一下，这样更好
PR types
others
PR changes
others
Describe
升级Protobuf，在python/requirements中去掉protobuf版本限制
目前除了Windows下没有将protobuf版本升级高最高的v21.12之外，Paddle主框架和其它套件均完成升级，为了不影响其他人的工作，暂时先不升级windows下的protobuf版本，等windows下编译问题解决之后再同步windows的protobuf版本升级
