Merge branch 'dev-2.0.0-beta-arch-update' of https://github.com/Feder…

…atedAI/FATE into feature-2.0.0-glm

python/fate/arch/tensor/distributed/_ops_binary.py

@@ -41,7 +41,12 @@ def _binary(input, other, op, swap_operad=False, dtype_promote_to=None):
 
     # other is local tensor, broadcast to partitions
     else:
-        shapes = input.shardings.shapes.bc_shapes(other.shape)
+        if isinstance(other, torch.Tensor):
+            shapes = input.shardings.shapes.bc_shapes(other.shape)
+        else:
+            # other is scalar
+            shapes = input.shardings.shapes.bc_shapes(torch.Size([]))
+
         if swap_operad:
             return DTensor(
                 input.shardings.map_shard(

python/fate/arch/tensor/distributed/_tensor.py

@@ -314,7 +314,7 @@ def bc_shapes(self, other: "_ShardingShapes") -> "_ShardingShapes":
                     assert other[other_align_axis] == 1, f"shape in distributed axis should be 1: {self} vs {other}"
             self_axis = len(_bc_shapes[0]) - len(self.shapes[0]) + self.axis
 
-            return _ShardingShapes(_bc_shapes, self.axis)
+            return _ShardingShapes(_bc_shapes, self_axis)
         else:
             raise NotImplementedError(f"type `{other}`")
 

python/fate/components/core/component_desc/_parameter.py

@@ -1,3 +1,4 @@
+import typing
 from typing import Dict, TypeVar
 
 import pydantic
@@ -34,7 +35,7 @@ def get_parameter_spec(self):
         from fate.components.core.spec.component import ParameterSpec
 
         default = self.default if self.default is not ... else None
-        if issubclass(self.type, Parameter):  # recommended
+        if not typing.get_origin(self.type) and issubclass(self.type, Parameter):  # recommended
             type_name = type(self.type).__name__
             if (schema := self.type.schema()) != NotImplemented:
                 type_meta = schema