Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 26 additions & 2 deletions vllm-cpp/src/abi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ impl Compatibility {
unsafe { ffi::vllm_sampling_params_default() }
}

pub(crate) fn transcription_params_default(&self) -> ffi::vllm_transcription_params {
// SAFETY: the engine retained this token after exact ABI equality was
// established, so this versioned struct may be returned by value.
unsafe { ffi::vllm_transcription_params_default() }
}

fn from_actual(actual: i32) -> Result<Self, Error> {
let expected = ffi::VLLM_ABI_VERSION as i32;
if actual != expected {
Expand Down Expand Up @@ -54,6 +60,14 @@ impl Compatibility {
) -> ffi::vllm_sampling_params {
default()
}

#[cfg(test)]
fn transcription_params_default_with(
&self,
default: impl FnOnce() -> ffi::vllm_transcription_params,
) -> ffi::vllm_transcription_params {
default()
}
}

#[cfg(test)]
Expand Down Expand Up @@ -82,7 +96,7 @@ mod tests {
}

#[test]
fn compatibility_precedes_both_by_value_defaults() {
fn compatibility_precedes_all_by_value_defaults() {
let calls = RefCell::new(Vec::new());
let compatibility = Compatibility::check_with(|| {
calls.borrow_mut().push("abi");
Expand All @@ -100,10 +114,20 @@ mod tests {
// SAFETY: every field in this generated C struct permits zero.
unsafe { std::mem::zeroed() }
});
compatibility.transcription_params_default_with(|| {
calls.borrow_mut().push("transcription_default");
// SAFETY: every field in this generated C struct permits zero.
unsafe { std::mem::zeroed() }
});

assert_eq!(
*calls.borrow(),
["abi", "model_default", "sampling_default"]
[
"abi",
"model_default",
"sampling_default",
"transcription_default"
]
);
}
}
Loading
Loading