diff --git a/ge/client/proto/task.proto b/ge/client/proto/task.proto index d0c09840..0da5631e 100644 --- a/ge/client/proto/task.proto +++ b/ge/client/proto/task.proto @@ -57,6 +57,7 @@ message TaskDef { LabelSetDef label_set = 37; LabelGotoExDef label_goto_ex = 38; LabelSwitchByIndexDef label_switch_by_index = 39; + KernelDefWithHandle kernel_with_handle = 40; } message KernelDef { @@ -74,6 +75,19 @@ message KernelDef { uint32 kernel_ext_info_size = 19; } +message KernelDefWithHandle { + KernelContext context = 1; + + uint64 handle = 10; + string dev_func = 11; + uint32 block_dim = 12; + uint32 args_size = 13; + bytes args = 14; + bytes sm_desc = 15; + string original_kernel_key = 16; + string node_info = 17; +} + message KernelContext { uint32 kernel_type = 1; uint32 op_id = 2; // OP type in CCE diff --git a/ge/common/proto/task.proto b/ge/common/proto/task.proto index d0c09840..0da5631e 100644 --- a/ge/common/proto/task.proto +++ b/ge/common/proto/task.proto @@ -57,6 +57,7 @@ message TaskDef { LabelSetDef label_set = 37; LabelGotoExDef label_goto_ex = 38; LabelSwitchByIndexDef label_switch_by_index = 39; + KernelDefWithHandle kernel_with_handle = 40; } message KernelDef { @@ -74,6 +75,19 @@ message KernelDef { uint32 kernel_ext_info_size = 19; } +message KernelDefWithHandle { + KernelContext context = 1; + + uint64 handle = 10; + string dev_func = 11; + uint32 block_dim = 12; + uint32 args_size = 13; + bytes args = 14; + bytes sm_desc = 15; + string original_kernel_key = 16; + string node_info = 17; +} + message KernelContext { uint32 kernel_type = 1; uint32 op_id = 2; // OP type in CCE diff --git a/ge/executor/proto/task.proto b/ge/executor/proto/task.proto index d0c09840..0da5631e 100644 --- a/ge/executor/proto/task.proto +++ b/ge/executor/proto/task.proto @@ -57,6 +57,7 @@ message TaskDef { LabelSetDef label_set = 37; LabelGotoExDef label_goto_ex = 38; LabelSwitchByIndexDef label_switch_by_index = 39; + KernelDefWithHandle kernel_with_handle = 40; } message KernelDef { @@ -74,6 +75,19 @@ message KernelDef { uint32 kernel_ext_info_size = 19; } +message KernelDefWithHandle { + KernelContext context = 1; + + uint64 handle = 10; + string dev_func = 11; + uint32 block_dim = 12; + uint32 args_size = 13; + bytes args = 14; + bytes sm_desc = 15; + string original_kernel_key = 16; + string node_info = 17; +} + message KernelContext { uint32 kernel_type = 1; uint32 op_id = 2; // OP type in CCE diff --git a/ge/ge_local_engine/proto/task.proto b/ge/ge_local_engine/proto/task.proto index d0c09840..0da5631e 100644 --- a/ge/ge_local_engine/proto/task.proto +++ b/ge/ge_local_engine/proto/task.proto @@ -57,6 +57,7 @@ message TaskDef { LabelSetDef label_set = 37; LabelGotoExDef label_goto_ex = 38; LabelSwitchByIndexDef label_switch_by_index = 39; + KernelDefWithHandle kernel_with_handle = 40; } message KernelDef { @@ -74,6 +75,19 @@ message KernelDef { uint32 kernel_ext_info_size = 19; } +message KernelDefWithHandle { + KernelContext context = 1; + + uint64 handle = 10; + string dev_func = 11; + uint32 block_dim = 12; + uint32 args_size = 13; + bytes args = 14; + bytes sm_desc = 15; + string original_kernel_key = 16; + string node_info = 17; +} + message KernelContext { uint32 kernel_type = 1; uint32 op_id = 2; // OP type in CCE diff --git a/ge/host_cpu_engine/proto/task.proto b/ge/host_cpu_engine/proto/task.proto index d0c09840..0da5631e 100644 --- a/ge/host_cpu_engine/proto/task.proto +++ b/ge/host_cpu_engine/proto/task.proto @@ -57,6 +57,7 @@ message TaskDef { LabelSetDef label_set = 37; LabelGotoExDef label_goto_ex = 38; LabelSwitchByIndexDef label_switch_by_index = 39; + KernelDefWithHandle kernel_with_handle = 40; } message KernelDef { @@ -74,6 +75,19 @@ message KernelDef { uint32 kernel_ext_info_size = 19; } +message KernelDefWithHandle { + KernelContext context = 1; + + uint64 handle = 10; + string dev_func = 11; + uint32 block_dim = 12; + uint32 args_size = 13; + bytes args = 14; + bytes sm_desc = 15; + string original_kernel_key = 16; + string node_info = 17; +} + message KernelContext { uint32 kernel_type = 1; uint32 op_id = 2; // OP type in CCE diff --git a/ge/offline/proto/task.proto b/ge/offline/proto/task.proto index d0c09840..0da5631e 100644 --- a/ge/offline/proto/task.proto +++ b/ge/offline/proto/task.proto @@ -57,6 +57,7 @@ message TaskDef { LabelSetDef label_set = 37; LabelGotoExDef label_goto_ex = 38; LabelSwitchByIndexDef label_switch_by_index = 39; + KernelDefWithHandle kernel_with_handle = 40; } message KernelDef { @@ -74,6 +75,19 @@ message KernelDef { uint32 kernel_ext_info_size = 19; } +message KernelDefWithHandle { + KernelContext context = 1; + + uint64 handle = 10; + string dev_func = 11; + uint32 block_dim = 12; + uint32 args_size = 13; + bytes args = 14; + bytes sm_desc = 15; + string original_kernel_key = 16; + string node_info = 17; +} + message KernelContext { uint32 kernel_type = 1; uint32 op_id = 2; // OP type in CCE diff --git a/ge/proto/task.proto b/ge/proto/task.proto index d0c09840..0da5631e 100644 --- a/ge/proto/task.proto +++ b/ge/proto/task.proto @@ -57,6 +57,7 @@ message TaskDef { LabelSetDef label_set = 37; LabelGotoExDef label_goto_ex = 38; LabelSwitchByIndexDef label_switch_by_index = 39; + KernelDefWithHandle kernel_with_handle = 40; } message KernelDef { @@ -74,6 +75,19 @@ message KernelDef { uint32 kernel_ext_info_size = 19; } +message KernelDefWithHandle { + KernelContext context = 1; + + uint64 handle = 10; + string dev_func = 11; + uint32 block_dim = 12; + uint32 args_size = 13; + bytes args = 14; + bytes sm_desc = 15; + string original_kernel_key = 16; + string node_info = 17; +} + message KernelContext { uint32 kernel_type = 1; uint32 op_id = 2; // OP type in CCE diff --git a/metadef b/metadef index 88d053a5..848cf412 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit 88d053a5f94c40ff21620cef50b87075d5054292 +Subproject commit 848cf412caa9b42ce4e75ab4d0a147ec97dc579b diff --git a/parser b/parser index 6904ba94..756c64c5 160000 --- a/parser +++ b/parser @@ -1 +1 @@ -Subproject commit 6904ba9488658afc30076d299183fc8875045f49 +Subproject commit 756c64c59e451a955e81b59d957ad55f96c27d89