From c5a44ec66ff45c3c215075dbafca5a2b25aa53df Mon Sep 17 00:00:00 2001 From: Vinzent Steinberg <Vinzent.Steinberg@gmail.com> Date: Mon, 12 Apr 2021 02:41:13 -0300 Subject: [PATCH 1/5] Update criterion --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 45fdb17a..4a2a2eec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -85,7 +85,7 @@ proptest = { version = "1", optional = true, default-features = false, features serde_json = "1.0" rand_xorshift = "0.3" rand_isaac = "0.3" -criterion = "0.2.10" +criterion = "0.3" # For matrix comparison macro matrixcompare = "0.2.0" From 209b4763019cbb05fb9fbf781436372dacc5d000 Mon Sep 17 00:00:00 2001 From: Vinzent Steinberg <Vinzent.Steinberg@gmail.com> Date: Mon, 12 Apr 2021 02:41:31 -0300 Subject: [PATCH 2/5] Mark rand as required for benchmark --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 4a2a2eec..2c95a154 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -103,6 +103,7 @@ required-features = ["compare"] name = "nalgebra_bench" harness = false path = "benches/lib.rs" +required-features = ["rand"] [profile.bench] lto = true From 4bc62bcddbc1112e681d2528ec6b09fda3897964 Mon Sep 17 00:00:00 2001 From: Vinzent Steinberg <Vinzent.Steinberg@gmail.com> Date: Mon, 12 Apr 2021 02:57:10 -0300 Subject: [PATCH 3/5] Fix benchmarks --- benches/core/matrix.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benches/core/matrix.rs b/benches/core/matrix.rs index df4a5a5b..3c483c35 100644 --- a/benches/core/matrix.rs +++ b/benches/core/matrix.rs @@ -188,7 +188,7 @@ fn tr_mul_to(bench: &mut criterion::Criterion) { let b = DVector::<f64>::new_random(1000); let mut c = DVector::from_element(1000, 0.0); - bench.bench_function("", move |bh| bh.iter(|| a.tr_mul_to(&b, &mut c))); + bench.bench_function("tr_mul_to", move |bh| bh.iter(|| a.tr_mul_to(&b, &mut c))); } fn mat_mul_mat(bench: &mut criterion::Criterion) { From 35b96344ba0db5f8ef720b72a19f37c6ec74bc50 Mon Sep 17 00:00:00 2001 From: Vinzent Steinberg <Vinzent.Steinberg@gmail.com> Date: Mon, 12 Apr 2021 03:45:46 -0300 Subject: [PATCH 4/5] Fix criterion warning --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 2c95a154..2aae001f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -85,7 +85,7 @@ proptest = { version = "1", optional = true, default-features = false, features serde_json = "1.0" rand_xorshift = "0.3" rand_isaac = "0.3" -criterion = "0.3" +criterion = { version = "0.3", features = ["html_reports"] } # For matrix comparison macro matrixcompare = "0.2.0" From 4387a7f391b3277bafa41fe5c58b0236bdae578f Mon Sep 17 00:00:00 2001 From: Vinzent Steinberg <Vinzent.Steinberg@gmail.com> Date: Thu, 29 Apr 2021 20:57:27 -0300 Subject: [PATCH 5/5] Use correct feature and remove unused import --- benches/lib.rs | 2 +- benches/linalg/eigen.rs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/benches/lib.rs b/benches/lib.rs index a77cc743..1f75ff7e 100644 --- a/benches/lib.rs +++ b/benches/lib.rs @@ -1,4 +1,4 @@ -#![feature(test)] +#![feature(bench_black_box)] #![allow(unused_macros)] extern crate nalgebra as na; diff --git a/benches/linalg/eigen.rs b/benches/linalg/eigen.rs index 0b1e6b26..ec775d86 100644 --- a/benches/linalg/eigen.rs +++ b/benches/linalg/eigen.rs @@ -1,4 +1,3 @@ -use test::Bencher; use na::{DMatrix, Eigen}; fn eigen_100x100(bh: &mut criterion::Criterion) {