Skip to content

Commit e0206e5

Browse files
committed
doc
1 parent 20dc0d1 commit e0206e5

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

ggml/src/ggml-tp/ggml-tp.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,8 +1238,7 @@ static void do_init(ggml_tensor * tensor, ggml_tensor_parallel_extra * extra) {
12381238

12391239
if (split == GGML_TP_SPLIT_NONE) {
12401240
if (src_extra->split_tensors == GGML_TP_SPLIT_REDUCE) {
1241-
ensure_reduce_split_views(tensor->src[src_index]);
1242-
wrapped->src[src_index] = src_extra->reduce_split_views[j];
1241+
wrapped->src[src_index] = src_extra->tensors[j];
12431242
}
12441243
else if (src_extra->split_tensors) {
12451244
wrapped->src[src_index] = src_extra->converted_tensors[j];
@@ -1263,12 +1262,8 @@ static void do_init(ggml_tensor * tensor, ggml_tensor_parallel_extra * extra) {
12631262
if (src_extra->split_tensors == GGML_TP_SPLIT_REDUCE) {
12641263
wrapped->src[src_index] = src_extra->tensors[j];
12651264
}
1266-
else if (src_extra->split_tensors) {
1267-
ensure_reduce_split_views(tensor->src[src_index]);
1268-
wrapped->src[src_index] = src_extra->reduce_split_views[j];
1269-
}
12701265
else {
1271-
wrapped->src[src_index] = src_extra->tensors[j];
1266+
GGML_ABORT("Tensor %s has unsupported op %s for tensor parallelism, src%d is split as %d but requested to be split as %d.\n", tensor->name, ggml_op_name(tensor->op), src_index, src_extra->split_tensors, split);
12721267
}
12731268
}
12741269
else {
@@ -1294,6 +1289,7 @@ static void do_init(ggml_tensor * tensor, ggml_tensor_parallel_extra * extra) {
12941289

12951290
bool force_rejoin = true;
12961291
switch (tensor->op) {
1292+
// case GGML_OP_ADD:
12971293
case GGML_OP_MUL:
12981294
case GGML_OP_MUL_MAT:
12991295
force_rejoin = false;
@@ -1444,7 +1440,6 @@ static void do_init(ggml_tensor * tensor, ggml_tensor_parallel_extra * extra) {
14441440
check_srcs();
14451441
break;
14461442

1447-
case GGML_OP_SUB:
14481443
case GGML_OP_ADD: {
14491444
no_split_view(src0, src0_extra);
14501445
no_split_view(src1, src1_extra);
@@ -1542,6 +1537,7 @@ static void do_init(ggml_tensor * tensor, ggml_tensor_parallel_extra * extra) {
15421537
break;
15431538
}
15441539

1540+
case GGML_OP_SUB:
15451541
case GGML_OP_DIV:
15461542
case GGML_OP_MUL: {
15471543
no_split_view(src0, src0_extra);

0 commit comments

Comments
 (0)