Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix](mluops): Fix protoc version check and Gencase-User-Guide-zh.md #940

Merged
merged 2 commits into from
Jan 25, 2024
Merged

[Fix](mluops): Fix protoc version check and Gencase-User-Guide-zh.md #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b0fce6
[Fix](mluops): fix protoc version check
Jan 24, 2024
f065ba0
[fix](mluops): Delete extra Spaces in Gencase-User-Guide-zh.md
Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.property
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"driver": "5.10.15",
"eigen3": "3.4.0",
"libxml2": "2.9.0",
"protoc": "3.6.0"},
"protoc": "3.9.0"},
"package_type": ["rpm","deb"]
}
24 changes: 12 additions & 12 deletions docs/Gencase-User-Guide-zh.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

1) 在测试机上打开环境变量
```
export MLUOP_GEN_CASE = 1
export MLUOP_GEN_CASE=1
```
2) 执行
```
Expand All @@ -29,11 +29,11 @@
#### 1.2 GEN_CASE 环境变量说明
| 环境变量 | 功能 | 默认状态 |
|-------------------------------|-----------------------------------------------------------------------|---------------------|
|MLUOP_GEN_CASE |export MLUOP_GEN_CASE = 0: 关闭gen_case模块功能;<br>export MLUOP_GEN_CASE = 1: 生成 prototxt, 输入输出只保留 shape 等信息(GEN_CASE_DATA_REAL将无效);<br>export MLUOP_GEN_CASE = 2: 生成 proto, 并保留输入真实值;<br>export MLUOP_GEN_CASE = 3: 不生成 prototxt, 只在屏幕上打印输入输出的shape等信息。 | 默认 0 |
|MLUOP_GEN_CASE_OP_NAME |export MLUOP_GEN_CASE_OP_NAME = "算子A; 算子B……": 指定只使能算子 A/B……的 gen_case 功能;<br>export MLUOP_GEN_CASE_OP_NAME = "-算子A; -算子B……": 指定只不使能算子 A/B……的 gen_case 功能。 | 默认全部算子使能 |
|MLUOP_GEN_CASE_DUMP_DATA |在MLUOP_GEN_CASE = 2时生效;<br>export MLUOP_GEN_CASE_DUMP_DATA = 0: prototxt 中不保存输入的真值(此时的GEN_CASE_DATA_REAL有效);<br>export MLUOP_GEN_CASE_DUMP_DATA = 1: prototxt 中保存输入的文本形式真值;<br>export MLUOP_GEN_CASE_DUMP_DATA = 2: prototxt 中保存输入的二进制真值。 | 默认 0 |
|MLUOP_GEN_CASE_DUMP_DATA_OUTPUT|export MLUOP_GEN_CASE_DUMP_DATA_OUTPUT = 0: prototxt 中不保存 mlu 的输出值;<br>export MLUOP_GEN_CASE_DUMP_DATA_OUTPUT = 1: prototxt 中保存文本形式的 mlu 输出值;<br>export MLUOP_GEN_CASE_DUMP_DATA_OUTPUT = 2: prototxt 中保存二进制形式的 mlu 输出值。 | 默认 0 |
|MLUOP_GEN_CASE_DUMP_DATA_FILE |在 MLUOP_GEN_CASE = 2时生效;<br>export MLUOP_GEN_CASE_DUMP_DATA_FILE = 0: 保存方式以 MLUOP_GEN_CASE_DUMP_DATA 为准 export MLUOP_GEN_CASE_DUMP_DATA_FILE = 1: 真实值以一个二进制文件单独存储, prototxt 文件中保存 path。 | 默认 0 |
|MLUOP_GEN_CASE |export MLUOP_GEN_CASE=0: 关闭gen_case模块功能;<br>export MLUOP_GEN_CASE=1: 生成 prototxt, 输入输出只保留 shape 等信息(GEN_CASE_DATA_REAL将无效);<br>export MLUOP_GEN_CASE=2: 生成 proto, 并保留输入真实值;<br>export MLUOP_GEN_CASE=3: 不生成 prototxt, 只在屏幕上打印输入输出的shape等信息。 | 默认 0 |
|MLUOP_GEN_CASE_OP_NAME |export MLUOP_GEN_CASE_OP_NAME="算子A; 算子B……": 指定只使能算子 A/B……的 gen_case 功能;<br>export MLUOP_GEN_CASE_OP_NAME="-算子A; -算子B……": 指定只不使能算子 A/B……的 gen_case 功能。 | 默认全部算子使能 |
|MLUOP_GEN_CASE_DUMP_DATA |在MLUOP_GEN_CASE = 2时生效;<br>export MLUOP_GEN_CASE_DUMP_DATA=0: prototxt 中不保存输入的真值(此时的GEN_CASE_DATA_REAL有效);<br>export MLUOP_GEN_CASE_DUMP_DATA=1: prototxt 中保存输入的文本形式真值;<br>export MLUOP_GEN_CASE_DUMP_DATA=2: prototxt 中保存输入的二进制真值。 | 默认 0 |
|MLUOP_GEN_CASE_DUMP_DATA_OUTPUT|export MLUOP_GEN_CASE_DUMP_DATA_OUTPUT=0: prototxt 中不保存 mlu 的输出值;<br>export MLUOP_GEN_CASE_DUMP_DATA_OUTPUT=1: prototxt 中保存文本形式的 mlu 输出值;<br>export MLUOP_GEN_CASE_DUMP_DATA_OUTPUT=2: prototxt 中保存二进制形式的 mlu 输出值。 | 默认 0 |
|MLUOP_GEN_CASE_DUMP_DATA_FILE |在 MLUOP_GEN_CASE = 2时生效;<br>export MLUOP_GEN_CASE_DUMP_DATA_FILE=0: 保存方式以 MLUOP_GEN_CASE_DUMP_DATA 为准 export MLUOP_GEN_CASE_DUMP_DATA_FILE=1: 真实值以一个二进制文件单独存储, prototxt 文件中保存 path。 | 默认 0 |

### 2. 算子中添加 GEN_CASE 功能

Expand Down Expand Up @@ -79,7 +79,7 @@ mluOpStatus_t MLUOP_WIN_API mluOpRoiCropForward(
mluOpHandle_t handle, const mluOpTensorDescriptor_t input_desc,
const void *input, const mluOpTensorDescriptor_t grid_desc,
const void *grid, const mluOpTensorDescriptor_t output_desc, void *output) {

……

if (MLUOP_GEN_CASE_ON_NEW)
Expand All @@ -91,21 +91,21 @@ mluOpStatus_t MLUOP_WIN_API mluOpRoiCropForward(
GEN_CASE_DATA(false, "output", output, output_desc, 0, 0);
GEN_CASE_TEST_PARAM_NEW(true, true, false, 0.003, 0.003, 0);
}

cnrtDim3_t k_dim;
cnrtFunctionType_t k_type;

policyFunc(handle, bin_num, &k_dim, &k_type);
VLOG(5) << "[mluOpRoiCropForward] launch kernel policyFunc[" << k_dim.x
<< ", " << k_dim.y << ", " << k_dim.z << "].";

KERNEL_CHECK((mluOpBlockKernelRoiCropForwardFloat(
k_dim, k_type, handle->queue, input, grid, batch, height, width, channels,
grid_n, output_h, output_w, output)));
VLOG(5) << "Kernel mluOpBlockKernelRoiCropForwardFloat.";

GEN_CASE_END();

return MLUOP_STATUS_SUCCESS;
}

Expand Down
2 changes: 1 addition & 1 deletion version_pre_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def check_protoc():
return version_status["not_found_version"]

sys_out = sys_out.strip("\n").split(" ")[-1]
if LooseVersion(required_version["protoc"]) > LooseVersion(sys_out):
if LooseVersion(required_version["protoc"]) < LooseVersion(sys_out):
print(
"Warning: The version of protoc needs to be at most "
+ required_version["protoc"]
Expand Down