Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update changelog and manifests #48

Merged
merged 13 commits into from
Apr 20, 2024
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ jobs:
# generate raw coverage data
# excluding the benchmark / example crates to remove some bias
- name: Build code
run: cargo build --features utils --workspace --exclude honeycomb-benches --exclude honeycomb-examples
run: cargo build --features utils --workspace --exclude honeycomb-benches --exclude honeycomb-examples --exclude honeycomb-render
env:
RUSTFLAGS: "-Cinstrument-coverage"
LLVM_PROFILE_FILE: "cargo-test-%p-%m.profraw"
- name: Run tests
run: cargo test --features utils --workspace --exclude honeycomb-benches --exclude honeycomb-examples
run: cargo test --features utils --workspace --exclude honeycomb-benches --exclude honeycomb-examples --exclude honeycomb-render
env:
RUSTFLAGS: "-Cinstrument-coverage"
LLVM_PROFILE_FILE: "cargo-test-%p-%m.profraw"
Expand Down
44 changes: 42 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,48 @@
[workspace]

members = ["honeycomb-benches", "honeycomb-core", "honeycomb-render", "honeycomb-examples"]

resolver = "2"
members = [
"honeycomb-benches",
"honeycomb-core",
"honeycomb-render",
"honeycomb-examples"
]

[workspace.package]
edition = "2021"
license = "MIT OR Apache-2.0"
version = "0.2.0"
homepage = "https://lihpc-computational-geometry.github.io/honeycomb/"
repository = "https://github.com/LIHPC-Computational-Geometry/honeycomb"
description = "Combinatorial map implementation for meshing applications"
authors = ["Isaie Muron <[email protected]>", "Cedric Chevalier <[email protected]>"]

[workspace.dependencies]
# members
honeycomb-benches = { version = "0.2.0", path = "./honeycomb-benches" }
honeycomb-core = { version = "0.2.0", path = "./honeycomb-core" }
honeycomb-examples = { version = "0.2.0", path = "./honeycomb-examples" }
honeycomb-render = { version = "0.2.0", path = "./honeycomb-render" }

# common
cfg-if = "1"

# core
num = "0.4.2"

# benchmarks
criterion = "0.5.1"
iai-callgrind = "0.10.2"
rand = "0.8.5"

# render
bytemuck = "1.15.0"
cgmath = "0.18.0"
env_logger = "0.11.3"
pollster = "0.3.0"
smaa = "0.13.0"
wgpu = "0.19.4"
winit = "0.29.15"

[profile.bench]
debug = true
18 changes: 12 additions & 6 deletions honeycomb-benches/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
[package]
name = "honeycomb-benches"
version = "0.1.3"
edition = "2021"
edition.workspace = true
license.workspace = true
version.workspace = true
homepage.workspace = true
repository.workspace = true
description = "Core structure benchmarks"
authors.workspace = true
publish = false

[dev-dependencies]
honeycomb-core = { path = "../honeycomb-core", features = ["utils"] }
criterion = { version = "*", features = ["html_reports"] }
iai-callgrind = "*"
rand = { version = "*", features = ["small_rng"] }
honeycomb-core = { workspace = true, features = ["utils"] }
criterion = { workspace = true, features = ["html_reports"] }
iai-callgrind.workspace = true
rand = { workspace = true, features = ["small_rng"] }

# Iai-callgrind benchmarks

Expand Down
14 changes: 10 additions & 4 deletions honeycomb-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
[package]
name = "honeycomb-core"
version = "0.1.3"
edition = "2021"
edition.workspace = true
license.workspace = true
version.workspace = true
homepage.workspace = true
repository.workspace = true
description = "Core structure implementation"
authors.workspace = true
publish = true

[features]
utils = []
single_precision = []

[dependencies]
cfg-if = "1"
num = "0.4"
cfg-if.workspace = true
num.workspace = true
14 changes: 10 additions & 4 deletions honeycomb-examples/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
[package]
name = "honeycomb-examples"
version = "0.1.3"
edition = "2021"
edition.workspace = true
license.workspace = true
version.workspace = true
homepage.workspace = true
repository.workspace = true
description = "Usage examples"
authors.workspace = true
publish = false

[dev-dependencies]
honeycomb-core = { path = "../honeycomb-core", features = ["utils"] }
honeycomb-render = { path = "../honeycomb-render" }
honeycomb-core = { workspace = true, features = ["utils"] }
honeycomb-render = { workspace = true }

[[example]]
name = "memory_usage"
Expand Down
30 changes: 18 additions & 12 deletions honeycomb-render/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
[package]
name = "honeycomb-render"
version = "0.1.3"
edition = "2021"
edition.workspace = true
license.workspace = true
version.workspace = true
homepage.workspace = true
repository.workspace = true
description = "Visualization tool"
authors.workspace = true
publish = true

[lib]
crate-type = ["cdylib", "rlib"]

[dependencies]
cfg-if = "1"
wgpu = "0.19"
winit = "0.29"
env_logger = "0.11"
pollster = "0.3"
cgmath = "0.18"
bytemuck = { version = "1.14", features = ["derive"] }
honeycomb-core = { path = "../honeycomb-core" }
smaa = "0.13"
bytemuck = { workspace = true, features = ["derive"] }
cfg-if.workspace = true
cgmath.workspace = true
env_logger.workspace = true
honeycomb-core.workspace = true
pollster.workspace = true
smaa.workspace = true
wgpu.workspace = true
winit.workspace = true

[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1.6"
console_log = "1.0"
wgpu = { version = "0.19", features = ["webgl"] }
wasm-bindgen = "0.2"
wasm-bindgen-futures = "0.4"
web-sys = { version = "0.3", features = ["Document", "Window", "Element"] }
wgpu = { workspace = true, features = ["webgl"] }