Skip to content
Merged
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
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ version = "0.2.9"
authors = ["Takeru Ohta <[email protected]>"]
edition = "2018"
description = "A black-box optimization benchmarking framework"
homepage = "https://github.com/sile/kurobako"
repository = "https://github.com/sile/kurobako"
homepage = "https://github.com/optuna/kurobako"
repository = "https://github.com/optuna/kurobako"
readme = "README.md"
license = "MIT"

[badges]
coveralls = {repository = "sile/kurobako"}
coveralls = {repository = "optuna/kurobako"}

[dependencies]
chrono = { version = "0.4", features = ["serde"] }
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ kurobako

[![kurobako](https://img.shields.io/crates/v/kurobako.svg)](https://crates.io/crates/kurobako)
[![Documentation](https://docs.rs/kurobako/badge.svg)](https://docs.rs/kurobako)
[![Actions Status](https://github.com/sile/kurobako/workflows/CI/badge.svg)](https://github.com/sile/kurobako/actions)
[![Coverage Status](https://coveralls.io/repos/github/sile/kurobako/badge.svg?branch=master)](https://coveralls.io/github/sile/kurobako?branch=master)
[![Actions Status](https://github.com/optuna/kurobako/workflows/CI/badge.svg)](https://github.com/optuna/kurobako/actions)
[![Coverage Status](https://coveralls.io/repos/github/optuna/kurobako/badge.svg?branch=master)](https://coveralls.io/github/optuna/kurobako?branch=master)
[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
[![Docker Hub](https://img.shields.io/badge/docker-ready-blue.svg)](https://hub.docker.com/r/sile/kurobako)
Copy link
Member Author

Choose a reason for hiding this comment

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

Note that I keep the link untouched in this PR as the docker hub entry "optuna/kurobako" doesn't exist now.

Copy link
Member

Choose a reason for hiding this comment

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

Let's track it here #40.


Expand Down Expand Up @@ -32,12 +32,12 @@ Installation
Precompiled binaries for Linux are available in the [releases] page.

```console
$ curl -L https://github.com/sile/kurobako/releases/download/${VERSION}/kurobako-${VERSION}.linux-amd64 -o kurobako
$ curl -L https://github.com/optuna/kurobako/releases/download/${VERSION}/kurobako-${VERSION}.linux-amd64 -o kurobako
$ chmod +x kurobako
$ ./kurobako -h
```

[releases]: https://github.com/sile/kurobako/releases
[releases]: https://github.com/optuna/kurobako/releases

### Using Cargo

Expand Down Expand Up @@ -90,7 +90,7 @@ Solvers:
- [Optuna](https://github.com/optuna/optuna)

Problems:
- [NASBench](https://github.com/automl/nas_benchmarks) ([detail](https://github.com/sile/kurobako/wiki/NASBench))
- [NASBench](https://github.com/automl/nas_benchmarks) ([detail](https://github.com/optuna/kurobako/wiki/NASBench))
- [HPOBench](https://github.com/automl/nas_benchmarks)
- [sigopt/evalset](https://github.com/sigopt/evalset)
- [Two-objective ZDT functions](http://repository.ias.ac.in/9404/1/306.pdf)
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ FROM alpine
ARG KUROBAKO_VERSION=0.1.12

RUN apk --update add && apk add gnuplot curl font-noto
RUN curl -L https://github.com/sile/kurobako/releases/download/${KUROBAKO_VERSION}/kurobako-${KUROBAKO_VERSION}.linux-amd64 -o kurobako && chmod +x kurobako && mv kurobako /usr/local/bin/
RUN curl -L https://github.com/optuna/kurobako/releases/download/${KUROBAKO_VERSION}/kurobako-${KUROBAKO_VERSION}.linux-amd64 -o kurobako && chmod +x kurobako && mv kurobako /usr/local/bin/
ENTRYPOINT ["kurobako"]
7 changes: 3 additions & 4 deletions kurobako_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ version = "0.1.11"
authors = ["Takeru Ohta <[email protected]>"]
edition = "2018"
description = "Core crate for `kurobako`"
homepage = "https://github.com/sile/kurobako"
repository = "https://github.com/sile/kurobako"
homepage = "https://github.com/optuna/kurobako"
repository = "https://github.com/optuna/kurobako"
readme = "README.md"
license = "MIT"

[badges]
travis-ci = {repository = "sile/kurobako"}
codecov = {repository = "sile/kurobako"}
coveralls = {repository = "optuna/kurobako"}

[dependencies]
itertools = "0.10"
Expand Down
4 changes: 2 additions & 2 deletions kurobako_core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ kurobako_core

[![kurobako_core](https://img.shields.io/crates/v/kurobako_core.svg)](https://crates.io/crates/kurobako_core)
[![Documentation](https://docs.rs/kurobako_core/badge.svg)](https://docs.rs/kurobako_core)
[![Build Status](https://travis-ci.org/sile/kurobako.svg?branch=master)](https://travis-ci.org/sile/kurobako)
[![Actions Status](https://github.com/optuna/kurobako/workflows/CI/badge.svg)](https://github.com/optuna/kurobako/actions)
[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)


The core crate of [`kurobako_core`](https://github.com/sile/kurobako).
The core crate of [`kurobako_core`](https://github.com/optuna/kurobako).
10 changes: 5 additions & 5 deletions kurobako_core/src/hypervolume.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ pub fn compute(pts: &[Vec<f64>], ref_pt: &[f64]) -> f64 {

fn get_hypervolume_recursive(pts: &[Vec<f64>], ref_pt: &[f64]) -> f64 {
match pts.len() {
1 => get_hypervolume_two_points(&pts[0], &ref_pt),
1 => get_hypervolume_two_points(&pts[0], ref_pt),
Copy link
Member

Choose a reason for hiding this comment

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

2 => {
get_hypervolume_two_points(&pts[0], &ref_pt)
+ get_hypervolume_two_points(&pts[1], &ref_pt)
- get_hypervolume_two_points(&get_max_coordinates(&pts[0], &pts[1]), &ref_pt)
get_hypervolume_two_points(&pts[0], ref_pt)
+ get_hypervolume_two_points(&pts[1], ref_pt)
- get_hypervolume_two_points(&get_max_coordinates(&pts[0], &pts[1]), ref_pt)
}
_ => {
// get_exclusive_hypervolume depends on the points being sorted by the first dimension.
Expand Down Expand Up @@ -54,7 +54,7 @@ fn get_exclusive_hypervolume(pt: &[f64], pts: &[Vec<f64>], ref_pt: &[f64]) -> f6

if !pts.is_empty() {
let intersection_pts: Vec<Vec<f64>> = (0..pts.len())
.map(|i| get_max_coordinates(&pts[i], &pt))
.map(|i| get_max_coordinates(&pts[i], pt))
.collect();

limited_pts.push(intersection_pts[0].to_vec());
Expand Down
2 changes: 1 addition & 1 deletion kurobako_core/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//! The core crate of [`kurobako`](https://github.com/sile/kurobako).
//! The core crate of [`kurobako`](https://github.com/optuna/kurobako).
#![warn(missing_docs)]

#[macro_use]
Expand Down
4 changes: 2 additions & 2 deletions kurobako_core/src/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ impl FactoryRegistry {

/// Creates a problem factory associated with the given recipe JSON.
pub fn create_problem_factory_from_json(&self, json: &JsonRecipe) -> Result<BoxProblemFactory> {
track!((self.create_problem_factory)(&json, self); json)
track!((self.create_problem_factory)(json, self); json)
}

/// Creates a solver factory associated with the given recipe JSON.
pub fn create_solver_factory_from_json(&self, json: &JsonRecipe) -> Result<BoxSolverFactory> {
track!((self.create_solver_factory)(&json, self); json)
track!((self.create_solver_factory)(json, self); json)
}
}
impl fmt::Debug for FactoryRegistry {
Expand Down
7 changes: 3 additions & 4 deletions kurobako_problems/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ version = "0.1.13"
authors = ["Takeru Ohta <[email protected]>"]
edition = "2018"
description = "A collection of black-box optimization problems"
homepage = "https://github.com/sile/kurobako"
repository = "https://github.com/sile/kurobako"
homepage = "https://github.com/optuna/kurobako"
repository = "https://github.com/optuna/kurobako"
readme = "README.md"
license = "MIT"

[badges]
travis-ci = {repository = "sile/kurobako"}
codecov = {repository = "sile/kurobako"}
coveralls = {repository = "optuna/kurobako"}

[dependencies]
hdf5file = "0.1"
Expand Down
4 changes: 2 additions & 2 deletions kurobako_problems/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kurobako_problems

[![kurobako_problems](https://img.shields.io/crates/v/kurobako_problems.svg)](https://crates.io/crates/kurobako_problems)
[![Documentation](https://docs.rs/kurobako_problems/badge.svg)](https://docs.rs/kurobako_problems)
[![Build Status](https://travis-ci.org/sile/kurobako.svg?branch=master)](https://travis-ci.org/sile/kurobako)
[![Actions Status](https://github.com/optuna/kurobako/workflows/CI/badge.svg)](https://github.com/optuna/kurobako/actions)
[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)

Built-in problems of [`kurobako`](https://github.com/sile/kurobako).
Built-in problems of [`kurobako`](https://github.com/optuna/kurobako).
2 changes: 1 addition & 1 deletion kurobako_problems/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//! Built-in problems of [`kurobako`](https://github.com/sile/kurobako).
//! Built-in problems of [`kurobako`](https://github.com/optuna/kurobako).
#![warn(missing_docs)]

#[macro_use]
Expand Down
2 changes: 1 addition & 1 deletion kurobako_problems/src/surrogate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ impl ProblemRecipe for SurrogateProblemRecipe {
} else {
let mut cache = track!(CACHE.lock().map_err(Error::from))?;
if let Some(model) = cache.get(&model_path) {
Arc::clone(&model)
Arc::clone(model)
} else {
let model = track!(self.load_model(&model_path))?;
cache.insert(model_path, Arc::clone(&model));
Expand Down
7 changes: 3 additions & 4 deletions kurobako_solvers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ version = "0.2.1"
authors = ["Takeru Ohta <[email protected]>"]
edition = "2018"
description = "A collection of black-box optimization solvers"
homepage = "https://github.com/sile/kurobako"
repository = "https://github.com/sile/kurobako"
homepage = "https://github.com/optuna/kurobako"
repository = "https://github.com/optuna/kurobako"
readme = "README.md"
license = "MIT"

[badges]
travis-ci = {repository = "sile/kurobako"}
codecov = {repository = "sile/kurobako"}
coveralls = {repository = "optuna/kurobako"}

[dependencies]
kurobako_core = { path = "../kurobako_core/", version = "0.1" }
Expand Down
4 changes: 2 additions & 2 deletions kurobako_solvers/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kurobako_solvers

[![kurobako_solvers](https://img.shields.io/crates/v/kurobako_solvers.svg)](https://crates.io/crates/kurobako_solvers)
[![Documentation](https://docs.rs/kurobako_solvers/badge.svg)](https://docs.rs/kurobako_solvers)
[![Build Status](https://travis-ci.org/sile/kurobako.svg?branch=master)](https://travis-ci.org/sile/kurobako)
[![Actions Status](https://github.com/optuna/kurobako/workflows/CI/badge.svg)](https://github.com/optuna/kurobako/actions)
[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)

Built-in solvers of [`kurobako`](https://github.com/sile/kurobako).
Built-in solvers of [`kurobako`](https://github.com/optuna/kurobako).
2 changes: 1 addition & 1 deletion kurobako_solvers/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//! Built-in solvers of [`kurobako`](https://github.com/sile/kurobako).
//! Built-in solvers of [`kurobako`](https://github.com/optuna/kurobako).
#![warn(missing_docs)]

#[macro_use]
Expand Down
2 changes: 1 addition & 1 deletion src/plot/curve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ impl PlotCurveOpt {
let pb = ProgressBar::new(problems.len() as u64);
let template =
"(PLOT) [{elapsed_precise}] [{pos}/{len} {percent:>3}%] [ETA {eta:>3}] {msg}";
pb.set_style(ProgressStyle::default_bar().template(&template));
pb.set_style(ProgressStyle::default_bar().template(template));

track!(fs::create_dir_all(&self.output_dir).map_err(Error::from); self.output_dir)?;

Expand Down
2 changes: 1 addition & 1 deletion src/plot/pareto_front.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ impl PlotParetoFrontOpt {
let pb = ProgressBar::new(studies.len() as u64);
let template =
"(PLOT) [{elapsed_precise}] [{pos}/{len} {percent:>3}%] [ETA {eta:>3}] {msg}";
pb.set_style(ProgressStyle::default_bar().template(&template));
pb.set_style(ProgressStyle::default_bar().template(template));

track!(fs::create_dir_all(&self.output_dir).map_err(Error::from); self.output_dir)?;

Expand Down
2 changes: 1 addition & 1 deletion src/plot/slice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ impl PlotSliceOpt {
ProgressBar::new(studies.iter().map(|(_, s)| s.params_len()).sum::<usize>() as u64);
let template =
"(PLOT) [{elapsed_precise}] [{pos}/{len} {percent:>3}%] [ETA {eta:>3}] {msg}";
pb.set_style(ProgressStyle::default_bar().template(&template));
pb.set_style(ProgressStyle::default_bar().template(template));

track!(fs::create_dir_all(&self.output_dir).map_err(Error::from); self.output_dir)?;

Expand Down
2 changes: 1 addition & 1 deletion src/report.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ impl Reporter {

let mut list = writer.list();
track!(list.item(&format!(
"Kurobako Version: [{}](https://github.com/sile/kurobako/tree/{})",
"Kurobako Version: [{}](https://github.com/optuna/kurobako/tree/{})",
env!("CARGO_PKG_VERSION"),
env!("CARGO_PKG_VERSION"),
)))?;
Expand Down