diff options
Diffstat (limited to 'misc/py-polars/files')
-rw-r--r-- | misc/py-polars/files/patch-Cargo.toml | 28 | ||||
-rw-r--r-- | misc/py-polars/files/patch-dotdot-Cargo.lock | 29 | ||||
-rw-r--r-- | misc/py-polars/files/patch-src_allocator.rs | 52 |
3 files changed, 10 insertions, 99 deletions
diff --git a/misc/py-polars/files/patch-Cargo.toml b/misc/py-polars/files/patch-Cargo.toml index d17af8031b02..81fc256f2e4b 100644 --- a/misc/py-polars/files/patch-Cargo.toml +++ b/misc/py-polars/files/patch-Cargo.toml @@ -1,30 +1,21 @@ ---- Cargo.toml.orig 2024-10-01 17:57:04 UTC +--- Cargo.toml.orig 2025-04-30 19:44:53 UTC +++ Cargo.toml -@@ -8,22 +8,13 @@ crate-type = ["cdylib"] - crate-type = ["cdylib"] +@@ -17,14 +17,6 @@ mimalloc = { version = "0.1", default-features = false + [target.'cfg(all(any(not(target_family = "unix"), target_os = "emscripten", allocator = "mimalloc"), not(allocator = "default")))'.dependencies] + mimalloc = { version = "0.1", default-features = false } - [dependencies] -+mimalloc = { version = "0.1", default-features = false } - libc = { workspace = true } - # Explicit dependency is needed to add bigidx in CI during release - polars = { workspace = true } - polars-python = { workspace = true, features = ["pymethods", "iejoin"] } - pyo3 = { workspace = true, features = ["abi3-py39", "chrono", "extension-module", "multiple-pymethods"] } - --[target.'cfg(all(any(not(target_family = "unix"), allocator = "mimalloc"), not(allocator = "default")))'.dependencies] --mimalloc = { version = "0.1", default-features = false } -- -# Feature background_threads is unsupported on MacOS (https://github.com/jemalloc/jemalloc/issues/843). --[target.'cfg(all(target_family = "unix", not(target_os = "macos"), not(allocator = "mimalloc"), not(allocator = "default")))'.dependencies] --jemallocator = { version = "0.5", features = ["disable_initial_exec_tls", "background_threads"] } +-[target.'cfg(all(target_family = "unix", not(target_os = "macos"), not(target_os = "emscripten"), not(allocator = "mimalloc"), not(allocator = "default")))'.dependencies] +-tikv-jemallocator = { version = "0.6.0", features = ["disable_initial_exec_tls", "background_threads"] } - -[target.'cfg(all(target_family = "unix", target_os = "macos", not(allocator = "mimalloc"), not(allocator = "default")))'.dependencies] --jemallocator = { version = "0.5", features = ["disable_initial_exec_tls"] } +-tikv-jemallocator = { version = "0.6.0", features = ["disable_initial_exec_tls"] } +-either = { workspace = true } - [features] # Features used in this crate ffi_plugin = ["polars-python/ffi_plugin"] -@@ -107,3 +98,7 @@ default = ["all", "nightly"] +@@ -111,3 +103,8 @@ default = ["all", "nightly"] ] default = ["all", "nightly"] @@ -32,3 +23,4 @@ +[profile.release] +opt-level = 2 +debug = false ++strip = "symbols" diff --git a/misc/py-polars/files/patch-dotdot-Cargo.lock b/misc/py-polars/files/patch-dotdot-Cargo.lock deleted file mode 100644 index 56ba282f0cc2..000000000000 --- a/misc/py-polars/files/patch-dotdot-Cargo.lock +++ /dev/null @@ -1,29 +0,0 @@ ---- ../Cargo.lock.orig 2024-06-17 23:06:05 UTC -+++ ../Cargo.lock -@@ -1909,26 +1909,6 @@ checksum = "9028f49264629065d057f340a86acb84867925865f - checksum = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8" - - [[package]] --name = "jemalloc-sys" --version = "0.5.4+5.3.0-patched" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ac6c1946e1cea1788cbfde01c993b52a10e2da07f4bac608228d1bed20bfebf2" --dependencies = [ -- "cc", -- "libc", --] -- --[[package]] --name = "jemallocator" --version = "0.5.4" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a0de374a9f8e63150e6f5e8a60cc14c668226d7a347d8aee1a45766e3c4dd3bc" --dependencies = [ -- "jemalloc-sys", -- "libc", --] -- --[[package]] - name = "jobserver" - version = "0.1.31" - source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/misc/py-polars/files/patch-src_allocator.rs b/misc/py-polars/files/patch-src_allocator.rs deleted file mode 100644 index 5bb9726ef847..000000000000 --- a/misc/py-polars/files/patch-src_allocator.rs +++ /dev/null @@ -1,52 +0,0 @@ -- workaround for https://github.com/pola-rs/polars/issues/17034 - ---- src/allocator.rs.orig 2024-08-04 11:07:42 UTC -+++ src/allocator.rs -@@ -1,14 +1,3 @@ --#[cfg(all( -- target_family = "unix", -- not(allocator = "default"), -- not(allocator = "mimalloc"), --))] --use jemallocator::Jemalloc; --#[cfg(all( -- not(debug_assertions), -- not(allocator = "default"), -- any(not(target_family = "unix"), allocator = "mimalloc"), --))] - use mimalloc::MiMalloc; - - #[cfg(all( -@@ -22,32 +11,10 @@ use crate::memory::TracemallocAllocator; - #[global_allocator] - #[cfg(all( - not(debug_assertions), -- not(allocator = "mimalloc"), - not(allocator = "default"), -- target_family = "unix", --))] --static ALLOC: Jemalloc = Jemalloc; -- --#[global_allocator] --#[cfg(all( -- not(debug_assertions), -- not(allocator = "default"), - any(not(target_family = "unix"), allocator = "mimalloc"), - ))] - static ALLOC: MiMalloc = MiMalloc; -- --// On Windows tracemalloc does work. However, we build abi3 wheels, and the --// relevant C APIs are not part of the limited stable CPython API. As a result, --// linking breaks on Windows if we use tracemalloc C APIs. So we only use this --// on Unix for now. --#[global_allocator] --#[cfg(all( -- debug_assertions, -- target_family = "unix", -- not(allocator = "default"), -- not(allocator = "mimalloc"), --))] --static ALLOC: TracemallocAllocator<Jemalloc> = TracemallocAllocator::new(Jemalloc); - - use std::alloc::Layout; - use std::ffi::{c_char, c_void}; |