API improvement paddle.nanmedian 易用性提升 #62624

NKNaN · 2024-03-11T08:57:56Z

PR types

New features

PR changes

OPs

Description

增加参数 mode ：默认值 'avg' ，另外可取 'min' 。当所需要计算的 tensor 在 axis 轴上有偶数个元素时， 'avg' 表示计算结果为中间两个数的算术平均值；'min' 则为二者的最小值。
返回值：当 mode = 'min' 且 axis 不为 None 或 tuple 时，返回值为 (median_values, median_indices) ；其他情况下返回值为 median_values 的 tensor 。

参考
- Nanmedian using min/mean when even size #55285

paddle-bot · 2024-03-11T08:58:01Z

你的PR提交成功，感谢你对开源项目的贡献!
请关注后续CI自动化测试结果，详情请参考Paddle-CI手册。
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

paddle-bot · 2024-03-11T08:58:03Z

❌ The PR is not created using PR's template. You can refer to this Demo.
Please use PR's template, it helps save our maintainers' time so that more developers get helped.

zhwesky2010 · 2024-03-13T13:37:49Z

paddle/phi/infermeta/unary.cc

-  out->set_dims(common::make_ddim(out_dim));
+  auto median_dim = out_dim;
+  median_dim.push_back(2);
+  median_index->set_dtype(DataType::INT64);


index的shape是不是不对，如果是取avg用法，则index的size是out的两倍，如果是取min用法，则index的shape应与out一致

已修改为avg模式下index的size是out的两倍，min模式下与out一致

zhwesky2010 · 2024-03-13T13:39:50Z

python/paddle/tensor/stat.py

-        Tensor, results of median along ``axis`` of ``x``. The output dtype is the same as `x`.
+        ((Tensor, Tensor), optional)
+        If ``mode`` == 'avg', the result will be the tensor of median values;
+        If ``mode`` == 'min' and ``axis`` is None or tuple, the result will be the tensor of median values;


分为两种：

axis为int

axis不为int（为None或tuple）

zhwesky2010 · 2024-03-13T13:40:11Z

python/paddle/tensor/stat.py

+        ((Tensor, Tensor), optional)
+        If ``mode`` == 'avg', the result will be the tensor of median values;
+        If ``mode`` == 'min' and ``axis`` is None or tuple, the result will be the tensor of median values;
+        If ``mode`` == 'min' and ``axis`` is not None, the result will be a tuple of two tensors


tuple情况下，也是返回1个吧

是的，tuple，list，None都返回1个

zhwesky2010 · 2024-03-13T13:41:28Z

python/paddle/tensor/stat.py

+        If ``mode`` == 'min' and ``axis`` is not None, the result will be a tuple of two tensors
+        containing median values and their indices.
+
+        When ``mode`` == 'avg', if data type of ``x`` is float64, data type of median values will be float64,


这个是和输入x的类型一致吧，和paddle.median不太一样

是和输入x的类型一致，已修改

zhwesky2010 · 2024-03-13T13:41:51Z

python/paddle/tensor/stat.py

        name (str, optional): Name for the operation (optional, default is None).
            For more information, please refer to :ref:`api_guide_Name`.

    Returns:
-        Tensor, results of median along ``axis`` of ``x``. The output dtype is the same as `x`.
+        ((Tensor, Tensor), optional)


这些文字要写 nanmedian index value，不要照抄 paddle.median 的文档

zhwesky2010 · 2024-03-13T13:42:27Z

python/paddle/tensor/stat.py

+
+        When ``mode`` == 'avg', if data type of ``x`` is float64, data type of median values will be float64,
+        otherwise data type of median values will be float32.
+        When ``mode`` == 'min', the data type of median values will be the same as ``x``. The data type of


不要照抄 paddle.median 文档

zhwesky2010 · 2024-03-13T13:43:41Z

python/paddle/tensor/stat.py

+            >>> print(y5_index.numpy())
+            [1 1 1]
+
+            >>> y6, y6_index = x.nanmedian(1, mode='min')


举一个axis为None的例子，此时无index

zhwesky2010 · 2024-03-13T13:44:36Z

python/paddle/tensor/stat.py

            attrs=attrs,
        )
+        indices.stop_gradient = True
+    if mode == 'min' and need_index:
+        return out, indices[..., 0]


能否在infermeta就对index设置一个与out一致的shape，不用浪费一半的操作，mode='avg'时的index其实没用

已修改infermeta和kernel中对应处理的地方

zhwesky2010 · 2024-03-18T09:29:04Z

paddle/phi/kernels/gpu/nanmedian_grad_kernel.cu

+                                       int64_t pre_dim) {
+  CUDA_KERNEL_LOOP(index, pre_dim) {
+    int64_t offset = index * stride;
+    printf("index: %d\n", index);


打印信息可以删掉

zhwesky2010 · 2024-03-18T09:36:19Z

python/paddle/tensor/stat.py

+        If ``mode`` == 'min' and ``axis`` is int, the result will be a tuple of two tensors
+            containing nanmedian values and their indices.
+
+        When ``mode`` == 'avg', the output dtype is the same as `x`.


data_type应该不用额外强调，out与x一致，index是int64也是一般常识

好的，那这里就和修改之前一样直接写 nanmedian values 的 data_type 与 x 一致了

zhwesky2010 · 2024-03-18T13:31:34Z

python/paddle/tensor/stat.py

-        When ``mode`` == 'min', the data type of nanmedian values will be the same as ``x``.
-            If indices are retured, the data type will be int64.
-
+        The data type of nanmedian values is the same as ``x``.


这个直接删掉也可以吧

zhwesky2010 · 2024-03-19T03:39:15Z

python/paddle/tensor/stat.py

+        If ``mode`` == 'avg', the result will be the tensor of nanmedian values;
+        If ``mode`` == 'min' and ``axis`` is not int (None or list or tuple), the result will
+            be the tensor of nanmedian values;
+        If ``mode`` == 'min' and ``axis`` is int, the result will be a tuple of two tensors


这样写吧：

If mode == 'min' and axis is int, the result will be a tuple of two tensors (nanmedian value and nanmedian index). Otherwise, only nanmedian value will be returned.

看起来简介易懂点

zhwesky2010

LGTM

zhwesky2010 · 2024-03-19T04:16:09Z

@NKNaN 中文文档也同时修改一下

update nanmedian

e7cdf95

paddle-bot bot added the contributor External developers label Mar 11, 2024

NKNaN added 4 commits March 11, 2024 17:38

fix cuda typo

7299bfd

fix test

faa9e3a

update infermeta

d79c3ba

fix test

7163307

zhwesky2010 reviewed Mar 13, 2024

View reviewed changes

refine index and docstring

a5a7b48

zhwesky2010 reviewed Mar 18, 2024

View reviewed changes

delete print and refine docs

5db35ec

zhwesky2010 previously approved these changes Mar 18, 2024

View reviewed changes

udpate docs

073ccaa

NKNaN dismissed zhwesky2010’s stale review via 073ccaa March 18, 2024 14:02

zhwesky2010 reviewed Mar 19, 2024

View reviewed changes

update docs

e94274a

zhwesky2010 approved these changes Mar 19, 2024

View reviewed changes

NKNaN mentioned this pull request Mar 19, 2024

API improvement for paddle.nanmedian PaddlePaddle/docs#6528

Merged

luotao1 assigned luotao1, zyfncg and Galaxy1458 Mar 19, 2024

zyfncg approved these changes Mar 19, 2024

View reviewed changes

Galaxy1458 approved these changes Mar 19, 2024

View reviewed changes

yuanlehome approved these changes Mar 19, 2024

View reviewed changes

luotao1 merged commit 28bca40 into PaddlePaddle:develop Mar 19, 2024

NKNaN mentioned this pull request Mar 22, 2024

[WeeklyReports] 2024.03.09~2024.03.22 周报汇总 PFCCLab/Camp#161

Closed

28 tasks

API improvement paddle.nanmedian 易用性提升 #62624

API improvement paddle.nanmedian 易用性提升 #62624

Uh oh!

Conversation

NKNaN commented Mar 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR types

PR changes

Description

Uh oh!

paddle-bot bot commented Mar 11, 2024

Uh oh!

paddle-bot bot commented Mar 11, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zhwesky2010 Mar 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zhwesky2010 left a comment

Choose a reason for hiding this comment

Uh oh!

zhwesky2010 commented Mar 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

NKNaN commented Mar 11, 2024 •

edited

Loading

zhwesky2010 Mar 13, 2024 •

edited

Loading

zhwesky2010 commented Mar 19, 2024 •

edited

Loading