提交 54294dda 编写于 作者: O Olli-Pekka Heinisuo

fix min supported numpy

上级 7701ec78
...@@ -17,15 +17,13 @@ def main(): ...@@ -17,15 +17,13 @@ def main():
CI_BUILD = os.environ.get("CI_BUILD", "False") CI_BUILD = os.environ.get("CI_BUILD", "False")
is_CI_build = True if CI_BUILD == "1" else False is_CI_build = True if CI_BUILD == "1" else False
cmake_source_dir = "opencv" cmake_source_dir = "opencv"
minimum_supported_numpy = "1.13.1" minimum_supported_numpy = "1.13.3"
build_contrib = get_build_env_var_by_name("contrib") build_contrib = get_build_env_var_by_name("contrib")
build_headless = get_build_env_var_by_name("headless") build_headless = get_build_env_var_by_name("headless")
build_java = "ON" if get_build_env_var_by_name("java") else "OFF" build_java = "ON" if get_build_env_var_by_name("java") else "OFF"
if sys.version_info[:2] >= (3, 6): if sys.version_info[:2] >= (3, 6):
minimum_supported_numpy = "1.13.3" minimum_supported_numpy = "1.13.3"
if sys.version_info[:2] >= (3, 6) and platform.machine() == "aarch64":
minimum_supported_numpy = "1.19.0"
if sys.version_info[:2] >= (3, 7): if sys.version_info[:2] >= (3, 7):
minimum_supported_numpy = "1.14.5" minimum_supported_numpy = "1.14.5"
if sys.version_info[:2] >= (3, 8): if sys.version_info[:2] >= (3, 8):
...@@ -33,6 +31,10 @@ def main(): ...@@ -33,6 +31,10 @@ def main():
if sys.version_info[:2] >= (3, 9): if sys.version_info[:2] >= (3, 9):
minimum_supported_numpy = "1.19.3" minimum_supported_numpy = "1.19.3"
# arm64 is a special case
if sys.version_info[:2] >= (3, 6) and platform.machine() == "aarch64":
minimum_supported_numpy = "1.19.3"
numpy_version = "numpy>=%s" % minimum_supported_numpy numpy_version = "numpy>=%s" % minimum_supported_numpy
python_version = cmaker.CMaker.get_python_version() python_version = cmaker.CMaker.get_python_version()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册