Skip to content

Commit

Permalink
chore: update changelog and manifests (#48)
Browse files Browse the repository at this point in the history
* chore: bump members' manifest version

* ci: exclude render from coverage test

* chore: complete the workspace manifest with project info

* chore: update bench crate manifest

- remove wildcard version
- propagate workspace info

* chore: update core & render manifests

* chore: update example crate manifest

* chore: centralize inner deps in workspace manifest

* chore: add deps to workspace manifest

* chore: replace render deps with workspace's ref

* chore: format workspace manifest

* chore: finish replacing deps with workspace refs

* chore: finish updating manifests

* chore: update changelog
  • Loading branch information
imrn99 authored Apr 20, 2024
1 parent 0f33e1d commit 4181d7f
Show file tree
Hide file tree
Showing 7 changed files with 114 additions and 30 deletions.
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
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@

## To be released

...

---

## 0.2.0

**This update contains breaking changes**

### New features
Expand Down Expand Up @@ -66,6 +72,11 @@ aspects of the project</sup>
- add support for incomplete vertex orbits in `Orbit2` implementation (#36)
- remove `darts`, `embed` modules and their content (#42)
- move ID aliases to `cells` and `cells::collections` modules
- update the `CMap2` quickstart example (#43)
- change the `CMap2::n_darts` method's return type to be more intuitive (#45)
- add the `CMap2::n_unused_darts` method to provide an alternative to the old method
- remove the `CMap2::set_beta` method because of the lack of valid use case (#45)
- gate the `CMap2::set_betas` behind the `utils` feature (#45)

#### honeycomb-guide

Expand Down
47 changes: 45 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,51 @@
[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"
readme = "README.md"
description = "Combinatorial map implementation for meshing applications"
categories = ["data-structures", "mathematics", "science"]
keywords = ["mesh", "meshing"]
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
17 changes: 13 additions & 4 deletions honeycomb-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
[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
readme.workspace = true
description = "Core structure implementation for combinatorial maps"
categories.workspace = true
keywords.workspace = true
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
33 changes: 21 additions & 12 deletions honeycomb-render/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,26 +1,35 @@
[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
readme.workspace = true
description = "Visualization tool for combinatorial maps"
categories.workspace = true
keywords.workspace = true
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"] }

0 comments on commit 4181d7f

Please sign in to comment.