This fixes builds of ONNX on OS X while installing ml-agents.

OS X builds use Xcode by default, and the Xcode compiler defaults to using C++98 mode for C++ ( https://stackoverflow.com/a/21349148 ). This causes errors building protocol buffer libraries, which need to be compiled with support for C++14 or newer ( https://github.com/protocolbuffers/protobuf/issues/12393#issuecomment-1508983035 ).

[This ONNX commit](a979e75613) changes its compilation to use C++14 mode: releases that include this commit (1.15.0 or newer) build with Xcode by default.

ONNX 1.15.0 uses a newer protocol buffer library, so allow newer versions here too.
This commit is contained in:
alex-mccarthy-unity 2024-03-06 14:58:02 +01:00 коммит произвёл GitHub
Родитель 66f6b34030
Коммит 6004556ec9
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
3 изменённых файлов: 5 добавлений и 3 удалений

Просмотреть файл

@ -27,6 +27,8 @@ and this project adheres to
#### ml-agents / ml-agents-envs
- Bumped numpy version to >=1.21.2,<1.24.0 (#5997)
- Bumped onnx version to 1.15.0 (#6062)
- Bumped protobuf version to >=3.6,<21 (#6062)
## [3.0.0-exp.1] - 2023-10-09
### Major Changes

Просмотреть файл

@ -56,7 +56,7 @@ setup(
"cloudpickle",
"grpcio>=1.11.0,<=1.48.2",
"Pillow>=4.2.1",
"protobuf>=3.6,<3.20",
"protobuf>=3.6,<3.21",
"pyyaml>=3.1.0",
"gym>=0.21.0",
"pettingzoo==1.15.0",

Просмотреть файл

@ -60,7 +60,7 @@ setup(
f"mlagents_envs=={VERSION}",
"numpy>=1.21.2,<1.24.0",
"Pillow>=4.2.1",
"protobuf>=3.6,<3.20",
"protobuf>=3.6,<3.21",
"pyyaml>=3.1.0",
"torch>=2.1.1",
"tensorboard>=2.14",
@ -72,7 +72,7 @@ setup(
"attrs>=19.3.0",
"huggingface_hub>=0.14",
'pypiwin32==223;platform_system=="Windows"',
"onnx==1.12.0",
"onnx==1.15.0",
],
python_requires=">=3.10.1,<=3.10.12",
entry_points={