huggingface/candle
1
0
Fork 0
mirror of https://github.com/huggingface/candle.git synced 2025-06-17 11:08:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small tweak: remove the macro usage for the range indexing trait. (#1376)

Browse Source
This commit is contained in:
Laurent Mazare
2023-11-26 16:30:59 +00:00
committed by GitHub
parent bfa7c8fc01
commit 14a2bdc062
1 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
candle-core/src/indexer.rs
View File

@ -104,37 +104,31 @@ impl From<&Tensor> for TensorIndexer {
} }
} }
macro_rules! impl_from_range { trait RB: RangeBounds<usize> {}
($range_type:ty) => { impl RB for Range<usize> {}
impl From<$range_type> for TensorIndexer { impl RB for RangeFrom<usize> {}
fn from(range: $range_type) -> Self { impl RB for RangeFull {}
use std::ops::Bound::*; impl RB for RangeInclusive<usize> {}
impl RB for RangeTo<usize> {}
impl RB for RangeToInclusive<usize> {}
impl<T: RB> From<T> for TensorIndexer {
fn from(range: T) -> Self {
use std::ops::Bound::*;
let start = match range.start_bound() { let start = match range.start_bound() {
Included(idx) => Included(*idx), Included(idx) => Included(*idx),
Excluded(idx) => Excluded(*idx), Excluded(idx) => Excluded(*idx),
Unbounded => Unbounded, Unbounded => Unbounded,
}; };
let end = match range.end_bound() { let end = match range.end_bound() {
Included(idx) => Included(*idx), Included(idx) => Included(*idx),
Excluded(idx) => Excluded(*idx), Excluded(idx) => Excluded(*idx),
Unbounded => Unbounded, Unbounded => Unbounded,
}; };
TensorIndexer::Narrow(start, end) TensorIndexer::Narrow(start, end)
} }
}
};
} }
impl_from_range!(Range<usize>);
impl_from_range!(RangeFrom<usize>);
impl_from_range!(RangeFull);
impl_from_range!(RangeInclusive<usize>);
impl_from_range!(RangeTo<usize>);
impl_from_range!(RangeToInclusive<usize>);
/// Trait used to implement multiple signatures for ease of use of the slicing /// Trait used to implement multiple signatures for ease of use of the slicing
/// of a tensor /// of a tensor
pub trait IndexOp<T> { pub trait IndexOp<T> {