未验证 提交 f80a0fe9 编写于 作者: R risemeup1 提交者: GitHub

fix_mac_m1_error (#52720)

上级 23032590
...@@ -24,12 +24,6 @@ from paddle.distributed.fleet.utils.log_util import logger ...@@ -24,12 +24,6 @@ from paddle.distributed.fleet.utils.log_util import logger
from paddle.fluid.framework import _global_flags from paddle.fluid.framework import _global_flags
from paddle.fluid.wrapped_decorator import wrap_decorator from paddle.fluid.wrapped_decorator import wrap_decorator
protobuf_version = google.protobuf.__version__
if protobuf_version >= "4.21.0":
from google._upb import _message
else:
from google.protobuf.pyext import _message
__all__ = [] __all__ = []
non_auto_func_called = True non_auto_func_called = True
...@@ -2512,10 +2506,19 @@ class DistributedStrategy: ...@@ -2512,10 +2506,19 @@ class DistributedStrategy:
self.strategy, f.name + "_configs" self.strategy, f.name + "_configs"
) )
config_fields = my_configs.DESCRIPTOR.fields config_fields = my_configs.DESCRIPTOR.fields
protobuf_version = google.protobuf.__version__
if protobuf_version >= "4.21.0":
RepeatedScalarContainer = (
google._upb._message.RepeatedScalarContainer
)
else:
RepeatedScalarContainer = (
google.protobuf.pyext._message.RepeatedScalarContainer
)
for ff in config_fields: for ff in config_fields:
if isinstance( if isinstance(
getattr(my_configs, ff.name), getattr(my_configs, ff.name),
_message.RepeatedScalarContainer, RepeatedScalarContainer,
): ):
values = getattr(my_configs, ff.name) values = getattr(my_configs, ff.name)
for i, v in enumerate(values): for i, v in enumerate(values):
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册