-
Notifications
You must be signed in to change notification settings - Fork 12.2k
ggml : add ggml_set_rows #14274
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.
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
Merged
+653
−204
Merged
ggml : add ggml_set_rows #14274
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
3788aa7
ggml : add ggml_set_rows
rgerganov b2bd0a7
use I64 for indices
rgerganov 788fb0f
ggml : add repeat impl for i64
ggerganov 2f3a43d
ggml : add ggml_is_contiguous_rows
ggerganov 93a568c
ggml : ggml_set_rows support broadcast
ggerganov 6b9b86d
ggml : ggml_set_rows support quantized dst
ggerganov b13524c
ggml : support GGML_TYPE_F32 ".from_float" trait
ggerganov b597019
ggml : ggml_set_rows update comment + better index name
ggerganov f7d0aab
tests : add ggml_set_rows
ggerganov a881dc2
metal : add ggml_set_rows implementation
ggerganov a92973e
ggml : simplify forward_dup_f32
rgerganov 1a5b2a1
ggml : fix supports_op
rgerganov 3c33124
tests : add comment to set_rows
ggerganov 929e118
ggml : leave the repeat_i64 for a separate PR
ggerganov 56d6914
ggml : set_rows use std::min instead of MIN
ggerganov 8f0f615
ggml : better error message for set_rows unsupported type
ggerganov 838e89d
metal : perform op->type check only once
ggerganov f46ddba
tests : more consistent implementation + more tests
ggerganov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -192,6 +192,7 @@ typedef pthread_t ggml_thread_t; | |
|
||
static const struct ggml_type_traits_cpu type_traits_cpu[GGML_TYPE_COUNT] = { | ||
[GGML_TYPE_F32] = { | ||
.from_float = (ggml_from_float_t) ggml_cpu_fp32_to_fp32, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Attention here |
||
.vec_dot = (ggml_vec_dot_t) ggml_vec_dot_f32, | ||
.vec_dot_type = GGML_TYPE_F32, | ||
.nrows = 1, | ||
|
@@ -1814,6 +1815,10 @@ static void ggml_compute_forward(struct ggml_compute_params * params, struct ggm | |
{ | ||
ggml_compute_forward_get_rows_back(params, tensor); | ||
} break; | ||
case GGML_OP_SET_ROWS: | ||
{ | ||
ggml_compute_forward_set_rows(params, tensor); | ||
} break; | ||
case GGML_OP_DIAG: | ||
{ | ||
ggml_compute_forward_diag(params, tensor); | ||
|
@@ -2167,6 +2172,7 @@ static int ggml_get_n_tasks(struct ggml_tensor * node, int n_threads) { | |
n_tasks = n_threads; | ||
} break; | ||
case GGML_OP_GET_ROWS: | ||
case GGML_OP_SET_ROWS: | ||
{ | ||
// FIXME: get_rows can use additional threads, but the cost of launching additional threads | ||
// decreases performance with GPU offloading | ||
|
@@ -3121,6 +3127,10 @@ enum ggml_status ggml_graph_compute_with_ctx(struct ggml_context * ctx, struct g | |
return ggml_graph_compute(cgraph, &cplan); | ||
} | ||
|
||
void ggml_cpu_fp32_to_fp32(const float * x, float * y, int64_t n) { | ||
memcpy(y, x, n * sizeof(float)); | ||
} | ||
|
||
void ggml_cpu_fp32_to_fp16(const float * x, ggml_fp16_t * y, int64_t n) { | ||
int64_t i = 0; | ||
#if defined(__F16C__) | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Attention here