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.

Sign up for GitHub

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

Update ndarray to 0.16 and ndarray-rand to 0.15 #7358

Merged
merged 9 commits into from
Sep 20, 2024
Merged

Update ndarray to 0.16 and ndarray-rand to 0.15 #7358

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4859ddf
Replace into_raw_vec() with into_raw_vec_and_offset().0
benliepert Sep 4, 2024
90b32eb
Replace into_shape() with into_shape_with_order()
benliepert Sep 5, 2024
339b4c5
Merge branch 'main' into benliepert/update_ndarray
benliepert Sep 6, 2024
7b125e8
First pass at updating TensorData macros
benliepert Sep 6, 2024
773c6d2
Add tests for std/nonstd layouts and zero/nonzero offsets
benliepert Sep 12, 2024
d4a2680
Merge branch 'main' into benliepert/update_ndarray
benliepert Sep 12, 2024
74a14eb
Add asserts for std/non-std layout, fix comments
benliepert Sep 16, 2024
65276b0
Merge branch 'main' into benliepert/update_ndarray
benliepert Sep 19, 2024
a20c35b
Merge branch 'main' into benliepert/update_ndarray
benliepert Sep 19, 2024
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
23 changes: 17 additions & 6 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3509,22 +3509,24 @@ checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c"

[[package]]
name = "ndarray"
version = "0.15.6"
version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32"
checksum = "882ed72dce9365842bf196bdeedf5055305f11fc8c03dee7bb0194a6cad34841"
dependencies = [
"matrixmultiply",
"num-complex",
"num-integer",
"num-traits",
"portable-atomic",
"portable-atomic-util",
"rawpointer",
]

[[package]]
name = "ndarray-rand"
version = "0.14.0"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65608f937acc725f5b164dcf40f4f0bc5d67dc268ab8a649d3002606718c4588"
checksum = "f093b3db6fd194718dcdeea6bd8c829417deae904e3fcc7732dabcd4416d25d8"
dependencies = [
"ndarray",
"rand",
Expand Down Expand Up @@ -4328,9 +4330,18 @@ checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2"

[[package]]
name = "portable-atomic"
version = "1.5.1"
version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"

[[package]]
name = "portable-atomic-util"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b"
checksum = "fcdd8420072e66d54a407b3316991fe946ce3ab1083a7f575b2463866624704d"
dependencies = [
"portable-atomic",
]

[[package]]
name = "powerfmt"
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ mime_guess2 = "2.0" # infer MIME type by file extension, and map mime to file ex
mint = "0.5.9"
mp4 = "0.14.0"
natord = "1.0.9"
ndarray = "0.15"
ndarray-rand = "0.14"
ndarray = "0.16"
ndarray-rand = "0.15"
never = "0.1"
nohash-hasher = "0.2"
notify = "6.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/store/re_types/src/archetypes/image.rs
View file
Open in desktop

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

6 changes: 4 additions & 2 deletions crates/store/re_types/src/datatypes/tensor_data_ext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,9 @@ macro_rules! tensor_from_ndarray {
.is_standard_layout()
.then(|| TensorData {
shape,
buffer: TensorBuffer::$variant(value.to_owned().into_raw_vec().into()),
buffer: TensorBuffer::$variant(
value.to_owned().into_raw_vec_and_offset().0.into(),
),
})
.ok_or(TensorCastError::NotContiguousStdOrder)
}
Expand Down Expand Up @@ -314,7 +316,7 @@ impl<D: ::ndarray::Dimension> TryFrom<::ndarray::Array<half::f16, D>> for Tensor
Ok(Self {
shape,
buffer: TensorBuffer::F16(
bytemuck::cast_slice(value.into_raw_vec().as_slice())
bytemuck::cast_slice(value.into_raw_vec_and_offset().0.as_slice())
.to_vec()
.into(),
),
Expand Down
2 changes: 1 addition & 1 deletion crates/viewer/re_space_view_tensor/src/space_view_class.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ pub fn selected_tensor_slice<'a, T: Copy>(
// This is important for above width/height conversion to work since this assumes at least 2 dimensions.
tensor
.view()
.into_shape(ndarray::IxDyn(&[tensor.len(), 1]))
.into_shape_with_order(ndarray::IxDyn(&[tensor.len(), 1]))
.unwrap()
} else {
tensor.view()
Expand Down
2 changes: 1 addition & 1 deletion docs/snippets/all/archetypes/image_send_columns.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {

// Split up the image data into several components referencing the underlying data.
let image_size_in_bytes = width * height * 3;
let blob = rerun::datatypes::Blob::from(images.into_raw_vec());
let blob = rerun::datatypes::Blob::from(images.into_raw_vec_and_offset().0);
let image_column = times
.iter()
.map(|&t| {
Expand Down
Loading