Zq/add specified autocompare by NeosZhang · Pull Request #785 · DeepLink-org/deeplink.framework

NeosZhang · 2024-04-19T05:56:28Z

重构autocompare，autocompare功能的开启或关闭不再依赖编译，和DIPU_AUTOCOMPARE_OPS_LIST来设置autocompare功能，可以指定算子进行autocompare。

重构后的wrapped_code代码生成逻辑改变，为所有未fallback的算子生成普通版和autocompare版

现在环境变量控制的是注册过程，根据DIPU_AUTOCOMPARE_OPS_LIST来确定注册普通版还是autocomapre版。

dipu/QuickStart.md

dipu/torch_dipu/csrc_dipu/aten/RegisterDIPU.hpp

lljbash · 2024-04-22T02:53:12Z

dipu/torch_dipu/csrc_dipu/aten/RegisterDIPU.hpp

-#define DIOPI_ATEN_FUNC(opname, diopiFunc, wapperFunc)                       \
+#define addAutoCompare(wrapperFunc) wrapperFunc##_autocompare
+#define DIOPI_ATEN_FUNC(opname, diopiFunc, wrapperFunc)                      \
+  do {                                                                       \


嵌套太多层了，这里的逻辑可以简化很多

我把嵌套的if条件拆开了

dipu/torch_dipu/csrc_dipu/aten/RegisterDIPU.hpp

lljbash · 2024-04-22T02:56:30Z

dipu/torch_dipu/csrc_dipu/aten/RegisterDIPU.hpp

+  } while (false);
+
+#define DIOPI_ATEN_FUNC_DISABLE_AUTOCOMPARE(opname, diopiFunc, wrapperFunc)  \
  do {                                                                       \


lljbash · 2024-04-22T02:56:59Z

dipu/torch_dipu/csrc_dipu/aten/ops/OpRegexMatch.cpp

+// "SPECIFIED_AUTOCOMPARE_OPS_LIST"; specified_autocompare_config_name =
+// ".specified_autocompare_op_list.config"
+
+namespace dipu {


namespace 太浅了

我把正则匹配相关的函数和变量放到了namespace dipu::opRegexMatch下面

namespace 小写下划线吧

dipu/torch_dipu/csrc_dipu/aten/ops/OpRegexMatch.cpp

lljbash · 2024-04-22T03:01:11Z

dipu/torch_dipu/csrc_dipu/aten/ops/OpRegexMatch.cpp

考虑到用户对正则的不熟悉，是否有必要改成 wildcard？

多数场景下，算子匹配并不会用到很复杂的正则的语法，在readme里面多给几个常用的场景的示例就可以了。
但如果换成wildcard，灵活性会差很多，可能不能满足一些极端场景的需求

dipu/torch_dipu/csrc_dipu/aten/ops/OpRegexMatch.cpp

lljbash · 2024-04-22T03:08:16Z

copy 是否已支持 autocompare，是不是要把 disable 去掉

Co-authored-by: Lingjie <lljbash@gmail.com>

lljbash

之前 comment 的逻辑简化依然应该做，if else 那堆现在特别难读

lljbash · 2024-04-23T11:03:15Z

dipu/torch_dipu/csrc_dipu/aten/ops/OpRegexMatch.cpp

+// "SPECIFIED_AUTOCOMPARE_OPS_LIST"; specified_autocompare_config_name =
+// ".specified_autocompare_op_list.config"
+
+namespace dipu {


namespace 小写下划线吧

lljbash · 2024-04-23T11:03:50Z

dipu/torch_dipu/csrc_dipu/aten/ops/OpRegexMatch.cpp

+  return list;
+}
+
+bool whetherOpMatch(const char* opname,


Suggested change

bool whetherOpMatch(const char* opname,

bool isOpMatch(const char* opname,

lljbash · 2024-04-23T11:05:44Z

dipu/scripts/ci/ascend/ci_ascend_script.sh

这里忘了删吧

lljbash · 2024-04-23T11:07:03Z

dipu/torch_dipu/csrc_dipu/aten/ops/OpRegexMatch.hpp

+extern const char* const fallback_env_name;
+extern const char* const fallback_config_name;
+extern const std::vector<std::regex> fallbackMatchers;
+
+extern const char* const specified_autocompare_env_name;
+extern const char* const specified_autocompare_config_name;


const char* 不用 extern，用 constexpr

lljbash · 2024-04-23T11:09:51Z

dipu/QuickStart.md

+- 可以通过设置环境变量`SPECIFIED_AUTOCOMPARE_OPS_LIST=‘.*’`，开启全局的精度对比，这种情况下所有调用的算子都会进行精度对比。
+
+```shell
+# 开启全局的算子精度自动对比功能
+export SPECIFIED_AUTOCOMPARE_OPS_LIST=‘.*’


Suggested change

- 可以通过设置环境变量`SPECIFIED_AUTOCOMPARE_OPS_LIST=‘.*’`，开启全局的精度对比，这种情况下所有调用的算子都会进行精度对比。

```shell

# 开启全局的算子精度自动对比功能

export SPECIFIED_AUTOCOMPARE_OPS_LIST=‘.*’

- 可以通过设置环境变量`SPECIFIED_AUTOCOMPARE_OPS_LIST='.*'`，开启全局的精度对比，这种情况下所有调用的算子都会进行精度对比。

```shell

# 开启全局的算子精度自动对比功能

export SPECIFIED_AUTOCOMPARE_OPS_LIST='.*'

lljbash · 2024-04-23T11:10:20Z

dipu/QuickStart.md

+
+```shell
+# 指定匹配add.*?的算子进行自动精度对比
+export DIPU_AUTOCOMPARE_OPS_LIST=add.*?


我还是很奇怪，add.*? 是个啥匹配

add.*?非贪婪匹配所有add开头的，匹配结果是add 比如"add.out, add.scalar", 匹配结果就是“add”， “add”，只要匹配结果不为空，isOpMatch都返回True

问号是对匹配结果造成影响是吧，这么看来这这里是多余的？

lljbash · 2024-04-25T07:29:20Z

dipu/torch_dipu/csrc_dipu/aten/ops/OpRegexMatch.cpp

+constexpr const char* fallback_env_name = "DIPU_FORCE_FALLBACK_OPS_LIST";
+constexpr const char* fallback_config_name =
+    ".dipu_force_fallback_op_list.config";
+const std::vector<std::regex> fallbackMatchers =
+    dipu::op_regex_match::loadMatcher(fallback_env_name, fallback_config_name);
+
+constexpr const char* specified_autocompare_env_name =
+    "DIPU_AUTOCOMPARE_OPS_LIST";
+constexpr const char* specified_autocompare_config_name =
+    ".specified_autocompare_op_list.config";
+const std::vector<std::regex> autocompareMatchers =
+    dipu::op_regex_match::loadMatcher(specified_autocompare_env_name,
+                                      specified_autocompare_config_name);


我建议按常量命名规范 k+驼峰

lljbash · 2024-04-25T07:30:06Z

FYI: clang-format 根目录有个脚本可以用

lljbash · 2024-04-25T07:41:39Z

dipu/torch_dipu/csrc_dipu/aten/RegisterDIPU.hpp

-    else {                                                                  \
-      m.impl(opname, TORCH_FN(wrapper_func));                               \
-    }                                                                       \
+#define CONCAT_NAME(a, b) a##b


我记得这样是不会展开 a 和 b 的，还得加一层。
不过我们某个头文件里可能已经实现这个基础设施了，没有的话也应该加在那里，因为这个很基础
或者用 C10_CONCATENATE
而且宏绝对不能这么起名字，太容易撞了

* fix cat bug * use cast in op-plugin and optimize cat * skip cat double test case * enhance empty check * remove OpCommandImpls relate * use diopiCopyInp and diopiDtypeCast * fallback cast to cpu * skip some test case: contiguous to no contiguous * fix copy and cast bug * support stride_copy_support double * enable some test case * skip double test case in copy

NeosZhang added 5 commits April 17, 2024 16:12

craft

60eb031

draft

76d96f6

fix

63a4ff7

fix

538cf2f

update readme

5348043

NeosZhang requested review from Wrench-Git, fandaoyi, lljbash, mrdanielw, wiryls, wugeshui and zhaoguochun1995 as code owners April 19, 2024 05:56

NeosZhang added 9 commits April 19, 2024 14:03

fix md lint

6d8a8e3

fix cpp lint

4790315

fix readme

ba73de3

fix lint

e97db80

fix

8e95f2f

rm autcompare CI

1ba0e04

add copyright

f27200b

fix clang-format

e534ce2

fix clang-tidy

f2d7ff9

lljbash reviewed Apr 22, 2024

View reviewed changes

dipu/QuickStart.md Outdated Show resolved Hide resolved

fix lint

5598c1b

lljbash requested changes Apr 22, 2024

View reviewed changes

NeosZhang added DIPU DIPU related refactor just better coding labels Apr 22, 2024

NeosZhang and others added 3 commits April 22, 2024 12:39

Update dipu/QuickStart.md

3c63c9f

Co-authored-by: Lingjie <lljbash@gmail.com>

remove ENV USE_GLOBAL_AUTOCOMPARE

5cdba1a

fix

9d9923e

NeosZhang added 2 commits April 22, 2024 18:41

fix

458233c

fix

389a267

NeosZhang requested a review from lljbash April 23, 2024 08:08

fix readme

c8dbb34

lljbash reviewed Apr 23, 2024

View reviewed changes

NeosZhang added 7 commits April 24, 2024 11:31

fix

8d40cf9

add directMemCopyH2H

d5a38d0

fix

16585db

fix lint

0a5cd89

fix clang format

17ce56f

fix

5413aec

fix clang format

6931b62

lljbash approved these changes Apr 25, 2024

View reviewed changes

simplify register macro

dedb0c5

lljbash reviewed Apr 25, 2024

View reviewed changes

NeosZhang mentioned this pull request Apr 26, 2024

Zq/add specified autocompare2 #794

Merged

NeosZhang marked this pull request as draft April 26, 2024 03:44

generate fake autocompare_func when disable

94b98f3

	bool whetherOpMatch(const char* opname,
	bool isOpMatch(const char* opname,

Comments

Conversation

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

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

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!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

NeosZhang Apr 22, 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!

Uh oh!

lljbash commented Apr 22, 2024

Uh oh!

lljbash left a comment

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!

lljbash commented Apr 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lljbash Apr 25, 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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

NeosZhang commented Apr 19, 2024 •

edited

Loading

NeosZhang Apr 22, 2024 •

edited

Loading

lljbash commented Apr 25, 2024 •

edited

Loading

lljbash Apr 25, 2024 •

edited

Loading