Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgrade protobuf to fix wrong initialization of fixed_address_empty_string #8334

Closed
wants to merge 9 commits into from
Closed

upgrade protobuf to fix wrong initialization of fixed_address_empty_string #8334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ea4e1d9
upgrade protobuf to fix unstable default value in protobuf
hjchen2 May 30, 2022
1e6d9cf
add
hjchen2 May 30, 2022
af3318f
update
jackalcooper May 30, 2022
12fd87e
Merge branch 'dev_upgrade_protobuf' of https://github.com/Oneflow-Inc…
jackalcooper May 30, 2022
3a0da13
Merge branch 'master' into dev_upgrade_protobuf
mergify[bot] May 30, 2022
8f4bc55
Merge branch 'master' into dev_upgrade_protobuf
mergify[bot] May 30, 2022
bf9caa8
Merge branch 'master' into dev_upgrade_protobuf
hjchen2 May 31, 2022
7be5c0d
Merge branch 'master' into dev_upgrade_protobuf
mergify[bot] May 31, 2022
da2b188
Merge branch 'master' into dev_upgrade_protobuf
mergify[bot] May 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@ env:
FLOW_VISION_COMMIT: ca8ebc663b58667cf8cd1b6ef0c861522780b7bb
LIBAI_SRC: libai
LIBAI_COMMIT: 7d31d9781e5f2d559dc0820f599e0bed798488ca
TEST_WITH_TORCH_IMG_TAG: registry.cn-beijing.aliyuncs.com/oneflow/test-with-pytorch-1.10.0-cuda11.3-cudnn8-runtime:afaf913e02a4ba02db92260daee22f99121cef62
TEST_WITH_TORCH_IMG_TAG: registry.cn-beijing.aliyuncs.com/oneflow/test-with-pytorch-1.10.0-cuda11.3-cudnn8-runtime:9017e5ea4371c69e3654b7d0077c6f8521cd7cfa
MLIR_DOCKER_ARGS: "-e ONEFLOW_MLIR_ENABLE_ROUND_TRIP=1 -e ONEFLOW_MLIR_PREFER_NHWC=0 -e ONEFLOW_MLIR_ENABLE_INFERENCE_OPTIMIZATION=1"

jobs:
Expand Down
4 changes: 2 additions & 2 deletions cmake/third_party/protobuf.cmake
View file
Open in desktop
Expand Up @@ -9,8 +9,8 @@ set(PROTOBUF_LIBRARY_DIR ${PROTOBUF_INSTALL_DIR}/${PROTOBUF_INSTALL_LIBDIR})
set(PROTOBUF_BINARY_DIR ${PROTOBUF_INSTALL_DIR}/${PROTOBUF_INSTALL_BINDIR})

set(PROTOBUF_SRC_DIR ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/src)
set(PROTOBUF_URL "https://github.com/protocolbuffers/protobuf/archive/v3.9.2.zip")
set(PROTOBUF_MD5 cf02c32870a1f78c860039e0f63a6343)
set(PROTOBUF_URL "https://github.com/protocolbuffers/protobuf/archive/v3.16.0.zip")
set(PROTOBUF_MD5 83c982b55cbe5ec390b28c8f812da779)

use_mirror(VARIABLE PROTOBUF_URL URL ${PROTOBUF_URL})

Expand Down
2 changes: 1 addition & 1 deletion dev-requirements.txt
View file
Open in desktop
@@ -1,7 +1,7 @@
black==19.10b0; python_version >= "3.6"
click==8.0.0; python_version >= "3.6" # https://github.com/psf/black/issues/2964
numpy>=1.17.0
protobuf>=3.9.2, <4.0
protobuf>=3.16.0, <4.0
wheel
tqdm
requests
Expand Down
2 changes: 1 addition & 1 deletion python/setup.py
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@ def finalize_options(self):
sys.argv = ["setup.py"] + remain_args
REQUIRED_PACKAGES = [
f"numpy>={np.__version__}",
"protobuf>=3.9.2, <4.0",
"protobuf>=3.16.0, <4.0",
"tqdm",
"requests",
"pillow",
Expand Down