From ea4e1d9fdf0845b8e4029be0d675662dccb7beb8 Mon Sep 17 00:00:00 2001 From: hjchen2 Date: Mon, 30 May 2022 18:17:02 +0800 Subject: [PATCH 1/3] upgrade protobuf to fix unstable default value in protobuf --- cmake/third_party/protobuf.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/third_party/protobuf.cmake b/cmake/third_party/protobuf.cmake index f1f1692f39f..64eadbd0ad9 100644 --- a/cmake/third_party/protobuf.cmake +++ b/cmake/third_party/protobuf.cmake @@ -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}) From 1e6d9cf89a33f094ccd4d841fe6abf9980e3851c Mon Sep 17 00:00:00 2001 From: hjchen2 Date: Mon, 30 May 2022 18:59:12 +0800 Subject: [PATCH 2/3] add --- dev-requirements.txt | 2 +- python/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 69c7efb21ee..febf6f82617 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -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 diff --git a/python/setup.py b/python/setup.py index 60de2684d57..671b2c1de0c 100644 --- a/python/setup.py +++ b/python/setup.py @@ -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", From af3318f52602fd9ff6a412b08fd719c43f21cd2d Mon Sep 17 00:00:00 2001 From: tsai Date: Mon, 30 May 2022 18:59:40 +0800 Subject: [PATCH 3/3] update --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e8732d99567..71c43d07893 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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: