Merge pull request #40 from MarcoGorelli/fmt-allocator

use allocator, run rustfmt

.github/workflows/pytest.yml

@@ -42,7 +42,9 @@ jobs:
       - name: Set up Rust
         run: rustup show
       - uses: mozilla-actions/[email protected]
-      - run: make .venv
+      - run: curl -LsSf https://astral.sh/uv/install.sh | sh
+      - run: uv venv --seed
+      - run: . .venv/bin/activate && uv pip install -r requirements.txt -r requirements-dev.txt
       - run: make pre-commit
       - run: make install
       - run: make test

Cargo.toml

@@ -25,5 +25,3 @@ reverse_geocoder = "4.1.1"
 [patch.crates-io]
 pyo3-polars = { git = 'https://github.com/MarcoGorelli/pyo3-polars.git', rev='a0327ec121986711aec32dc1e52234838bf3b25b' }
 
-[target.'cfg(target_os = "linux")'.dependencies]
-jemallocator = { version = "0.5", features = ["disable_initial_exec_tls"] }

Makefile

@@ -1,21 +1,16 @@
 
 SHELL=/bin/bash
 
-.venv:  ## Set up virtual environment
-	python3 -m venv .venv
-	.venv/bin/pip install -r requirements.txt
-	.venv/bin/pip install -r requirements-dev.txt
-
-install: .venv
+install:
 	unset CONDA_PREFIX && \
 	source .venv/bin/activate && maturin develop -m Cargo.toml
 
-install-release: .venv
+install-release:
 	unset CONDA_PREFIX && \
 	source .venv/bin/activate && maturin develop --release -m Cargo.toml
 
-pre-commit: .venv
-	cargo fmt --all --manifest-path Cargo.toml && cargo clippy --all-features --manifest-path Cargo.toml
+pre-commit:
+	cargo +nightly fmt --all --manifest-path Cargo.toml && cargo clippy --all-features --manifest-path Cargo.toml
 	.venv/bin/python -m ruff format minimal_plugin test_plugin.py
 	.venv/bin/python -m ruff check minimal_plugin test_plugin.py
 
@@ -25,5 +20,5 @@ run: install
 run-release: install-release
 	source .venv/bin/activate && python run.py
 
-test: .venv
+test:
 	source .venv/bin/activate && pytest test_plugin.py

src/expressions.rs

@@ -1,4 +1,6 @@
 #![allow(clippy::unused_unit)]
+use std::ops::{Add, Div, Mul, Sub};
+
 use polars::export::num::{NumCast, Zero};
 use polars::prelude::arity::{
     binary_elementwise_into_string_amortized, broadcast_binary_elementwise,
@@ -12,7 +14,6 @@ use pyo3_polars::export::polars_core::export::num::Signed;
 use pyo3_polars::export::polars_core::utils::arrow::array::PrimitiveArray;
 use pyo3_polars::export::polars_core::utils::CustomIterTools;
 use serde::Deserialize;
-use std::ops::{Add, Div, Mul, Sub};
 
 fn same_output_type(input_fields: &[Field]) -> PolarsResult<Field> {
     let field = &input_fields[0];
@@ -54,7 +55,7 @@ fn abs_numeric(inputs: &[Series]) -> PolarsResult<Series> {
         dtype => {
             polars_bail!(InvalidOperation:format!("dtype {dtype} not \
             supported for abs_numeric, expected Int32, Int64, Float32, Float64."))
-        }
+        },
     }
 }
 
@@ -84,7 +85,7 @@ fn cum_sum(inputs: &[Series]) -> PolarsResult<Series> {
             Some(x) => {
                 *state += x;
                 Some(Some(*state))
-            }
+            },
             None => Some(None),
         })
         .collect_trusted();
@@ -224,7 +225,7 @@ fn shifted_struct(input_fields: &[Field]) -> PolarsResult<Field> {
                 .collect::<Vec<_>>();
             fields.push(field_0);
             Ok(Field::new(&name, DataType::Struct(fields)))
-        }
+        },
         _ => unreachable!(),
     }
 }

src/lib.rs

@@ -1,8 +1,5 @@
 mod expressions;
-
-#[cfg(target_os = "linux")]
-use jemallocator::Jemalloc;
+use pyo3_polars::PolarsAllocator;
 
 #[global_allocator]
-#[cfg(target_os = "linux")]
-static ALLOC: Jemalloc = Jemalloc;
+static ALLOC: PolarsAllocator = PolarsAllocator::new();