Skip to content

Commit

Permalink
add protobuf < 4.0 (#8198)
Browse files Browse the repository at this point in the history
* add protobuf < 0.4

* refine
  • Loading branch information
jackalcooper authored May 12, 2022
1 parent 9981a98 commit 8ae6c41
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"ONEFLOW_CI_SRC_DIR": "${containerWorkspaceFolder}",
"ONEFLOW_CI_BUILD_DIR": "${containerWorkspaceFolder}/build",
"ONEFLOW_CI_CMAKE_INIT_CACHE": "${containerWorkspaceFolder}/cmake/caches/ci/cuda.cmake",
"ONEFLOW_CI_BUILD_PARALLEL": "20"
},
"initializeCommand": "mkdir -p ${localWorkspaceFolder}/devcontainer-cache/dot/ccache && mkdir -p ${localWorkspaceFolder}/devcontainer-cache/dot/local && mkdir -p ${localWorkspaceFolder}/devcontainer-cache/dot/cache",
"mounts": [
Expand Down
2 changes: 1 addition & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -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
protobuf>=3.9.2, <4.0
wheel
tqdm
requests
Expand Down
2 changes: 1 addition & 1 deletion python/setup.py
Original file line number Diff line number Diff line change
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",
"protobuf>=3.9.2, <4.0",
"tqdm",
"requests",
"pillow",
Expand Down

0 comments on commit 8ae6c41

Please sign in to comment.