From 16c367ce20d7264cfcaf63edfe46df18a7a8f8fe Mon Sep 17 00:00:00 2001 From: Magnus Ulimoen Date: Thu, 20 Aug 2020 21:07:30 +0200 Subject: [PATCH] Update dependencies and package structure --- Cargo.toml | 13 ++++--------- maxwell/Cargo.toml | 2 +- multigrid/Cargo.toml | 2 +- multigrid/src/main.rs | 1 - src/lib.rs | 0 5 files changed, 6 insertions(+), 12 deletions(-) delete mode 100644 src/lib.rs diff --git a/Cargo.toml b/Cargo.toml index f661bf6..98f5478 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,10 +1,3 @@ -[package] -name = "diffsolver" -version = "0.1.1" -authors = ["Magnus Ulimoen "] -edition = "2018" - - [workspace] members = [ "sbp", @@ -15,6 +8,8 @@ members = [ "shallow_water", ] +default-members = ["sbp", "euler", "maxwell", "shallow_water"] + [profile.bench] debug = true @@ -23,5 +18,5 @@ debug = true [patch] [patch.crates-io] -hdf5 = { git = "https://github.com/mulimoen/hdf5-rust.git", branch = "master" } -sprs = { git = "https://github.com/vbarrielle/sprs.git" } +hdf5 = { git = "https://github.com/mulimoen/hdf5-rust.git", branch = "feature/resizable_idx" } +hdf5-sys = { git = "https://github.com/mulimoen/hdf5-rust.git", branch = "feature/resizable_idx" } diff --git a/maxwell/Cargo.toml b/maxwell/Cargo.toml index e3d96cf..4949467 100644 --- a/maxwell/Cargo.toml +++ b/maxwell/Cargo.toml @@ -10,7 +10,7 @@ sparse = ["sbp/sparse", "sprs"] [dependencies] ndarray = "0.13.1" sbp = { path = "../sbp" } -sprs = { version = "0.7.1", optional = true } +sprs = { version = "0.8.0", optional = true } [dev-dependencies] criterion = "0.3.2" diff --git a/multigrid/Cargo.toml b/multigrid/Cargo.toml index 96bc3a2..d34a026 100644 --- a/multigrid/Cargo.toml +++ b/multigrid/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] sbp = { path = "../sbp", features = ["rayon"] } euler = { path = "../euler" } -hdf5 = { version = "0.6.1", features = ["static", "gzip"] } +hdf5 = "0.7.0" rayon = "1.3.0" indicatif = "0.14.0" structopt = "0.3.14" diff --git a/multigrid/src/main.rs b/multigrid/src/main.rs index 80cff29..ca2b298 100644 --- a/multigrid/src/main.rs +++ b/multigrid/src/main.rs @@ -1,4 +1,3 @@ -#![feature(str_strip)] use either::*; use structopt::StructOpt; diff --git a/src/lib.rs b/src/lib.rs deleted file mode 100644 index e69de29..0000000