[Bugfix][Rust Frontend] Handle zero-column logprobs payloads without panicking (#49113)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Signed-off-by: Feathbow <feathbow@gmail.com>
This commit is contained in:
co-authored by
mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
parent
d9aa35161d
commit
f25953cc59
@@ -269,6 +269,19 @@ impl WireLogprobs {
|
||||
);
|
||||
}
|
||||
|
||||
// Empty position lists may be encoded as either [0, 0] or [0, k + 1].
|
||||
if token_ids.rows == 0 {
|
||||
return Ok(Logprobs {
|
||||
positions: Vec::new(),
|
||||
});
|
||||
}
|
||||
if token_ids.cols == 0 {
|
||||
bail_ext_value_decode!(
|
||||
"{field_prefix}: zero-column logprobs payload with {} rows",
|
||||
token_ids.rows
|
||||
);
|
||||
}
|
||||
|
||||
let mut positions = Vec::with_capacity(token_ids.rows);
|
||||
for ((token_ids_row, logprobs_row), sampled_rank) in token_ids
|
||||
.data
|
||||
|
||||
@@ -303,3 +303,49 @@ fn rejects_non_none_cu_num_generated_tokens() {
|
||||
"messagepack ext value decode failed: new_logprobs.cu_num_generated_tokens: expected None for per-request engine-core logprobs payload, got [0, 1]"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn decodes_zero_row_logprobs_as_empty() {
|
||||
for shape in [[0usize, 0], [0, 3]] {
|
||||
let frames = vec![Bytes::from(encode_value(&output_wire_with_custom_fields(
|
||||
None,
|
||||
Some(Value::Array(vec![
|
||||
ndarray_value("<i8", &shape, Value::Ext(3, Vec::new())),
|
||||
ndarray_value("<f4", &shape, Value::Ext(3, Vec::new())),
|
||||
ndarray_value("<i8", &[0], Value::Ext(3, Vec::new())),
|
||||
Value::Nil,
|
||||
])),
|
||||
)))];
|
||||
let decoded = decode_engine_core_outputs(&frames).unwrap().into_request_batch().unwrap();
|
||||
let logprobs = decoded.outputs[0]
|
||||
.new_prompt_logprobs_tensors
|
||||
.clone()
|
||||
.unwrap()
|
||||
.into_direct()
|
||||
.unwrap();
|
||||
assert!(logprobs.is_empty());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rejects_zero_column_logprobs_with_rows() {
|
||||
let ranks = Value::Ext(3, vec![1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0]);
|
||||
let frames = vec![Bytes::from(encode_value(&output_wire_with_custom_fields(
|
||||
Some(Value::Array(vec![
|
||||
ndarray_value("<i8", &[2, 0], Value::Ext(3, Vec::new())),
|
||||
ndarray_value("<f4", &[2, 0], Value::Ext(3, Vec::new())),
|
||||
ndarray_value("<i8", &[2], ranks),
|
||||
Value::Nil,
|
||||
])),
|
||||
None,
|
||||
)))];
|
||||
|
||||
let error = decode_engine_core_outputs(&frames).unwrap_err();
|
||||
let crate::error::Error::ExtValueDecode { message } = &error else {
|
||||
panic!("expected ExtValueDecode");
|
||||
};
|
||||
assert_eq!(
|
||||
message,
|
||||
"new_logprobs: zero-column logprobs payload with 2 rows"
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user