Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply color maps to all types of depth tensors #1686

Merged
merged 5 commits into from
Mar 23, 2023
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ impl BinaryBuffer {
pub fn as_slice(&self) -> &[u8] {
self.0.as_slice()
}

#[inline]
pub fn iter(&self) -> impl Iterator<Item = &u8> {
self.0.iter()
}
}

impl Index<usize> for BinaryBuffer {
Expand Down
62 changes: 38 additions & 24 deletions crates/re_log_types/src/component_types/tensor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,42 @@ pub enum TensorData {
JPEG(BinaryBuffer),
}

impl TensorData {
pub fn dtype(&self) -> TensorDataType {
match self {
Self::U8(_) | Self::JPEG(_) => TensorDataType::U8,
Self::U16(_) => TensorDataType::U16,
Self::U32(_) => TensorDataType::U32,
Self::U64(_) => TensorDataType::U64,
Self::I8(_) => TensorDataType::I8,
Self::I16(_) => TensorDataType::I16,
Self::I32(_) => TensorDataType::I32,
Self::I64(_) => TensorDataType::I64,
Self::F32(_) => TensorDataType::F32,
Self::F64(_) => TensorDataType::F64,
}
}

pub fn size_in_bytes(&self) -> usize {
match self {
Self::U8(buf) | Self::JPEG(buf) => buf.0.len(),
Self::U16(buf) => buf.len(),
Self::U32(buf) => buf.len(),
Self::U64(buf) => buf.len(),
Self::I8(buf) => buf.len(),
Self::I16(buf) => buf.len(),
Self::I32(buf) => buf.len(),
Self::I64(buf) => buf.len(),
Self::F32(buf) => buf.len(),
Self::F64(buf) => buf.len(),
}
}

pub fn is_empty(&self) -> bool {
self.size_in_bytes() == 0
}
}

/// Flattened `Tensor` data payload
///
/// ## Examples
Expand Down Expand Up @@ -394,33 +430,11 @@ impl TensorTrait for Tensor {
}

fn dtype(&self) -> TensorDataType {
match &self.data {
TensorData::U8(_) | TensorData::JPEG(_) => TensorDataType::U8,
TensorData::U16(_) => TensorDataType::U16,
TensorData::U32(_) => TensorDataType::U32,
TensorData::U64(_) => TensorDataType::U64,
TensorData::I8(_) => TensorDataType::I8,
TensorData::I16(_) => TensorDataType::I16,
TensorData::I32(_) => TensorDataType::I32,
TensorData::I64(_) => TensorDataType::I64,
TensorData::F32(_) => TensorDataType::F32,
TensorData::F64(_) => TensorDataType::F64,
}
self.data.dtype()
}

fn size_in_bytes(&self) -> usize {
match &self.data {
TensorData::U8(buf) | TensorData::JPEG(buf) => buf.0.len(),
TensorData::U16(buf) => buf.len(),
TensorData::U32(buf) => buf.len(),
TensorData::U64(buf) => buf.len(),
TensorData::I8(buf) => buf.len(),
TensorData::I16(buf) => buf.len(),
TensorData::I32(buf) => buf.len(),
TensorData::I64(buf) => buf.len(),
TensorData::F32(buf) => buf.len(),
TensorData::F64(buf) => buf.len(),
}
self.data.size_in_bytes()
}
}

Expand Down
32 changes: 32 additions & 0 deletions crates/re_log_types/src/data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,38 @@ impl TensorDataType {
Self::F64 => std::mem::size_of::<f64>() as _,
}
}

pub fn is_float(&self) -> bool {
match self {
Self::U8
| Self::U16
| Self::U32
| Self::U64
| Self::I8
| Self::I16
| Self::I32
| Self::I64 => false,
Self::F16 | Self::F32 | Self::F64 => true,
}
}

pub fn max_value(&self) -> f64 {
match self {
Self::U8 => u8::MAX as _,
Self::U16 => u16::MAX as _,
Self::U32 => u32::MAX as _,
Self::U64 => u64::MAX as _,

Self::I8 => i8::MAX as _,
Self::I16 => i16::MAX as _,
Self::I32 => i32::MAX as _,
Self::I64 => i64::MAX as _,

Self::F16 => f16::MAX.into(),
Self::F32 => f32::MAX as _,
Self::F64 => f64::MAX,
}
}
}

impl std::fmt::Display for TensorDataType {
Expand Down
1 change: 1 addition & 0 deletions crates/re_viewer/src/misc/caches/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ impl Caches {
}

pub struct TensorStats {
/// This will currently only be `None` for jpeg-encoded tensors.
pub range: Option<(f64, f64)>,
}

Expand Down
Loading