昇腾和寒武纪相关代码退场 npu相关代码退场3 #53699

Liyulingyue · 2023-05-10T11:47:33Z

PR types

Others

PR changes

Others

Description

paddle-bot · 2023-05-10T11:47:37Z

你的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 · 2023-05-10T11:47:40Z

❌ 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.

KimBioInfoStudio

is_compiled_with_custom_device('npu') 的 if...else... 请两位看下是否合适现阶段就去掉 @ronny1996 @zhiqiu

KimBioInfoStudio · 2023-05-11T02:19:49Z

python/paddle/static/nn/common.py

-            l_type = 'depthwise_conv2d'
-        else:
-            l_type = 'conv2d'
-


@ronny1996 any comment?

KimBioInfoStudio · 2023-05-11T02:20:03Z

python/paddle/static/amp/fp16_lists.py

@@ -97,8 +97,6 @@ def _get_sys_unsupported_list(dtype):
    device = None
    if core.is_compiled_with_xpu():
        device = 'XPU'
-    elif core.is_compiled_with_custom_device('npu'):


@ronny1996 any comment?

KimBioInfoStudio · 2023-05-11T02:20:50Z

python/paddle/static/amp/decorator.py

@@ -476,27 +459,17 @@ def _check_finite_and_unscale(self, params_grads):
        if self._is_distributed:
            # if distributed, split check_finite_and_unscale to overlap
            # unscale with communication
-            if core.is_compiled_with_custom_device('npu'):


@ronny1996 any comment?

KimBioInfoStudio · 2023-05-11T02:21:20Z

python/paddle/static/amp/decorator.py

@@ -220,24 +220,7 @@ def backward(
        """
        train_program = loss.block.program
        self._train_program = train_program
-
-        # NOTE(zhiqiu): _float_status is only used for NPU.
-        if core.is_compiled_with_custom_device('npu'):


@zhiqiu @ronny1996 any comment?

KimBioInfoStudio

is_compiled_with_custom_device('npu') 的 if...else... 请两位看下是否合适现阶段就去掉 @ronny1996 @zhiqiu

ronny1996 · 2023-05-11T02:56:44Z

paddle/phi/api/yaml/ops.yaml

@@ -1507,15 +1507,6 @@
    func : nonzero
    data_type: condition

- op : npu_identity
-  args : (Tensor x, int format = -1)
-  output : Tensor


这里暂时不删除

ronny1996 · 2023-05-11T02:56:56Z

paddle/phi/kernels/npu_identity_kernel.cc

-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "paddle/phi/kernels/npu_identity_kernel.h"


ronny1996 · 2023-05-11T02:57:07Z

paddle/phi/kernels/npu_identity_kernel.h

-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,


ronny1996 · 2023-05-11T02:57:42Z

python/paddle/nn/layer/norm.py

@@ -725,29 +724,6 @@ def __init__(
        )
        self._variance.stop_gradient = True

-        # TODO(qili93): temporary for ascned npu performance to be removed along with npu_identity op


这里暂时不删除

ronny1996 · 2023-05-11T02:57:54Z

python/paddle/nn/functional/conv.py

@@ -145,16 +139,6 @@ def _conv_nd(
            new_shape = [1] * len(x.shape)
            new_shape[channel_dim] = -1
            bias = bias.reshape(new_shape)
-            # TODO(qili93): temporary for ascned npu performance to be removed along with npu_identity op
-            if (
-                _global_flags()['FLAGS_npu_storage_format']


这里暂时不删除

ronny1996 · 2023-05-11T02:58:25Z

python/paddle/nn/functional/conv.py

@@ -739,29 +716,12 @@ def conv2d(
                        + bias.shape
                        + [1 for i in range(len(x.shape) - channel_dim - 1)],
                    )
-                # TODO(qili93): temporary for ascned npu performance to be removed along with npu_identity op
-                if (


luotao1 · 2023-05-11T07:55:20Z

需要解决一下冲突

Liyulingyue · 2023-05-12T13:50:51Z

@luotao1 本pr合入后，还有以下NPU可能需要清理：

DeviceEventRecordCustomDevice
NPUStorageProperties
tools路径下
cmake路径下
需要麻烦研发检查并确认一下，否则本pr合入后基本可以关闭昇腾和寒武纪相关代码退场 Tracking Issue #52319

Liyulingyue · 2023-05-12T13:54:07Z

is_compiled_with_custom_device('npu') 的 if...else... 请两位看下是否合适现阶段就去掉 @ronny1996 @zhiqiu

@KimBioInfoStudio 根据#53568 中的评论，可能暂时不会被清除了。

qili93 · 2023-05-16T06:29:26Z

@luotao1 本pr合入后，还有以下NPU可能需要清理：

DeviceEventRecordCustomDevice

NPUStorageProperties

tools路径下

cmake路径下
需要麻烦研发检查并确认一下，否则本pr合入后基本可以关闭昇腾和寒武纪相关代码退场 Tracking Issue #52319

DeviceEventRecordCustomDevice 和 NPUStorageProperties 都请不要删除，是新增功能和退场的NPU代码无关；
tools路径和 cmake路径下确认下是不是 npu 的 dockerfile 以及 npu.cmake 等文件，这些都是可以删除的

ronny1996

LGTM

Liyulingyue added 15 commits May 6, 2023 22:06

rm npu

2cee98d

rm use_npu

22d88ba

rm npuid

958a544

rm use_npu

090f427

rm npuid

a4b095b

Merge remote-tracking branch 'origin/npu2' into npu2

dbd1b0a

delete npupinned

781658b

roll back sth.

d75f0b5

roll back sth.

35bff4d

delete npupinned

4dee27d

roll back sth.

843e2b5

roll back sth.

897c332

Merge remote-tracking branch 'origin/npu2' into npu2

e025542

Merge branch 'develop' into npu2

5bd1d49

rm npu

83bc172

paddle-bot bot added contributor External developers status: proposed labels May 10, 2023

Liyulingyue assigned luotao1 and ronny1996 May 10, 2023

KimBioInfoStudio reviewed May 11, 2023

View reviewed changes

ronny1996 requested changes May 11, 2023

View reviewed changes

Merge branch 'develop' into npu3

783ac72

Liyulingyue and others added 4 commits May 11, 2023 18:06

Merge branch 'develop' into npu3

1114307

rollback something

6324497

rollback npu identity

4738811

rollback npu identity

59d84e1

ronny1996 approved these changes May 16, 2023

View reviewed changes

luotao1 merged commit 5b054d2 into PaddlePaddle:develop May 16, 2023

luotao1 mentioned this pull request May 16, 2023

昇腾和寒武纪相关代码退场 Tracking Issue #52319

Closed

Liyulingyue deleted the npu3 branch May 16, 2023 14:54

luotao1 added the HappyOpenSource 快乐开源活动issue与PR label Aug 14, 2023

paddle-bot bot removed the status: proposed label Aug 14, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

昇腾和寒武纪相关代码退场 npu相关代码退场3 #53699

昇腾和寒武纪相关代码退场 npu相关代码退场3 #53699

Liyulingyue commented May 10, 2023 •

edited

Loading

paddle-bot bot commented May 10, 2023

paddle-bot bot commented May 10, 2023

KimBioInfoStudio left a comment

KimBioInfoStudio May 11, 2023

KimBioInfoStudio May 11, 2023

KimBioInfoStudio May 11, 2023

KimBioInfoStudio May 11, 2023

KimBioInfoStudio left a comment

ronny1996 May 11, 2023

ronny1996 May 11, 2023

ronny1996 May 11, 2023

ronny1996 May 11, 2023

ronny1996 May 11, 2023

ronny1996 May 11, 2023

luotao1 commented May 11, 2023

Liyulingyue commented May 12, 2023 •

edited

Loading

Liyulingyue commented May 12, 2023 •

edited

Loading

qili93 commented May 16, 2023 •

edited

Loading

ronny1996 left a comment

昇腾和寒武纪相关代码退场 npu相关代码退场3 #53699

昇腾和寒武纪相关代码退场 npu相关代码退场3 #53699

Conversation

Liyulingyue commented May 10, 2023 • edited Loading

PR types

PR changes

Description

paddle-bot bot commented May 10, 2023

paddle-bot bot commented May 10, 2023

KimBioInfoStudio left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

KimBioInfoStudio left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

luotao1 commented May 11, 2023

Liyulingyue commented May 12, 2023 • edited Loading

Liyulingyue commented May 12, 2023 • edited Loading

qili93 commented May 16, 2023 • edited Loading

ronny1996 left a comment

Choose a reason for hiding this comment

Liyulingyue commented May 10, 2023 •

edited

Loading

Liyulingyue commented May 12, 2023 •

edited

Loading

Liyulingyue commented May 12, 2023 •

edited

Loading

qili93 commented May 16, 2023 •

edited

Loading