Skip to content

Commit

Permalink
Integrate re_tensor_ops crate into re_space_view_tensor (#4450)
Browse files Browse the repository at this point in the history
### What

That crate was rather pointless as noticed while going through crates.

### Checklist
* [x] I have read and agree to [Contributor
Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and
the [Code of
Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md)
* [x] I've included a screenshot or gif (if applicable)
* [x] I have tested the web demo (if applicable):
  * Full build: [app.rerun.io](https://app.rerun.io/pr/4450/index.html)
* Partial build:
[app.rerun.io](https://app.rerun.io/pr/4450/index.html?manifest_url=https://app.rerun.io/version/nightly/examples_manifest.json)
- Useful for quick testing when changes do not affect examples in any
way
* [x] The PR title and labels are set such as to maximize their
usefulness for the next release's CHANGELOG

- [PR Build Summary](https://build.rerun.io/pr/4450)
- [Docs
preview](https://rerun.io/preview/f7bb5366aa518c70178c782c928b0841a0dae433/docs)
<!--DOCS-PREVIEW-->
- [Examples
preview](https://rerun.io/preview/f7bb5366aa518c70178c782c928b0841a0dae433/examples)
<!--EXAMPLES-PREVIEW-->
- [Recent benchmark results](https://build.rerun.io/graphs/crates.html)
- [Wasm size tracking](https://build.rerun.io/graphs/sizes.html)
  • Loading branch information
Wumpf authored Dec 7, 2023
1 parent 1a9cc03 commit 93f8522
Show file tree
Hide file tree
Showing 12 changed files with 7 additions and 57 deletions.
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
File renamed without changes.
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.

0 comments on commit 93f8522

Please sign in to comment.