style: fmt and fix for clippy

Signed-off-by: YdrMaster <[email protected]>
InfiniTensor · Dec 30, 2024 · 2580e6b · 2580e6b
1 parent 9175622
commit 2580e6b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/causal-lm/src/query_context.rs b/causal-lm/src/query_context.rs
@@ -10,7 +10,7 @@ pub struct QueryContext<'a, Storage> {
     pub range: Range<upos>,
 }
 
-impl<'a, Storage> QueryContext<'a, Storage> {
+impl<Storage> QueryContext<'_, Storage> {
     /// 查询的位置。
     #[inline]
     pub const fn pos(&self) -> upos {
@@ -33,7 +33,7 @@ type KVCache<'a, T> = (
     Tensor<LocalSplitable<&'a mut [T]>>,
 );
 
-impl<'a, Storage, T> QueryContext<'a, Storage>
+impl<Storage, T> QueryContext<'_, Storage>
 where
     Storage: DerefMut<Target = [T]>,
 {

diff --git a/models/llama/common-cpu/src/lib.rs b/models/llama/common-cpu/src/lib.rs
@@ -85,9 +85,12 @@ impl ComputeStream for Transformer {
 
 struct LlamaLayer<'a>(&'a LayerStorage<Weight>);
 
-impl<'a> llama::LLamaLayer for LlamaLayer<'a> {
+impl llama::LLamaLayer for LlamaLayer<'_> {
     type Byte = u8;
-    type Storage<'m> = Weight where Self: 'm;
+    type Storage<'m>
+        = Weight
+    where
+        Self: 'm;
 
     #[inline]
     fn att_layernorm(&self) -> Tensor<Self::Storage<'_>> {

diff --git a/models/llama/nvidia-gpu/src/lib.rs b/models/llama/nvidia-gpu/src/lib.rs
@@ -515,9 +515,12 @@ macro_rules! access {
             .map_physical(|u| &**u.sprout_ref($self.transfer.ctx()))
     };
 }
-impl<'a> llama::LLamaLayer for LayerLoader<'a> {
+impl llama::LLamaLayer for LayerLoader<'_> {
     type Byte = DevByte;
-    type Storage<'m> = &'m[DevByte] where Self: 'm;
+    type Storage<'m>
+        = &'m [DevByte]
+    where
+        Self: 'm;
 
     fn att_layernorm(&self) -> Tensor<Self::Storage<'_>> {
         access!(self, att_layernorm)

diff --git a/tensor/src/slice.rs b/tensor/src/slice.rs
@@ -74,7 +74,7 @@ impl SliceDim {
                         step: self.step,
                         len: {
                             let step = self.step as udim;
-                            ((len - self.start + step - 1) / step).min(self.len)
+                            (len - self.start).div_ceil(step).min(self.len)
                         },
                     }
                 }
@@ -93,7 +93,7 @@ impl SliceDim {
                         step: self.step,
                         len: {
                             let step = self.step.unsigned_abs();
-                            ((start + 1 + step - 1) / step).min(self.len)
+                            (start + 1).div_ceil(step).min(self.len)
                         },
                     }
                 }