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

Integrate re_tensor_ops crate into re_space_view_tensor #4450

Merged
merged 3 commits into from
Dec 7, 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
12 changes: 1 addition & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ re_space_view_text_log = { path = "crates/re_space_view_text_log", version = "=0
re_space_view_text_document = { path = "crates/re_space_view_text_document", version = "=0.12.0-alpha.1", default-features = false }
re_space_view_time_series = { path = "crates/re_space_view_time_series", version = "=0.12.0-alpha.1", default-features = false }
re_string_interner = { path = "crates/re_string_interner", version = "=0.12.0-alpha.1", default-features = false }
re_tensor_ops = { path = "crates/re_tensor_ops", version = "=0.12.0-alpha.1", default-features = false }
re_time_panel = { path = "crates/re_time_panel", version = "=0.12.0-alpha.1", default-features = false }
re_tracing = { path = "crates/re_tracing", version = "=0.12.0-alpha.1", default-features = false }
re_tuid = { path = "crates/re_tuid", version = "=0.12.0-alpha.1", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion crates/re_log_types/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "re_log_types"
authors.workspace = true
description = "The different types that make up the rerun log format."
description = "The basic building blocks of the Rerun data types and tables."
edition.workspace = true
homepage.workspace = true
include.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/re_space_view_tensor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ re_data_ui.workspace = true
re_log_types.workspace = true
re_log.workspace = true
re_renderer.workspace = true
re_tensor_ops.workspace = true
re_tracing.workspace = true
re_types.workspace = true
re_ui.workspace = true
re_viewer_context.workspace = true

anyhow.workspace = true
ahash.workspace = true
anyhow.workspace = true
bytemuck.workspace = true
egui.workspace = true
half.workspace = true
ndarray.workspace = true
serde.workspace = true
thiserror.workspace = true
wgpu.workspace = true
1 change: 1 addition & 0 deletions crates/re_space_view_tensor/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
//!
//! A Space View dedicated to visualizing tensors with arbitrary dimensionality.
mod dimension_mapping;
mod space_view_class;
mod tensor_dimension_mapper;
mod tensor_slice_to_gpu;
Expand Down
2 changes: 1 addition & 1 deletion crates/re_space_view_tensor/src/space_view_class.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ use egui::{epaint::TextShape, Align2, NumExt as _, Vec2};
use ndarray::Axis;
use re_data_store::EntityProperties;

use crate::dimension_mapping::{DimensionMapping, DimensionSelector};
use re_data_ui::tensor_summary_ui_grid_contents;
use re_log_types::{EntityPath, RowId};
use re_renderer::Colormap;
use re_tensor_ops::dimension_mapping::{DimensionMapping, DimensionSelector};
use re_types::{
datatypes::{TensorData, TensorDimension},
tensor_data::{DecodedTensor, TensorDataMeaning},
Expand Down
2 changes: 1 addition & 1 deletion crates/re_space_view_tensor/src/tensor_dimension_mapper.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use re_tensor_ops::dimension_mapping::{DimensionMapping, DimensionSelector};
use crate::dimension_mapping::{DimensionMapping, DimensionSelector};
use re_types::datatypes::TensorDimension;

#[derive(Clone, Copy, PartialEq, Eq)]
Expand Down
24 changes: 0 additions & 24 deletions crates/re_tensor_ops/Cargo.toml

This file was deleted.

10 changes: 0 additions & 10 deletions crates/re_tensor_ops/README.md

This file was deleted.

6 changes: 0 additions & 6 deletions crates/re_tensor_ops/src/lib.rs

This file was deleted.

Loading