From 9e1b390c41a613ab8213120540bef0967b3fedca Mon Sep 17 00:00:00 2001 From: wangshuide2020 Date: Wed, 15 Sep 2021 17:34:40 +0800 Subject: [PATCH] add calculation picture of ScatterNd and add CPU platform for LogSigmoid, DenseBnAct, FTRL, etc. --- .jenkins/OWNERS | 1 - OWNERS | 1 - docs/api_img/ScatterNd.png | Bin 0 -> 16115 bytes mindspore/nn/layer/activation.py | 2 +- mindspore/nn/layer/combined.py | 2 +- mindspore/nn/layer/conv.py | 2 +- mindspore/nn/loss/loss.py | 4 ++-- mindspore/nn/optim/ftrl.py | 2 +- mindspore/nn/optim/lamb.py | 2 +- mindspore/ops/operations/array_ops.py | 31 ++++++++++++++++++++++++- mindspore/ops/operations/nn_ops.py | 2 +- mindspore/ops/operations/random_ops.py | 4 ++-- tests/OWNERS | 1 - 13 files changed, 40 insertions(+), 14 deletions(-) create mode 100644 docs/api_img/ScatterNd.png diff --git a/.jenkins/OWNERS b/.jenkins/OWNERS index 745ee57739c..060b42c5c1e 100644 --- a/.jenkins/OWNERS +++ b/.jenkins/OWNERS @@ -17,7 +17,6 @@ approvers: - john_tzanakakis - jpc_chenjianping - kingxian -- leonwanghui - liangchenghui - lilongfei15 - limingqi107 diff --git a/OWNERS b/OWNERS index 9d40c249f76..85baeecd051 100644 --- a/OWNERS +++ b/OWNERS @@ -3,7 +3,6 @@ approvers: - guoqi1024 - baochong - zhaizhiqiang -- leonwanghui files: "akg": diff --git a/docs/api_img/ScatterNd.png b/docs/api_img/ScatterNd.png new file mode 100644 index 0000000000000000000000000000000000000000..fcd98f1e50842d8730cc70f75b4356ddbac061fc GIT binary patch literal 16115 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 mN&SCs0~+*ye_KwOQb%>> net = nn.LogSigmoid() diff --git a/mindspore/nn/layer/combined.py b/mindspore/nn/layer/combined.py index 72c9bcab299..a094900e2fd 100644 --- a/mindspore/nn/layer/combined.py +++ b/mindspore/nn/layer/combined.py @@ -187,7 +187,7 @@ class DenseBnAct(Cell): ValueError: If `momentum` is not in range [0, 1.0]. Supported Platforms: - ``Ascend`` ``GPU`` + ``Ascend`` ``GPU`` ``CPU`` Examples: >>> net = nn.DenseBnAct(3, 4) diff --git a/mindspore/nn/layer/conv.py b/mindspore/nn/layer/conv.py index 4fc2af16daa..642b57dd334 100644 --- a/mindspore/nn/layer/conv.py +++ b/mindspore/nn/layer/conv.py @@ -737,7 +737,7 @@ class Conv3dTranspose(_Conv): Tensor, the shape is :math:`(N, C_{out}, D_{out}, H_{out}, W_{out})`. Supported Platforms: - ``Ascend`` + ``Ascend`` ``GPU`` Raises: TypeError: If `in_channels`, `out_channels` or `group` is not an int. diff --git a/mindspore/nn/loss/loss.py b/mindspore/nn/loss/loss.py index 5ba76bf5dae..bc13d5e560b 100644 --- a/mindspore/nn/loss/loss.py +++ b/mindspore/nn/loss/loss.py @@ -699,7 +699,7 @@ class MultiClassDiceLoss(LossBase): ValueError: If `weights` is a tensor, but its dimension is not 2. Supported Platforms: - ``Ascend`` ``GPU`` + ``Ascend`` ``GPU`` ``CPU`` Examples: >>> loss = nn.MultiClassDiceLoss(weights=None, ignore_indiex=None, activation="softmax") @@ -1095,7 +1095,7 @@ class CosineEmbeddingLoss(LossBase): ValueError: If `margin` is not in range [-1, 1]. Supported Platforms: - ``Ascend`` ``GPU`` + ``Ascend`` ``GPU`` ``CPU`` Examples: >>> logits_x1 = Tensor(np.array([[0.3, 0.8], [0.4, 0.3]]), mindspore.float32) diff --git a/mindspore/nn/optim/ftrl.py b/mindspore/nn/optim/ftrl.py index 61c472893b4..c531364f677 100644 --- a/mindspore/nn/optim/ftrl.py +++ b/mindspore/nn/optim/ftrl.py @@ -170,7 +170,7 @@ class FTRL(Optimizer): ValueError: If `initial_accum`, `l1` or `l2` is less than 0. Supported Platforms: - ``Ascend`` ``GPU`` + ``Ascend`` ``GPU`` ``CPU`` Examples: >>> net = Net() diff --git a/mindspore/nn/optim/lamb.py b/mindspore/nn/optim/lamb.py index c52e917d50b..1e63a75ed42 100755 --- a/mindspore/nn/optim/lamb.py +++ b/mindspore/nn/optim/lamb.py @@ -241,7 +241,7 @@ class Lamb(Optimizer): ValueError: If `weight_decay` is less than 0. Supported Platforms: - ``Ascend`` ``GPU`` + ``Ascend`` ``GPU`` ``CPU`` Examples: >>> net = Net() diff --git a/mindspore/ops/operations/array_ops.py b/mindspore/ops/operations/array_ops.py index 40b7f2582e6..a80c7d828e2 100755 --- a/mindspore/ops/operations/array_ops.py +++ b/mindspore/ops/operations/array_ops.py @@ -3475,6 +3475,11 @@ class ScatterNd(PrimitiveWithInfer): `updates` is a tensor of rank `Q-1+P-N`. Its shape is: :math:`(i_0, i_1, ..., i_{Q-2}, shape_N, ..., shape_{P-1})`. + The following figure shows the calculation process of inserting two slices in the first dimension of a rank-3 + with two matrices of new values: + + .. image:: api_img/ScatterNd.png + Inputs: - **indices** (Tensor) - The index of scattering in the new tensor with int32 or int64 data type. The rank of indices must be at least 2 and `indices_shape[-1] <= len(shape)`. @@ -3498,6 +3503,30 @@ class ScatterNd(PrimitiveWithInfer): Examples: >>> op = ops.ScatterNd() + >>> indices = Tensor(np.array([[0], [2]]), mindspore.int32) + >>> updates = Tensor(np.array([[[1, 1, 1, 1], [2, 2, 2, 2], + ... [3, 3, 3, 3], [4, 4, 4, 4]], + ... [[1, 1, 1, 1], [2, 2, 2, 2], + ... [3, 3, 3, 3], [4, 4, 4, 4]]]), mindspore.float32) + >>> shape = (4, 4, 4) + >>> output = op(indices, updates, shape) + >>> print(output) + [[[1. 1. 1. 1.] + [2. 2. 2. 2.] + [3. 3. 3. 3.] + [4. 4. 4. 4.]] + [[0. 0. 0. 0.] + [0. 0. 0. 0.] + [0. 0. 0. 0.] + [0. 0. 0. 0.]] + [[1. 1. 1. 1.] + [2. 2. 2. 2.] + [3. 3. 3. 3.] + [4. 4. 4. 4.]] + [[0. 0. 0. 0.] + [0. 0. 0. 0.] + [0. 0. 0. 0.] + [0. 0. 0. 0.]]] >>> indices = Tensor(np.array([[0, 1], [1, 1]]), mindspore.int32) >>> updates = Tensor(np.array([3.2, 1.1]), mindspore.float32) >>> shape = (3, 3) @@ -5690,7 +5719,7 @@ class Sort(PrimitiveWithInfer): TypeError: If dtype of `x` is neither float16 nor float32. Supported Platforms: - ``Ascend`` ``GPU`` + ``Ascend`` ``GPU`` ``CPU`` Examples: >>> x = Tensor(np.array([[8, 2, 1], [5, 9, 3], [4, 6, 7]]), mindspore.float16) diff --git a/mindspore/ops/operations/nn_ops.py b/mindspore/ops/operations/nn_ops.py index 00b57a1d3ae..d19d2b80aeb 100755 --- a/mindspore/ops/operations/nn_ops.py +++ b/mindspore/ops/operations/nn_ops.py @@ -8243,7 +8243,7 @@ class Conv3D(PrimitiveWithInfer): ValueError: If `data_format` is not 'NCDHW'. Supported Platforms: - ``Ascend`` ``GPU`` + ``Ascend`` ``GPU`` ``CPU`` Examples: >>> x = Tensor(np.ones([16, 3, 10, 32, 32]), mindspore.float16) diff --git a/mindspore/ops/operations/random_ops.py b/mindspore/ops/operations/random_ops.py index 16dd14c36ec..6fd90a7917e 100644 --- a/mindspore/ops/operations/random_ops.py +++ b/mindspore/ops/operations/random_ops.py @@ -301,7 +301,7 @@ class UniformInt(PrimitiveWithInfer): Tensor. The shape is the same as the input 'shape', and the data type is int32. Supported Platforms: - ``Ascend`` ``GPU`` + ``Ascend`` ``GPU`` ``CPU`` Examples: >>> shape = (2, 4) @@ -362,7 +362,7 @@ class UniformReal(StandardNormal): ValueError: If `shape` is not a constant value. Supported Platforms: - ``Ascend`` ``GPU`` + ``Ascend`` ``GPU`` ``CPU`` Examples: >>> shape = (2, 2) diff --git a/tests/OWNERS b/tests/OWNERS index a03a419fa34..f87ea3ceba5 100644 --- a/tests/OWNERS +++ b/tests/OWNERS @@ -17,7 +17,6 @@ approvers: - john_tzanakakis - jpc_chenjianping - kingxian -- leonwanghui - liangchenghui - lilongfei15 - limingqi107