Cleanup benchmark

- Bump the version number on the development branch to a fresh version
number. rust-analyzer has difficulty to figure out what package we are
using, make the development branch use a fresh version number to prevent
this from happening. Also it make more sense, as we are currently
working on a version that is definitely not same as the published
version.

- Move all the bitmap rasterizer related benchmark to plotters-bitmap

Author: 38

plotters-backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "plotters-backend"
-version = "0.3.1"
+version = "0.3.2"
 authors = ["Hao Hou <[email protected]>"]
 edition = "2018"
 license = "MIT"

plotters-bitmap/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "plotters-bitmap"
-version = "0.3.1"
+version = "0.3.2"
 authors = ["Hao Hou <[email protected]>"]
 edition = "2018"
 license = "MIT"
@@ -30,5 +30,14 @@ gif_backend = ["gif", "image_encoder"]
 
 [dev-dependencies.plotters]
 default_features = false
-features = ["ttf"]
+features = ["ttf", "line_series", "bitmap_backend"]
 path = "../plotters"
+
+[dev-dependencies]
+criterion = "0.3.4"
+rayon = "1.5.1"
+
+[[bench]]
+name = "benchmark"
+harness = false
+path = "benches/main.rs"

plotters-bitmap/benches/benches/mod.rs

@@ -0,0 +1,2 @@
+pub mod parallel;
+pub mod rasterizer;

plotters/benches/benches/parallel.rs plotters-bitmap/benches/benches/parallel.rs

@@ -2,6 +2,7 @@ use criterion::{criterion_group, BenchmarkId, Criterion};
 
 use plotters::coord::Shift;
 use plotters::prelude::*;
+use plotters_bitmap::BitMapBackend;
 use rayon::prelude::*;
 
 const SIZES: &'static [u32] = &[100, 400, 800, 1000, 2000];

plotters/benches/benches/rasterizer.rs plotters-bitmap/benches/benches/rasterizer.rs

@@ -1,7 +1,7 @@
 use criterion::{criterion_group, Criterion};
 use plotters::prelude::*;
 use plotters_backend::BackendStyle;
-use plotters_bitmap::bitmap_pixel::BGRXPixel;
+use plotters_bitmap::{bitmap_pixel::BGRXPixel, BitMapBackend};
 
 const W: u32 = 1000;
 const H: u32 = 1000;

plotters-bitmap/benches/main.rs

@@ -0,0 +1,8 @@
+use criterion::criterion_main;
+
+mod benches;
+
+criterion_main! {
+    benches::parallel::parallel_group,
+    benches::rasterizer::rasterizer_group,
+}

plotters-bitmap/src/bitmap/test.rs

@@ -224,8 +224,8 @@ fn test_bitmap_blend_large() {
 #[cfg(test)]
 #[test]
 fn test_bitmap_bgrx_pixel_format() {
-    use crate::bitmap_pixel::BGRXPixel;
-    use plotters::prelude::*;
+    use crate::{bitmap_pixel::BGRXPixel, BitMapBackend};
+    use plotters::prelude::{BLACK, RED, WHITE, GREEN, YELLOW, BLUE, RGBColor, Color};
     let mut rgb_buffer = vec![0; 1000 * 1000 * 3];
     let mut bgrx_buffer = vec![0; 1000 * 1000 * 4];
 

plotters-svg/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "plotters-svg"
-version = "0.3.1"
+version = "0.3.2"
 authors = ["Hao Hou <[email protected]>"]
 edition = "2018"
 license = "MIT"

plotters-svg/src/svg.rs

@@ -578,8 +578,8 @@ impl Drop for SVGBackend<'_> {
 mod test {
     use super::*;
     use plotters::element::Circle;
-    use plotters::prelude::*;
     use plotters::style::text_anchor::{HPos, Pos, VPos};
+    use plotters::prelude::{ChartBuilder, IntoDrawingArea, TextStyle, IntoFont, BLACK, Color, RED, BLUE, SeriesLabelPosition, WHITE};
     use std::fs;
     use std::path::Path;
 
@@ -603,8 +603,8 @@ mod test {
             let root = SVGBackend::with_string(&mut content, (500, 500)).into_drawing_area();
 
             let mut chart = ChartBuilder::on(&root)
-                .caption("This is a test", ("sans-serif", 20))
-                .set_all_label_area_size(40)
+                .caption("This is a test", ("sans-serif", 20u32))
+                .set_all_label_area_size(40u32)
                 .build_cartesian_2d(0..10, 0..10)
                 .unwrap();
 
@@ -674,9 +674,9 @@ mod test {
                 .unwrap();
 
             let mut chart = ChartBuilder::on(&root)
-                .caption("All anchor point positions", ("sans-serif", 20))
-                .set_all_label_area_size(40)
-                .build_cartesian_2d(0..100, 0..50)
+                .caption("All anchor point positions", ("sans-serif", 20u32))
+                .set_all_label_area_size(40u32)
+                .build_cartesian_2d(0..100i32, 0..50i32)
                 .unwrap();
 
             chart
@@ -763,9 +763,9 @@ mod test {
             let root = SVGBackend::with_string(&mut content, (width, height)).into_drawing_area();
 
             let mut chart = ChartBuilder::on(&root)
-                .caption("All series label positions", ("sans-serif", 20))
-                .set_all_label_area_size(40)
-                .build_cartesian_2d(0..50, 0..50)
+                .caption("All series label positions", ("sans-serif", 20u32))
+                .set_all_label_area_size(40u32)
+                .build_cartesian_2d(0..50i32, 0..50i32)
                 .unwrap();
 
             chart
@@ -776,16 +776,16 @@ mod test {
                 .unwrap();
 
             chart
-                .draw_series(std::iter::once(Circle::new((5, 15), 5, &RED)))
+                .draw_series(std::iter::once(Circle::new((5, 15), 5u32, &RED)))
                 .expect("Drawing error")
                 .label("Series 1")
-                .legend(|(x, y)| Circle::new((x, y), 3, RED.filled()));
+                .legend(|(x, y)| Circle::new((x, y), 3u32, RED.filled()));
 
             chart
-                .draw_series(std::iter::once(Circle::new((5, 15), 10, &BLUE)))
+                .draw_series(std::iter::once(Circle::new((5, 15), 10u32, &BLUE)))
                 .expect("Drawing error")
                 .label("Series 2")
-                .legend(|(x, y)| Circle::new((x, y), 3, BLUE.filled()));
+                .legend(|(x, y)| Circle::new((x, y), 3u32, BLUE.filled()));
 
             for pos in vec![
                 SeriesLabelPosition::UpperLeft,

plotters/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "plotters"
-version = "0.3.1"
+version = "0.3.2"
 authors = ["Hao Hou <[email protected]>"]
 edition = "2021"
 license = "MIT"

plotters/benches/benches/mod.rs

@@ -1,3 +1 @@
 pub mod data;
-pub mod parallel;
-pub mod rasterizer;

plotters/benches/main.rs

@@ -3,7 +3,5 @@ use criterion::criterion_main;
 mod benches;
 
 criterion_main! {
-    benches::parallel::parallel_group,
-    benches::rasterizer::rasterizer_group,
     benches::data::quartiles_group
 }