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

Mimalloc 0.1.43+ #7713

Merged
merged 2 commits into from
Oct 19, 2024
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
8 changes: 4 additions & 4 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3292,9 +3292,9 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"

[[package]]
name = "libmimalloc-sys"
version = "0.1.35"
version = "0.1.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664"
checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44"
dependencies = [
"cc",
"libc",
Expand Down Expand Up @@ -3481,9 +3481,9 @@ dependencies = [

[[package]]
name = "mimalloc"
version = "0.1.37"
version = "0.1.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98"
checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633"
dependencies = [
"libmimalloc-sys",
]
Expand Down
7 changes: 2 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,8 @@ log = "0.4"
log-once = "0.4"
lz4_flex = "0.11"
memory-stats = "1.1"
# TODO(#5875): `mimalloc` starts leaking OS pages starting with `0.1.38`.
# This version is not pinned to avoid creating version requirement conflicts,
# but other packages pin it to exactly "=0.1.37"
mimalloc = "0.1.37"
mime_guess2 = "2.0" # infer MIME type by file extension, and map mime to file extension
mimalloc = "0.1.43"
mime_guess2 = "2.0" # infer MIME type by file extension, and map mime to file extension
mint = "0.5.9"
re_mp4 = "0.1.0"
natord = "1.0.9"
Expand Down
4 changes: 1 addition & 3 deletions crates/top/rerun-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ rerun = { workspace = true, features = [
] }

document-features.workspace = true
# TODO(#5875): `mimalloc` starts leaking OS pages starting with `0.1.38`.
# When the bug is fixed, change this back to `mimalloc.workspace = true`.
mimalloc = "=0.1.37"
mimalloc = "0.1.43"


[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion examples/rust/custom_space_view/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ re_sdk_comms = { path = "../../../crates/store/re_sdk_comms", features = [
] }

# mimalloc is a much faster allocator:
mimalloc = "0.1"
mimalloc = "0.1.43"
2 changes: 1 addition & 1 deletion examples/rust/extend_viewer_ui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ re_sdk_comms = { path = "../../../crates/store/re_sdk_comms", features = [
] }

# mimalloc is a much faster allocator:
mimalloc = "0.1"
mimalloc = "0.1.43"
4 changes: 1 addition & 3 deletions rerun_py/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@ crossbeam.workspace = true
document-features.workspace = true
itertools.workspace = true
infer.workspace = true
# TODO(#5875): `mimalloc` starts leaking OS pages starting with `0.1.38`.
# When the bug is fixed, change this back to `mimalloc = { workspace = true, …`.
mimalloc = { version = "=0.1.37", features = ["local_dynamic_tls"] }
mimalloc = { version = "0.1.43", features = ["local_dynamic_tls"] }
numpy.workspace = true
once_cell.workspace = true
parking_lot.workspace = true
Expand Down
Loading