From f63014e5b48486ad2b04937d202a3b7c08ed2c17 Mon Sep 17 00:00:00 2001 From: Orson Peters Date: Tue, 17 Oct 2023 15:01:07 +0200 Subject: [PATCH] fix: patch broken aHash AES intrinsics on ARM (#11801) --- Cargo.toml | 1 + py-polars/Cargo.lock | 3 +-- py-polars/Cargo.toml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d99bf9e0bf25..06145d401f60 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -106,5 +106,6 @@ features = [ ] [patch.crates-io] +ahash = { git = "https://github.com/orlp/aHash", branch = "fix-arm-intrinsics" } # packed_simd_2 = { git = "https://github.com/rust-lang/packed_simd", rev = "e57c7ba11386147e6d2cbad7c88f376aab4bdc86" } # simd-json = { git = "https://github.com/ritchie46/simd-json", branch = "alignment" } diff --git a/py-polars/Cargo.lock b/py-polars/Cargo.lock index 3a3827adae7e..b492b67de12e 100644 --- a/py-polars/Cargo.lock +++ b/py-polars/Cargo.lock @@ -26,8 +26,7 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "ahash" version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +source = "git+https://github.com/orlp/aHash?branch=fix-arm-intrinsics#80685f88d3c120ef39fb3fde1c7786b044af5e8b" dependencies = [ "cfg-if", "getrandom", diff --git a/py-polars/Cargo.toml b/py-polars/Cargo.toml index a30ae13483ea..445646088c1d 100644 --- a/py-polars/Cargo.toml +++ b/py-polars/Cargo.toml @@ -235,6 +235,9 @@ lto = "thin" codegen-units = 1 lto = "fat" +[patch.crates-io] +ahash = { git = "https://github.com/orlp/aHash", branch = "fix-arm-intrinsics" } + # This is ignored here; would be set in .cargo/config.toml. # Should not be used when packaging # target-cpu = "native"