Skip to content

embeddings: fix extraction of CLS pooling results #14927

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

Merged
merged 2 commits into from
Jul 30, 2025
Merged

embeddings: fix extraction of CLS pooling results #14927

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7968a4
embeddings: fix extraction of CLS pooling results
iamlemec Jul 28, 2025
cb9ea7e
merge RANK pooling into CLS case for inputs
iamlemec Jul 29, 2025
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
28 changes: 16 additions & 12 deletions src/llama-graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,7 @@ void llm_graph_input_cls::set_input(const llama_ubatch * ubatch) {
const int64_t n_seq_tokens = ubatch->n_seq_tokens;
const int64_t n_seqs_unq = ubatch->n_seqs_unq;

if (cparams.embeddings && (
cparams.pooling_type == LLAMA_POOLING_TYPE_CLS ||
cparams.pooling_type == LLAMA_POOLING_TYPE_RANK
)) {
if (cparams.embeddings && cparams.pooling_type == LLAMA_POOLING_TYPE_RANK) {
GGML_ASSERT(cls);
GGML_ASSERT(ggml_backend_buffer_is_host(cls->buffer));

Expand All @@ -211,15 +208,18 @@ void llm_graph_input_cls::set_input(const llama_ubatch * ubatch) {
}
}

if (cparams.embeddings && cparams.pooling_type == LLAMA_POOLING_TYPE_LAST) {
if (cparams.embeddings && (
cparams.pooling_type == LLAMA_POOLING_TYPE_CLS ||
cparams.pooling_type == LLAMA_POOLING_TYPE_LAST
)) {
GGML_ASSERT(cls);
GGML_ASSERT(ggml_backend_buffer_is_host(cls->buffer));

uint32_t * data = (uint32_t *) cls->data;
memset(cls->data, 0, n_seqs_unq*ggml_element_size(cls));

std::vector<int> last_pos(n_seqs_unq, -1);
std::vector<int> last_row(n_seqs_unq, -1);
std::vector<int> target_pos(n_seqs_unq, -1);
std::vector<int> target_row(n_seqs_unq, -1);

for (int i = 0; i < n_tokens; ++i) {
const llama_pos pos = ubatch->pos[i];
Expand All @@ -228,16 +228,20 @@ void llm_graph_input_cls::set_input(const llama_ubatch * ubatch) {
const llama_seq_id seq_id = ubatch->seq_id[i][s];
const int32_t seq_idx = ubatch->seq_idx[seq_id];

if (pos >= last_pos[seq_idx]) {
last_pos[seq_idx] = pos;
last_row[seq_idx] = i;
if (
(target_pos[seq_idx] == -1) ||
(cparams.pooling_type == LLAMA_POOLING_TYPE_CLS && pos < target_pos[seq_idx]) ||
(cparams.pooling_type == LLAMA_POOLING_TYPE_LAST && pos >= target_pos[seq_idx])
) {
target_pos[seq_idx] = pos;
target_row[seq_idx] = i;
}
}
}

for (int s = 0; s < n_seqs_unq; ++s) {
if (last_row[s] >= 0) {
data[s] = last_row[s];
if (target_row[s] >= 0) {
data[s] = target_row[s];
}
}
}
Expand Down
Loading