diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bert_dump.c | 3 | ||||
| -rw-r--r-- | tests/contextual_batch.c | 77 | ||||
| -rw-r--r-- | tests/late_check.c | 52 |
3 files changed, 77 insertions, 55 deletions
diff --git a/tests/bert_dump.c b/tests/bert_dump.c index 48bbab1..8f820ee 100644 --- a/tests/bert_dump.c +++ b/tests/bert_dump.c @@ -48,6 +48,9 @@ int main(int argc, char **argv) { float *emb = (float *)malloc((size_t)dim * sizeof(float)); if (ffwd_model_encode_into(model, ws, full, n + 2, emb) != 0) { fprintf(stderr, "embed failed\n"); + free(ids); + free(full); + free(emb); return 1; } printf("%d", dim); diff --git a/tests/contextual_batch.c b/tests/contextual_batch.c index e656e94..9700e82 100644 --- a/tests/contextual_batch.c +++ b/tests/contextual_batch.c @@ -76,36 +76,43 @@ static int test_ffwd_spans_batch(test_model_t *m, static int init_doc(test_doc_t *doc, tok_bpe_t *tok, const char **chunks, int n_chunks, int separator_id) { + /* doc->ids/doc->spans escape to the caller (freed by free_doc, including on + * failure); only the ids/lengths scratch is local, so the cleanup frees just + * those on every exit. */ + int rc = -1; int **ids = calloc((size_t)n_chunks, sizeof(*ids)); int *lengths = calloc((size_t)n_chunks, sizeof(*lengths)); doc->spans = calloc((size_t)n_chunks, sizeof(*doc->spans)); if (!ids || !lengths || !doc->spans) - return -1; + goto done; doc->n_spans = n_chunks; doc->n_tokens = n_chunks > 1 ? n_chunks - 1 : 0; for (int i = 0; i < n_chunks; i++) { ids[i] = tok_bpe_encode(tok, chunks[i], &lengths[i]); if (!ids[i] || lengths[i] <= 0) - return -1; + goto done; doc->n_tokens += lengths[i]; } doc->ids = malloc((size_t)doc->n_tokens * sizeof(*doc->ids)); if (!doc->ids) - return -1; + goto done; int pos = 0; for (int i = 0; i < n_chunks; i++) { doc->spans[i].start = pos; doc->spans[i].n_tokens = lengths[i]; memcpy(doc->ids + pos, ids[i], (size_t)lengths[i] * sizeof(*doc->ids)); pos += lengths[i]; - if (i + 1 < n_chunks) { + if (i + 1 < n_chunks) doc->ids[pos++] = separator_id; - } - free(ids[i]); } + rc = 0; +done: + if (ids) + for (int i = 0; i < n_chunks; i++) + free(ids[i]); free(lengths); free(ids); - return 0; + return rc; } static void free_doc(test_doc_t *doc) { @@ -200,19 +207,23 @@ int main(int argc, char **argv) { int batch = synthetic_docs > 0 ? synthetic_docs : 3; int total_spans = 0; + int rc = 1; + float *expected = NULL, *actual = NULL; test_doc_t *docs = calloc((size_t)batch, sizeof(*docs)); ffwd_context_input_t *inputs = calloc((size_t)batch, sizeof(*inputs)); if (!docs || !inputs) - return 1; + goto cleanup; if (synthetic_docs > 0) { - if (synthetic_chunks <= 0) - return 2; + if (synthetic_chunks <= 0) { + rc = 2; + goto cleanup; + } for (int i = 0; i < batch; i++) { int doc_chunks = synthetic_ragged ? synthetic_chunks * (i + 1) : synthetic_chunks; char **texts = calloc((size_t)doc_chunks, sizeof(*texts)); if (!texts) - return 1; + goto cleanup; int ok = 1; for (int c = 0; c < doc_chunks; c++) { texts[c] = make_synthetic_chunk(i, c, synthetic_repeats); @@ -224,7 +235,7 @@ int main(int argc, char **argv) { for (int c = 0; c < doc_chunks; c++) free(texts[c]); free(texts); - return 1; + goto cleanup; } for (int c = 0; c < doc_chunks; c++) free(texts[c]); @@ -243,7 +254,7 @@ int main(int argc, char **argv) { for (int i = 0; i < batch; i++) { if (init_doc(&docs[i], tok, chunks[i], chunk_counts[i], separator_id) != 0) { fprintf(stderr, "failed to prepare document %d\n", i); - return 1; + goto cleanup; } total_spans += docs[i].n_spans; } @@ -257,22 +268,22 @@ int main(int argc, char **argv) { } int hidden = test_config(model)->hidden_size; - float *expected = calloc((size_t)total_spans * hidden, sizeof(*expected)); - float *actual = calloc((size_t)total_spans * hidden, sizeof(*actual)); + expected = calloc((size_t)total_spans * hidden, sizeof(*expected)); + actual = calloc((size_t)total_spans * hidden, sizeof(*actual)); if (!expected || !actual) - return 1; + goto cleanup; int span_offset = 0; for (int i = 0; i < batch; i++) { if (test_ffwd_spans(model, ws, &docs[i], expected + (size_t)span_offset * hidden) != 0) { fprintf(stderr, "singleton contextual embedding failed at %d\n", i); - return 1; + goto cleanup; } span_offset += docs[i].n_spans; } if (test_ffwd_spans_batch(model, ws, inputs, batch, actual) != 0) { fprintf(stderr, "batched contextual embedding failed\n"); - return 1; + goto cleanup; } float worst_diff = 0.0f; @@ -291,12 +302,13 @@ int main(int argc, char **argv) { if (runs > 0) { double *times = calloc((size_t)runs, sizeof(*times)); if (!times) - return 1; + goto cleanup; for (int i = 0; i < runs; i++) { double start = now_ms(); if (test_ffwd_spans_batch(model, ws, inputs, batch, actual) != 0) { fprintf(stderr, "timed contextual batch failed at %d\n", i); - return 1; + free(times); + goto cleanup; } times[i] = now_ms() - start; } @@ -306,22 +318,25 @@ int main(int argc, char **argv) { free(times); } + if (worst_diff > max_allowed_diff || worst_cosine < min_allowed_cosine) { + fprintf(stderr, "contextual batch parity failed: max_abs_diff=%g cosine=%g\n", worst_diff, + worst_cosine); + } else { + rc = 0; + printf("ok: contextual batch parity docs=%d spans=%d max_abs_diff=%g cosine=%g\n", batch, + total_spans, worst_diff, worst_cosine); + } + +cleanup: free(actual); free(expected); - for (int i = 0; i < batch; i++) - free_doc(&docs[i]); + if (docs) + for (int i = 0; i < batch; i++) + free_doc(&docs[i]); free(inputs); free(docs); tok_bpe_free(tok); test_workspace_free(ws); test_model_free(model); - - if (worst_diff > max_allowed_diff || worst_cosine < min_allowed_cosine) { - fprintf(stderr, "contextual batch parity failed: max_abs_diff=%g cosine=%g\n", worst_diff, - worst_cosine); - return 1; - } - printf("ok: contextual batch parity docs=%d spans=%d max_abs_diff=%g cosine=%g\n", batch, - total_spans, worst_diff, worst_cosine); - return 0; + return rc; } diff --git a/tests/late_check.c b/tests/late_check.c index fd6f6e1..e0335e8 100644 --- a/tests/late_check.c +++ b/tests/late_check.c @@ -255,17 +255,22 @@ int main(int argc, char **argv) { late_item_t q = {0}; late_item_t d[NDOCS] = {{0}}; + float *packed_docs = NULL; + int best = -1; + int rc = 1; +#ifdef CHECK_MLX + ffwd_mlx_late_vectors_t *packed_dev = NULL; +#endif if (encode_with_prefix_id(tok, QUERY_PREFIX_ID, query, 1, &q) != 0 || encode_late_item(model, ws, &q, dim, NULL, 0) != 0) - return 1; + goto cleanup; for (int i = 0; i < NDOCS; i++) { if (encode_with_prefix_id(tok, DOC_PREFIX_ID, docs[i], 0, &d[i]) != 0 || encode_late_item(model, ws, &d[i], dim, skip, n_skip) != 0) - return 1; + goto cleanup; } - int best = -1; float best_score = -FLT_MAX; float scores[NDOCS]; float scalar_scores[NDOCS]; @@ -277,9 +282,9 @@ int main(int argc, char **argv) { offsets[i + 1] = total_doc_tokens; } - float *packed_docs = (float *)malloc((size_t)total_doc_tokens * dim * sizeof(float)); + packed_docs = (float *)malloc((size_t)total_doc_tokens * dim * sizeof(float)); if (!packed_docs) - return 1; + goto cleanup; int packed_pos = 0; for (int i = 0; i < NDOCS; i++) { memcpy(packed_docs + (size_t)packed_pos * dim, d[i].vecs, @@ -292,14 +297,14 @@ int main(int argc, char **argv) { } if (ffwd_late_maxsim_batch(q.vecs, q.n_vecs, packed_docs, offsets, NDOCS, dim, scores) != 0) { fprintf(stderr, "late batch MaxSim failed\n"); - return 1; + goto cleanup; } for (int i = 0; i < NDOCS; i++) { float score = scores[i]; if (fabsf(score - scalar_scores[i]) > 1e-5f) { fprintf(stderr, "late batch MaxSim mismatch at doc%d: %.9g %.9g\n", i, score, scalar_scores[i]); - return 1; + goto cleanup; } if (!json_mode) { printf("% .6f doc%d q_tokens=%d d_tokens=%d %s\n", score, i, q.n_vecs, d[i].n_vecs, @@ -315,17 +320,16 @@ int main(int argc, char **argv) { const ffwd_mlx_late_vectors_t *dev_docs[NDOCS]; for (int i = 0; i < NDOCS; i++) dev_docs[i] = d[i].dev; - ffwd_mlx_late_vectors_t *packed_dev = ffwd_mlx_late_vectors_concat(model, dev_docs, NDOCS); + packed_dev = ffwd_mlx_late_vectors_concat(model, dev_docs, NDOCS); if (!packed_dev) { fprintf(stderr, "late MLX device doc concat failed\n"); - return 1; + goto cleanup; } float device_scores[NDOCS]; if (ffwd_mlx_late_maxsim_batch_device(model, q.dev, packed_dev, offsets, NDOCS, device_scores) != 0) { fprintf(stderr, "late MLX device MaxSim failed\n"); - ffwd_mlx_late_vectors_free(packed_dev); - return 1; + goto cleanup; } float worst_device_diff = 0.0f; for (int i = 0; i < NDOCS; i++) { @@ -335,8 +339,7 @@ int main(int argc, char **argv) { if (diff > 2e-4f) { fprintf(stderr, "late MLX device MaxSim mismatch at doc%d: %.9g %.9g\n", i, device_scores[i], scores[i]); - ffwd_mlx_late_vectors_free(packed_dev); - return 1; + goto cleanup; } } if (!json_mode) @@ -349,7 +352,7 @@ int main(int argc, char **argv) { if (ffwd_late_maxsim_batch(q.vecs, q.n_vecs, packed_docs, offsets, NDOCS, dim, scores) != 0) { fprintf(stderr, "timed late MaxSim failed at run %d\n", i); - return 1; + goto cleanup; } } double elapsed = now_ms() - start; @@ -368,8 +371,7 @@ int main(int argc, char **argv) { if (ffwd_mlx_late_maxsim_batch_device(model, q.dev, packed_dev, offsets, NDOCS, device_scores) != 0) { fprintf(stderr, "timed late MLX device MaxSim failed at run %d\n", i); - ffwd_mlx_late_vectors_free(packed_dev); - return 1; + goto cleanup; } } elapsed = now_ms() - start; @@ -403,6 +405,15 @@ int main(int argc, char **argv) { printf("]}\n"); } + if (best == 0) { + rc = 0; + if (!json_mode) + printf("ok: late token_dim=%d best=doc%d\n", dim, best); + } else { + fprintf(stderr, "late ranking failed: expected doc0, got doc%d\n", best); + } + +cleanup: #ifdef CHECK_MLX ffwd_mlx_late_vectors_free(packed_dev); #endif @@ -413,12 +424,5 @@ int main(int argc, char **argv) { test_workspace_free(ws); test_model_free(model); tok_bpe_free(tok); - - if (best != 0) { - fprintf(stderr, "late ranking failed: expected doc0, got doc%d\n", best); - return 1; - } - if (!json_mode) - printf("ok: late token_dim=%d best=doc%d\n", dim, best); - return 0; + return rc; } |
