mindspore 2.6.0rc1__cp39-cp39-win_amd64.whl → 2.7.0rc1__cp39-cp39-win_amd64.whl

mindspore/ops/function/nn_func.py

@@ -53,9 +53,10 @@ from mindspore.ops.auto_generate import (reflection_pad_1d_op, reflection_pad_2d
                                          upsample_nearest1d_op, upsample_nearest2d_op, upsample_nearest3d_op,
                                          upsample_linear1d_op, upsample_bilinear2d_op, upsample_bicubic2d_op,
                                          upsample_trilinear3d_impl, fill_scalar_op, floor_op, nllloss_2d_op,
-                                         masked_fill_op, masked_select, ones, flatten_ext, conv_transpose2d)
+                                         masked_fill_op, masked_select, ones, flatten_ext, conv_transpose2d,
+                                         func_max_pool2d_op)
 # 2
-
+from mindspore.ops.auto_generate.pyboost_inner_prim import grid_sampler_2d_impl, grid_sampler_3d_impl
 # 3
 
 # 4
@@ -91,10 +92,10 @@ from mindspore.ops.auto_generate import avg_pool3d_ext_op
 # 19
 
 # 20
-
+from mindspore.ops.functional_overload import conv3d as conv3d_op
 from mindspore.ops.auto_generate.gen_ops_prim import embedding_op, MaxPoolWithIndices, \
     PromptFlashAttention, MaxPoolWithMask
-from mindspore.ops.auto_generate.gen_ops_prim import conv3d_ext_op, conv3d_padding_op, conv2d_ext_op, \
+from mindspore.ops.auto_generate.gen_ops_prim import conv2d_ext_op, \
     conv2d_padding_op, conv1d_ext_op, conv1d_padding_op, speed_fusion_attention_op
 from mindspore.common.generator import default_generator
 from mindspore.ops.auto_generate import hardshrink, hardsigmoid, hardswish
@@ -4420,7 +4421,7 @@ def nll_loss_ext(input, target, weight=None, ignore_index=-100, reduction='mean'
     :math:`N` is the batch size, :math:`c` belonging to :math:`[0, C-1]` is class index,
     where :math:`C` is the number of classes.
 
-    If `reduction` is not ``'None'`` (default ``'mean'``), then
+    If `reduction` is not ``'none'`` (default ``'mean'``), then
 
     .. math::
 
@@ -4444,7 +4445,7 @@ def nll_loss_ext(input, target, weight=None, ignore_index=-100, reduction='mean'
         weight (Tensor, optional): A rescaling weight applied to the loss of each batch element.
             If not None, the shape is :math:`(C,)`.
             The data type must be float16 or float32 or bfloat16(only supported by Atlas A2 training series products).
-            It should have the same data type as `input` . Default: ``'None'`` .
+            It should have the same data type as `input` . Default: ``None`` .
         ignore_index (int, optional): Specifies a target value that is ignored
             and does not contribute to the input gradient. Default: ``-100`` .
         reduction (str, optional): Apply specific reduction method to the output: ``'none'`` , ``'mean'`` ,
@@ -4481,10 +4482,10 @@ def _nllloss_nd(input, target, weight=None, ignore_index=-100, reduction='mean')
         weight = ones(n_classes, input.dtype)
     if input_dim < 1:
         raise ValueError(f"input dim should be less than 1, but got {input_dim}")
-    if input_dim != 1 and input.shape[0] != target.shape[0]:
+    if F.isconstant(input_dim) and F.isconstant(target.ndim) and input_dim != 1 and input.shape[0] != target.shape[0]:
         raise ValueError(f"input bacth_size should be equal to target batch_size, but got {input.shape[0]} and "
                          f"{target.shape[0]}")
-    if input_dim == 1 or input_dim == 2:
+    if input_dim in [1, 2]:
         return nllloss_impl(input, target, weight, reduction, ignore_index)[0]
     if input_dim == 4:
         return nllloss_2d_op(input, target, weight, reduction, ignore_index)[0]
@@ -5365,7 +5366,7 @@ def max_pool3d(x, kernel_size, stride=None, padding=0, dilation=1, ceil_mode=Fal
     return out
 
 
-def grid_sample(input, grid, mode='bilinear', padding_mode='zeros', align_corners=False):
+def grid_sample(input, grid, mode='bilinear', padding_mode='zeros', align_corners=None):
     """
     Given an `input` and a flow-field `grid`, computes the `output` using `input` values and pixel locations from
     `grid`. Only spatial (4-D) and volumetric (5-D) `input` is supported.
@@ -5411,10 +5412,10 @@ def grid_sample(input, grid, mode='bilinear', padding_mode='zeros', align_corner
         padding_mode (str, optional): An optional string specifying the pad method.
             The optional values are "zeros", "border" or
             "reflection". Default: ``'zeros'`` .
-        align_corners (bool, optional): If set to `True`, the extrema (-1 and 1) are considered as referring to
+        align_corners (bool, optional): If set to ``True``, the extrema (-1 and 1) are considered as referring to
             the center points of the input's corner pixels. If set to `False`, they are instead considered as referring
             to the corner points of the input's corner pixels, making the sampling more resolution agnostic. Default:
-            ``False`` .
+            ``None``, which is the same as ``False`` .
 
     Returns:
         Tensor, dtype is the same as `input` and whose shape is :math:`(N, C, H_{out}, W_{out})` (4-D) and
@@ -5451,11 +5452,10 @@ def grid_sample(input, grid, mode='bilinear', padding_mode='zeros', align_corner
           [[14.5      ]
            [14.8      ]]]]
     """
+    align_corners = False if align_corners is None else align_corners
     if input.ndim == 4:
-        _grid_sampler_2d = _get_cache_prim(NN_OPS.GridSampler2D)(mode, padding_mode, align_corners)
-        return _grid_sampler_2d(input, grid)
-    _grid_sampler_3d = _get_cache_prim(NN_OPS.GridSampler3D)(mode, padding_mode, align_corners)
-    return _grid_sampler_3d(input, grid)
+        return grid_sampler_2d_impl(input, grid, mode, padding_mode, align_corners)
+    return grid_sampler_3d_impl(input, grid, mode, padding_mode, align_corners)
 
 
 @constexpr
@@ -6307,7 +6307,7 @@ def conv1d_ext(input, weight, bias=None, stride=1, padding=0, dilation=1, groups
             this 1D convolution layer also can be called 1D depthwise convolution layer. Default: ``1`` .
 
             - :math:`(C_{in} \text{ % } \text{groups} == 0)` , :math:`(C_{out} \text{ % } \text{groups} == 0)` ,
-              :math:`(C_{out} >= \text{groups})` , :math:`(\text{kernel_size[1]} = C_{in} / \text{groups})`。
+              :math:`(C_{out} >= \text{groups})` , :math:`(\text{weight[1]} = C_{in} / \text{groups})`。
 
     Returns:
         Tensor, the value that applied 1D convolution. The shape is :math:`(N, C_{out}, L_{out})`.
@@ -6372,9 +6372,9 @@ def _get_pad_info(dilation, weight):
     for i in range(2):
         d = dilation[i]
         weight_size = weight.shape[i + 2]
-        pad = d * (weight_size - 1)
-        pad_l += (int(pad / 2),)
-        pad_r += (int(pad - pad_l[i]),)
+        pad_item = d * (weight_size - 1)
+        pad_l += (int(pad_item / 2),)
+        pad_r += (int(pad_item - pad_l[i]),)
         if pad_l[i] != pad_r[i]:
             need_pad_nd = True
     return need_pad_nd, pad_l, pad_r
@@ -6477,7 +6477,7 @@ def conv2d_ext(input, weight, bias=None, stride=1, padding=0, dilation=1, groups
         groups (int, optional): Splits `input` into groups. Default: ``1`` .
 
             - :math:`(C_{in} \text{ % } \text{groups} == 0)` , :math:`(C_{out} \text{ % } \text{groups} == 0)` ,
-              :math:`(C_{out} >= \text{groups})` , :math:`(\text{kernel_size[1]} = C_{in} / \text{groups})`
+              :math:`(C_{out} >= \text{groups})` , :math:`(\text{weight[1]} = C_{in} / \text{groups})`
 
     Returns:
         Tensor, the value that applied 2D convolution. The shape is :math:`(N, C_{out}, H_{out}, W_{out})`.
@@ -6981,10 +6981,6 @@ def batch_norm_ext(input, running_mean, running_var, weight=None, bias=None, tra
         [[ 2.1621194  1.2360122]
          [14.810596  10.180061 ]]
     """
-    if weight is None:
-        weight = ops.ones([input.shape[1]], dtype=input.dtype)
-    if bias is None:
-        bias = ops.zeros([input.shape[1]], dtype=input.dtype)
     output = batch_norm_ext_op(input, weight, bias, running_mean, running_var, training, momentum, eps)
     return output[0]
 
@@ -7260,39 +7256,8 @@ def conv3d(input, weight, bias=None, stride=1, pad_mode="valid", padding=0, dila
 
     Returns:
         Tensor, the value that applied 3D convolution. The shape is :math:`(N, C_{out}, D_{out}, H_{out}, W_{out})`.
-
-        `pad_mode` is ``"same"``:
-
-        .. math::
-            \begin{array}{ll} \\
-                D_{out} = \left \lceil{\frac{D_{in}}{\text{stride[0]}}} \right \rceil \\
-                H_{out} = \left \lceil{\frac{H_{in}}{\text{stride[1]}}} \right \rceil \\
-                W_{out} = \left \lceil{\frac{W_{in}}{\text{stride[2]}}} \right \rceil \\
-            \end{array}
-
-        `pad_mode` is ``"valid"``:
-
-        .. math::
-            \begin{array}{ll} \\
-                D_{out} = \left \lfloor{\frac{D_{in} - \text{dilation[0]} \times (\text{kernel_size[0]} - 1) }
-                {\text{stride[0]}} + 1} \right \rfloor \\
-                H_{out} = \left \lfloor{\frac{H_{in} - \text{dilation[1]} \times (\text{kernel_size[1]} - 1) }
-                {\text{stride[1]}} + 1} \right \rfloor \\
-                W_{out} = \left \lfloor{\frac{W_{in} - \text{dilation[2]} \times (\text{kernel_size[2]} - 1) }
-                {\text{stride[2]}} + 1} \right \rfloor \\
-            \end{array}
-
-        `pad_mode` is ``"pad"``:
-
-        .. math::
-            \begin{array}{ll} \\
-                D_{out} = \left \lfloor{\frac{D_{in} + padding[0] + padding[1] - (\text{dilation[0]} - 1) \times
-                \text{kernel_size[0]} - 1 }{\text{stride[0]}} + 1} \right \rfloor \\
-                H_{out} = \left \lfloor{\frac{H_{in} + padding[2] + padding[3] - (\text{dilation[1]} - 1) \times
-                \text{kernel_size[1]} - 1 }{\text{stride[1]}} + 1} \right \rfloor \\
-                W_{out} = \left \lfloor{\frac{W_{in} + padding[4] + padding[5] - (\text{dilation[2]} - 1) \times
-                \text{kernel_size[2]} - 1 }{\text{stride[2]}} + 1} \right \rfloor \\
-            \end{array}
+        To see how different pad modes affect the output shape, please refer to
+        :class:`mindspore.nn.Conv3d` for more details.
 
     Raises:
         TypeError: If `out_channel` or `groups` is not an int.
@@ -7413,8 +7378,8 @@ def conv3d_ext(input, weight, bias=None, stride=1, padding=0, dilation=1, groups
     - :math:`H_{out} = (H_{in} + PadUp + PadDown - ((kh - 1) * DilationH + 1)) / StrideH + 1` .
     - :math:`W_{out} = (W_{in} + PadLeft + PadRight - ((kw - 1) * DilationW + 1)) / StrideW + 1` .
     - :math:`D_{out} = (D_{in} + PadFront + PadBack - ((kd - 1) * DilationD + 1)) / StrideD + 1` .
-    - :math:`(D_{in}+PadFront+PadBack - ((kd-1)*DilationD+1)) /% StrideD <= PadBack` .
-    - :math:`(H_{in}+PadUp+PadDown - ((kh-1)*Dilationh+1)) /% StrideH <= PadDown` .
+    - :math:`(D_{in}+PadFront+PadBack - ((kd-1)*DilationD+1)) \% StrideD <= PadBack` .
+    - :math:`(H_{in}+PadUp+PadDown - ((kh-1)*Dilationh+1)) \% StrideH <= PadDown` .
     - :math:`stride_d <= kernel_d` .
     - :math:`PadUp < kh` and :math:`PadDown < kh` . When `padding` = ``'valid'``, both PadUp and PadDown are zeros.
       When `padding` = ``'same'``, pad can be calculated by
@@ -7481,12 +7446,7 @@ def conv3d_ext(input, weight, bias=None, stride=1, padding=0, dilation=1, groups
         (12, 26, 59, 47, 5)
     """
 
-    if isinstance(padding, (tuple, list, int)):
-        return conv3d_ext_op(input, weight, bias, stride, padding, dilation, groups)
-    if isinstance(padding, str):
-        return conv3d_padding_op(input, weight, bias, stride, padding, dilation, groups)
-    raise TypeError(f"For conv3d, the parameter 'padding' must be a tuple/list " \
-                    f"or a string, but got {type(padding)}")
+    return conv3d_op(input, weight, bias, stride, padding, dilation, groups)
 
 
 @_primexpr
@@ -7554,7 +7514,7 @@ def pixel_shuffle(input, upscale_factor):
     c, h, w = idx[-3:]
     _check_pxiel_shuffle_valid(c, upscale_factor)
     c = c // upscale_factor ** 2
-    input_perm = (pre + (c, upscale_factor, upscale_factor, h, w))
+    input_perm = pre + (c, upscale_factor, upscale_factor, h, w)
     input = reshape_(input, input_perm)
     input_perm = [i for i in range(length - 2)]
     input_perm = input_perm + [length, length - 2, length + 1, length - 1]
@@ -7618,7 +7578,7 @@ def pixel_unshuffle(input, downscale_factor):
     _check_pxiel_unshuffle_valid(h, w, downscale_factor)
     h = h // downscale_factor
     w = w // downscale_factor
-    input_perm = (pre + (c, h, downscale_factor, w, downscale_factor))
+    input_perm = pre + (c, h, downscale_factor, w, downscale_factor)
     input = reshape_(input, input_perm)
     input_perm = [i for i in range(length - 2)]
     input_perm = input_perm + [length - 1, length + 1, length - 2, length]
@@ -8943,13 +8903,7 @@ def max_pool2d_ext(input, kernel_size, stride=None, padding=0, dilation=1, ceil_
         >>> print(argmax.shape)
         (20, 16, 24, 31)
     """
-    strides = stride if (stride is not None) else kernel_size
-    if return_indices:
-        max_pool_func_ = _get_cache_prim(MaxPoolWithIndices)(kernel_size, strides, padding, dilation, ceil_mode)
-        out, indices = max_pool_func_(input)
-    else:
-        max_pool_func_ = _get_cache_prim(MaxPoolWithMask)(kernel_size, strides, padding, dilation, ceil_mode)
-        out, indices = max_pool_func_(input)
+    out, indices = func_max_pool2d_op(input, kernel_size, stride, padding, dilation, ceil_mode, return_indices)
     if return_indices:
         return out, indices
     return out

mindspore/ops/function/other_func.py

@@ -15,6 +15,7 @@
 """Defines other operators with functional form."""
 from mindspore.ops import operations as P
 from mindspore.ops.auto_generate import rotary_position_embedding
+from mindspore.ops.auto_generate import moe_distribute_dispatch, moe_distribute_combine
 from mindspore.ops.auto_generate.gen_ops_prim import moe_init_routing_v2_op
 
 partial_ = P.Partial()
@@ -268,6 +269,8 @@ __all__ = [
     'partial',
     'rotary_position_embedding',
     'move_to',
-    'moe_init_routing_v2'
+    'moe_init_routing_v2',
+    'moe_distribute_dispatch',
+    'moe_distribute_combine'
 ]
 __all__.sort()

mindspore/ops/function/random_func.py

@@ -32,7 +32,7 @@ from mindspore.common.generator import default_generator
 from mindspore.ops.auto_generate import UniformExt, NormalTensorTensor, \
     NormalTensorFloat, NormalFloatTensor, NormalFloatFloat, RandExt, RandLikeExt, MultinomialExt, \
     Randn, RandnLike, RandInt, RandIntLike, RandpermExt, InplaceRandom, InplaceNormal
-from mindspore.ops.auto_generate.gen_ops_prim import inplace_uniform_op
+from mindspore.ops.auto_generate.gen_ops_prim import inplace_uniform_op, inplace_exponential_op
 
 inplace_normal_ = InplaceNormal()
 normal_tensor_tensor_op = NormalTensorTensor()
@@ -296,7 +296,7 @@ def uniform_(input, from_=0, to=1, *, generator=None):
     Returns:
         Tensor, with the same shape and dtype as `input` tensor.
 
-   Raises:
+    Raises:
         TypeError: If `input` is not a Tensor.
         TypeError: If dtype of `input` is not one of: bool, int8, int16, int32, int64, uint8, float16, float32, float64,
             bfloat16.
@@ -384,6 +384,18 @@ def uniform(shape, minval, maxval, seed=None, dtype=mstype.float32):
     return value
 
 
+
+@_function_forbid_reuse
+def exponential_(input, lambd=1, *, generator=None):
+    r"""
+    exponential
+    """
+    if generator is None:
+        generator = default_generator
+    seed, offset = generator._step(generator_step_)  # pylint: disable=protected-access
+    return inplace_exponential_op(input, lambd, seed, offset)
+
+
 @_function_forbid_reuse
 def standard_normal(shape, seed=None):
     r"""
@@ -753,9 +765,9 @@ def normal_ext(mean=0.0, std=1.0, size=None, generator=None):
     Generates random numbers according to the standard Normal (or Gaussian) random number distribution.
 
     Args:
-        mean (Union[float, Tensor]): Mean value of each element, the shape of the `mean` tensor
+        mean (Union[Tensor]): Mean value of each element, the shape of the `mean` tensor
             should be the same as that of the `std` tensor.
-        std (Union[float, Tensor]): Standard deviation for each element, the shape of the `std` tensor
+        std (Union[Tensor]): Standard deviation for each element, the shape of the `std` tensor
             should be the same as that of the `mean` tensor. The value of `std` should be greater than or equal to 0.
 
     Keyword Args:
@@ -781,6 +793,33 @@ def normal_ext(mean=0.0, std=1.0, size=None, generator=None):
         >>> print(output.shape)
         (3,)
 
+    .. function:: normal(mean, std) -> Tensor
+        :noindex:
+
+    Similar to the function above, but the means are shared among all drawn elements.
+
+    Args:
+        mean (float): Mean value of each element.
+        std (Tensor): Standard deviation for each element. The value of `std` should be greater
+            than or equal to 0.
+
+    Returns:
+        Outputs a tensor with the same shape as `std`.
+
+    Supported Platforms:
+        ``Ascend``
+
+    Examples:
+        >>> import mindspore
+        >>> import numpy as np
+        >>> from mindspore import ops
+        >>> from mindspore import Tensor
+        >>> mean = 1.
+        >>> std = Tensor(np.array([1.0, 2.0, 3.0]), mindspore.float32)
+        >>> output = ops.function.random_func.normal_ext(mean, std)
+        >>> print(output.shape)
+        (3,)
+
     .. function:: normal(mean, std=1.0) -> Tensor
         :noindex:
 
@@ -995,7 +1034,7 @@ def gamma(shape, alpha, beta, seed=None):
         (3, 2, 2)
         >>> # case 2: alpha_shape is (2, 3), so shape is (3, 1, 3)
         >>> shape = (3, 1, 3)
-        >>> alpha = mindspore.tensor([[1, 3, 4], [2, 5, 6]]), mindspore.float32)
+        >>> alpha = mindspore.tensor([[1, 3, 4], [2, 5, 6]], mindspore.float32)
         >>> beta = mindspore.tensor([1.0], mindspore.float32)
         >>> output = mindspore.ops.gamma(shape, alpha, beta, seed=5)
         >>> result = output.shape

mindspore/ops/function/vmap_func.py

@@ -1,4 +1,4 @@
-# Copyright 2022 Huawei Technologies Co., Ltd
+# Copyright 2022-2024 Huawei Technologies Co., Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -102,6 +102,7 @@ def vmap(fn, in_axes=0, out_axes=0):
         [[-2  1  4]
          [ 8  9 10]]
     """
+
     return vmap_instance(fn, in_axes, out_axes)
 
 

mindspore/ops/functional.py

@@ -21,7 +21,7 @@ from mindspore.ops import _constants
 from mindspore.ops.function import *
 from mindspore.ops.function.array_func import chunk_ext, zero_
 from mindspore.ops.function.math_func import all, argmax_ext, float_power_ext, erfinv_, tanh_, bernoulli_ext
-from mindspore.ops.function.random_func import random_, uniform_ext, uniform_, normal_
+from mindspore.ops.function.random_func import random_, uniform_ext, uniform_, normal_, exponential_
 from mindspore.ops import operations as P
 from mindspore.ops.operations import array_ops
 from mindspore.ops.operations._sequence_ops import TensorToTuple
@@ -33,7 +33,6 @@ from mindspore.ops.operations.nn_ops import AdaptiveMaxPool2D
 from mindspore.ops.operations.math_ops import Roll
 from mindspore.ops.composite.math_ops import mm
 from mindspore.ops.function.math_func import dot
-from mindspore.ops.function.array_func import new_empty
 from mindspore.ops import auto_generate
 from mindspore.ops.auto_generate import cast
 from mindspore.ops._utils.arg_dtype_cast import DtypeToEnum
@@ -343,6 +342,7 @@ setattr(tensor_operator_registry, 'tensor_slice', tensor_slice)
 setattr(tensor_operator_registry, 'select', select)
 setattr(tensor_operator_registry, 'uniform', uniform_ext)
 setattr(tensor_operator_registry, 'uniform_', uniform_)
+setattr(tensor_operator_registry, 'exponential_', exponential_)
 setattr(tensor_operator_registry, 'gather', gather)
 setattr(tensor_operator_registry, 'gather_d', gather_d)
 setattr(tensor_operator_registry, 'gather_elements', gather_elements)
@@ -382,7 +382,6 @@ setattr(tensor_operator_registry, 'nanmedian', nanmedian)
 setattr(tensor_operator_registry, 'csr_to_coo', csr_to_coo)
 setattr(tensor_operator_registry, 'zeros', zeros)
 setattr(tensor_operator_registry, 'ones', ones)
-setattr(tensor_operator_registry, 'new_empty', new_empty)
 setattr(tensor_operator_registry, 'unsorted_segment_min', unsorted_segment_min)
 setattr(tensor_operator_registry, 'unsorted_segment_max', unsorted_segment_max)
 setattr(tensor_operator_registry, 'unsorted_segment_prod', unsorted_segment_prod)