Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 97 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ members = [
"./benches/json_benchmark_c7d3d9b",
"./benches/nom_4_0_0",
"./benches/quickcheck_0_6_1",
"./benches/rawloader_c793a13",
"./benches/rayon_1_0_0",
"./benches/raytrace_8de9020",
"./benches/regex_0_2_6",
Expand Down
15 changes: 15 additions & 0 deletions benches/rawloader_c793a13/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[package]
name = "rawloader_c793a13"
version = "0.1.0"
license = "LGPL-2.1"

[dependencies]
lolbench_support = { path = "../../support" }

[dependencies.rawloader]
version = "*"
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you leave a comment here explaining what you said in your PR description about a mismatch?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.

This dependency is precisely pinned to rawloader, based on the git commit I tested. That is fine.

However, what about the library's dependencies? They are:

[dependencies]
toml = "0.5"
enumn = "0.1"
lazy_static = "1"
byteorder = "1"
rayon = "1"
itertools = "0.9"
serde = "1"
serde_derive = "1"

To my surprise, when I added this and did a fetch, it only added new things to Cargo.lock, but I am not sure if this situation will continue.

I know there is an open issue for this, #64. But I was wondering if I should do something to make the pinning tighter and avoid worsening things? Like overriding itertools to =0.9.1 for example? Or is that not necessary?

git = "https://github.com/pedrocr/rawloader.git"
rev = "c793a132fa03e336f8c5c078f01d3ed1a3ee8c07"

[dev-dependencies]
lolbench = { path = "../../" }
9 changes: 9 additions & 0 deletions benches/rawloader_c793a13/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
IMPORTANT LICENSING NOTE
========================

This benchmark has two key licensing concerns:

1. The library and benchmark code themselves are distributed under the LGPL 2.1.
2. The input data used is distributed under the Creative Commons CC-BY License 2.5.

The full text of these licenses is in the `vendor/` directory.
4 changes: 4 additions & 0 deletions benches/rawloader_c793a13/src/bin/benchmark.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
extern crate rawloader_c793a13 ; extern crate lolbench_support ; use
lolbench_support :: { criterion_from_env , init_logging } ; fn main ( ) {
init_logging ( ) ; let mut crit = criterion_from_env ( ) ; rawloader_c793a13
:: benchmark ( & mut crit ) ; }
18 changes: 18 additions & 0 deletions benches/rawloader_c793a13/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
static EXPECTED_FILE: &str = "vendor/RAW_LEICA_VLUX1.RAW";

#[macro_use]
extern crate lolbench_support;

wrap_libtest! {
fn benchmark(b: &mut Bencher) {
let mut f = std::fs::File::open(EXPECTED_FILE)
.expect("Failed to open critical test file");
let buffer = rawloader::Buffer::new(&mut f)
.expect("Failed to initialize buffer");
let rawloader = rawloader::RawLoader::new();
b.iter(|| {
let decoder = rawloader.get_decoder(&buffer).unwrap();
decoder.image(false).unwrap()
})
}
}
2 changes: 2 additions & 0 deletions benches/rawloader_c793a13/tests/benchmark.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
extern crate lolbench ; # [ test ] fn end_to_end ( ) {
lolbench :: end_to_end_test ( "rawloader_c793a13" , "benchmark" , ) ; }
Loading