Skip to content

Commit

Permalink
Merge pull request #2 from universalmind303/polars-dep-updates
Browse files Browse the repository at this point in the history
update polars dependency
  • Loading branch information
universalmind303 authored Aug 12, 2022
2 parents 63105e4 + 0bc5c9f commit 04e1a1a
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 23 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ bin/
.vscode
*.node
docs/
run.js
run.js
.yarn/install-state.gz
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ahash = "0.7"
bincode = "1.3"
napi = { version = "2.2.0", default-features = false, features = ["napi8", "serde-json", "experimental"] }
napi-derive = { version = "2.2.0", default-features = false }
polars-core = { git = "https://github.com/pola-rs/polars.git", rev = "95074d91cfa0248a86722fbae572952425ae43cb", default-features = false }
polars-core = { git = "https://github.com/pola-rs/polars.git", rev = "9b3560471b7dae1ef295172bd1c78635d3c773a9", default-features = false }
thiserror = "1.0.20"

serde_json = { version = "1" }
Expand Down Expand Up @@ -88,7 +88,7 @@ features = [
"arg_where",
]
git = "https://github.com/pola-rs/polars.git"
rev = "95074d91cfa0248a86722fbae572952425ae43cb"
rev = "9b3560471b7dae1ef295172bd1c78635d3c773a9"

[build-dependencies]
napi-build = "1.2.1"
Expand Down
4 changes: 2 additions & 2 deletions __tests__/expr.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ describe("expr", () => {
const df = pl.DataFrame({ a: [1, 2, 3, 3] });
const expected = pl.DataFrame({
"skew:bias=true": ["-0.49338220021815865"],
"skew:bias=false": ["-0.8545630383279711"],
"skew:bias=false": ["-0.8545630383279712"],
});
const actual = df.select(
col("a")
Expand Down Expand Up @@ -1574,7 +1574,7 @@ describe("expr.dt", () => {
hour: pl.Series("", [1], pl.UInt32),
day: pl.Series("", [8], pl.UInt32),
ordinalDay: pl.Series("", [8], pl.UInt32),
weekday: pl.Series("", [7], pl.UInt32),
weekday: pl.Series("", [6], pl.UInt32),
week: pl.Series("", [1], pl.UInt32),
month: pl.Series("", [1], pl.UInt32),
year: pl.Series("", [1984], pl.Int32),
Expand Down
12 changes: 6 additions & 6 deletions src/dataframe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -971,12 +971,14 @@ impl JsDataFrame {
self.df.mean().into()
}
#[napi]
pub fn std(&self) -> JsDataFrame {
self.df.std().into()
pub fn std(&self, ddof: Option<u8>) -> JsDataFrame {
let ddof = ddof.unwrap_or(1);
self.df.std(ddof).into()
}
#[napi]
pub fn var(&self) -> JsDataFrame {
self.df.var().into()
pub fn var(&self, ddof: Option<u8>) -> JsDataFrame {
let ddof = ddof.unwrap_or(1);
self.df.var(ddof).into()
}
#[napi]
pub fn median(&self) -> JsDataFrame {
Expand Down Expand Up @@ -1493,8 +1495,6 @@ fn finish_groupby(gb: GroupBy, agg: &str) -> napi::Result<JsDataFrame> {
"median" => gb.median(),
"agg_list" => gb.agg_list(),
"groups" => gb.groups(),
"std" => gb.std(),
"var" => gb.var(),
a => Err(PolarsError::ComputeError(
format!("agg fn {} does not exists", a).into(),
)),
Expand Down
13 changes: 9 additions & 4 deletions src/lazy/dataframe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -427,15 +427,17 @@ impl JsLazyFrame {
}

#[napi]
pub fn std(&self) -> JsLazyFrame {
pub fn std(&self, ddof: Option<u8>) -> JsLazyFrame {
let ddof = ddof.unwrap_or(1);
let ldf = self.ldf.clone();
ldf.std().into()
ldf.std(ddof).into()
}

#[napi]
pub fn var(&self) -> JsLazyFrame {
pub fn var(&self, ddof: Option<u8>) -> JsLazyFrame {
let ddof = ddof.unwrap_or(1);
let ldf = self.ldf.clone();
ldf.var().into()
ldf.var(ddof).into()
}

#[napi]
Expand Down Expand Up @@ -650,19 +652,22 @@ pub struct ScanIPCOptions {
pub cache: Option<bool>,
pub rechunk: Option<bool>,
pub row_count: Option<JsRowCount>,
pub memmap: Option<bool>,
}

#[napi]
pub fn scan_ipc(path: String, options: ScanIPCOptions) -> napi::Result<JsLazyFrame> {
let n_rows = options.n_rows.map(|i| i as usize);
let cache = options.cache.unwrap_or(true);
let rechunk = options.rechunk.unwrap_or(false);
let memmap = options.memmap.unwrap_or(true);
let row_count: Option<RowCount> = options.row_count.map(|rc| rc.into());
let args = ScanArgsIpc {
n_rows,
cache,
rechunk,
row_count,
memmap
};
let lf = LazyFrame::scan_ipc(path, args).map_err(JsPolarsErr::from)?;
Ok(lf.into())
Expand Down
20 changes: 12 additions & 8 deletions src/lazy/dsl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -391,13 +391,15 @@ impl JsExpr {
}

#[napi]
pub fn std(&self) -> JsExpr {
self.clone().inner.std().into()
pub fn std(&self, ddof: Option<u8>) -> JsExpr {
let ddof = ddof.unwrap_or(1);
self.clone().inner.std(ddof).into()
}

#[napi]
pub fn var(&self) -> JsExpr {
self.clone().inner.var().into()
pub fn var(&self, ddof: Option<u8>) -> JsExpr {
let ddof = ddof.unwrap_or(1);
self.clone().inner.var(ddof).into()
}
#[napi]
pub fn is_unique(&self) -> JsExpr {
Expand Down Expand Up @@ -1406,13 +1408,15 @@ pub fn arange(low: Wrap<Expr>, high: Wrap<Expr>, step: Option<i64>) -> JsExpr {
}

#[napi]
pub fn pearson_corr(a: Wrap<Expr>, b: Wrap<Expr>) -> JsExpr {
polars::lazy::dsl::pearson_corr(a.0, b.0).into()
pub fn pearson_corr(a: Wrap<Expr>, b: Wrap<Expr>, ddof: Option<u8>) -> JsExpr {
let ddof = ddof.unwrap_or(1);
polars::lazy::dsl::pearson_corr(a.0, b.0, ddof).into()
}

#[napi]
pub fn spearman_rank_corr(a: Wrap<Expr>, b: Wrap<Expr>) -> JsExpr {
polars::lazy::dsl::spearman_rank_corr(a.0, b.0).into()
pub fn spearman_rank_corr(a: Wrap<Expr>, b: Wrap<Expr>, ddof: Option<u8>) -> JsExpr {
let ddof = ddof.unwrap_or(1);
polars::lazy::dsl::spearman_rank_corr(a.0, b.0, ddof).into()
}

#[napi]
Expand Down

0 comments on commit 04e1a1a

Please sign in to comment.