Skip to content

Commit 86e1fc5

Browse files
committed
Use LLAMA_SPLIT_MODE constants defined in params.rs
Cleaned up the LlamaSplitMode enum and related conversions by removing redundant clippy allow attributes. Also simplified some type conversions for clarity.
1 parent 6c1a58e commit 86e1fc5

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

llama-cpp-2/src/model/params.rs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ const LLAMA_SPLIT_MODE_ROW: i8 = llama_cpp_sys_2::LLAMA_SPLIT_MODE_ROW as i8;
2222
/// A rusty wrapper around `llama_split_mode`.
2323
#[repr(i8)]
2424
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
25-
#[allow(clippy::cast_possible_truncation)]
2625
pub enum LlamaSplitMode {
2726
/// Single GPU
2827
None = LLAMA_SPLIT_MODE_NONE,
@@ -40,7 +39,6 @@ pub struct LlamaSplitModeParseError(pub i32);
4039
///
4140
/// # Errors
4241
/// Returns `LlamaSplitModeParseError` if the value does not correspond to a valid `LlamaSplitMode`.
43-
#[allow(clippy::unnecessary_cast)]
4442
impl TryFrom<i32> for LlamaSplitMode {
4543
type Error = LlamaSplitModeParseError;
4644

@@ -61,8 +59,6 @@ impl TryFrom<i32> for LlamaSplitMode {
6159
///
6260
/// # Errors
6361
/// Returns `LlamaSplitModeParseError` if the value does not correspond to a valid `LlamaSplitMode`.
64-
#[allow(clippy::cast_possible_wrap)]
65-
#[allow(clippy::unnecessary_cast)]
6662
impl TryFrom<u32> for LlamaSplitMode {
6763
type Error = LlamaSplitModeParseError;
6864

@@ -82,25 +78,23 @@ impl TryFrom<u32> for LlamaSplitMode {
8278
}
8379

8480
/// Create a `i32` from a `LlamaSplitMode`.
85-
#[allow(clippy::cast_possible_wrap)]
8681
impl From<LlamaSplitMode> for i32 {
8782
fn from(value: LlamaSplitMode) -> Self {
8883
match value {
89-
LlamaSplitMode::None => llama_cpp_sys_2::LLAMA_SPLIT_MODE_NONE as _,
90-
LlamaSplitMode::Layer => llama_cpp_sys_2::LLAMA_SPLIT_MODE_LAYER as _,
91-
LlamaSplitMode::Row => llama_cpp_sys_2::LLAMA_SPLIT_MODE_ROW as _,
84+
LlamaSplitMode::None => LLAMA_SPLIT_MODE_NONE.into(),
85+
LlamaSplitMode::Layer => LLAMA_SPLIT_MODE_LAYER.into(),
86+
LlamaSplitMode::Row => LLAMA_SPLIT_MODE_ROW.into(),
9287
}
9388
}
9489
}
9590

9691
/// Create a `u32` from a `LlamaSplitMode`.
97-
#[allow(clippy::cast_possible_wrap)]
9892
impl From<LlamaSplitMode> for u32 {
9993
fn from(value: LlamaSplitMode) -> Self {
10094
match value {
101-
LlamaSplitMode::None => llama_cpp_sys_2::LLAMA_SPLIT_MODE_NONE as _,
102-
LlamaSplitMode::Layer => llama_cpp_sys_2::LLAMA_SPLIT_MODE_LAYER as _,
103-
LlamaSplitMode::Row => llama_cpp_sys_2::LLAMA_SPLIT_MODE_ROW as _,
95+
LlamaSplitMode::None => LLAMA_SPLIT_MODE_NONE as u32,
96+
LlamaSplitMode::Layer => LLAMA_SPLIT_MODE_LAYER as u32,
97+
LlamaSplitMode::Row => LLAMA_SPLIT_MODE_ROW as u32,
10498
}
10599
}
106100
}

0 commit comments

Comments
 (0)