From b7f7dbcaf3ab715b7ff5f292883100c44eea1638 Mon Sep 17 00:00:00 2001 From: Ken Swanson Date: Tue, 6 Feb 2024 17:41:13 -0600 Subject: [PATCH 1/3] Update versions --- book/lace_preprocess_mdbook_yaml/Cargo.toml | 4 ++-- cli/Cargo.toml | 4 ++-- lace/Cargo.lock | 16 ++++++++-------- lace/Cargo.toml | 16 ++++++++-------- lace/lace_cc/Cargo.toml | 12 ++++++------ lace/lace_codebook/Cargo.toml | 8 ++++---- lace/lace_data/Cargo.toml | 4 ++-- lace/lace_geweke/Cargo.toml | 6 +++--- lace/lace_metadata/Cargo.toml | 10 +++++----- lace/lace_stats/Cargo.toml | 6 +++--- lace/lace_utils/Cargo.toml | 2 +- pylace/Cargo.toml | 6 +++--- pylace/pyproject.toml | 2 +- 13 files changed, 48 insertions(+), 48 deletions(-) diff --git a/book/lace_preprocess_mdbook_yaml/Cargo.toml b/book/lace_preprocess_mdbook_yaml/Cargo.toml index 97ccb431..b202e30a 100644 --- a/book/lace_preprocess_mdbook_yaml/Cargo.toml +++ b/book/lace_preprocess_mdbook_yaml/Cargo.toml @@ -16,8 +16,8 @@ path = "src/main.rs" anyhow = "1.0" clap = "4.2" env_logger = "0.10" -lace_codebook = { path = "../../lace/lace_codebook", version = "0.5.0" } -lace_stats = { path = "../../lace/lace_stats", version = "0.2.1" } +lace_codebook = { path = "../../lace/lace_codebook", version = "0.6.0" } +lace_stats = { path = "../../lace/lace_stats", version = "0.3.0" } log = "0.4" mdbook = "0.4" pulldown-cmark = { version = "0.9", default-features = false } diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 77de74a1..38d9689b 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lace-cli" -version = "0.6.0" +version = "0.7.0" authors = ["Promised AI"] edition = "2021" rust-version = "1.62.0" @@ -17,7 +17,7 @@ name = "lace" path = "src/main.rs" [dependencies] -lace = { path = "../lace", version = "0.6.0", features = ["formats", "ctrlc_handler"]} +lace = { path = "../lace", version = "0.7.0", features = ["formats", "ctrlc_handler"]} clap = { version = "4.3.17", features = ["derive"] } env_logger = "0.10" serde_yaml = "0.9.4" diff --git a/lace/Cargo.lock b/lace/Cargo.lock index cf1b426e..7e45cc4c 100644 --- a/lace/Cargo.lock +++ b/lace/Cargo.lock @@ -1141,7 +1141,7 @@ dependencies = [ [[package]] name = "lace" -version = "0.6.0" +version = "0.7.0" dependencies = [ "approx", "clap", @@ -1176,7 +1176,7 @@ dependencies = [ [[package]] name = "lace_cc" -version = "0.5.0" +version = "0.6.0" dependencies = [ "approx", "criterion", @@ -1198,7 +1198,7 @@ dependencies = [ [[package]] name = "lace_codebook" -version = "0.5.0" +version = "0.6.0" dependencies = [ "indoc", "lace_consts", @@ -1221,7 +1221,7 @@ dependencies = [ [[package]] name = "lace_data" -version = "0.2.0" +version = "0.3.0" dependencies = [ "approx", "lace_utils", @@ -1232,7 +1232,7 @@ dependencies = [ [[package]] name = "lace_geweke" -version = "0.2.1" +version = "0.3.0" dependencies = [ "indicatif", "lace_stats", @@ -1244,7 +1244,7 @@ dependencies = [ [[package]] name = "lace_metadata" -version = "0.5.0" +version = "0.6.0" dependencies = [ "bincode", "hex", @@ -1264,7 +1264,7 @@ dependencies = [ [[package]] name = "lace_stats" -version = "0.2.1" +version = "0.3.0" dependencies = [ "approx", "criterion", @@ -1281,7 +1281,7 @@ dependencies = [ [[package]] name = "lace_utils" -version = "0.2.0" +version = "0.3.0" dependencies = [ "approx", "rand", diff --git a/lace/Cargo.toml b/lace/Cargo.toml index 68de28a6..62cd52e0 100644 --- a/lace/Cargo.toml +++ b/lace/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lace" -version = "0.6.0" +version = "0.7.0" authors = ["Promised AI"] build = "build.rs" edition = "2021" @@ -31,14 +31,14 @@ name = "lace" path = "src/lib.rs" [dependencies] -lace_cc = { path = "lace_cc", version = "0.5.0" } -lace_utils = { path = "lace_utils", version = "0.2.0" } -lace_stats = { path = "lace_stats", version = "0.2.1" } -lace_codebook = { path = "lace_codebook", version = "0.5.0", default_features=false} -lace_geweke = { path = "lace_geweke", version = "0.2.1" } +lace_cc = { path = "lace_cc", version = "0.6.0" } +lace_utils = { path = "lace_utils", version = "0.3.0" } +lace_stats = { path = "lace_stats", version = "0.3.0" } +lace_codebook = { path = "lace_codebook", version = "0.6.0", default_features=false} +lace_geweke = { path = "lace_geweke", version = "0.3.0" } lace_consts = { path = "lace_consts", version = "0.2.1" } -lace_data = { path = "lace_data", version = "0.2.0" } -lace_metadata = { path = "lace_metadata", version = "0.5.0" } +lace_data = { path = "lace_data", version = "0.3.0" } +lace_metadata = { path = "lace_metadata", version = "0.6.0" } dirs = { version="5", optional = true} num = "0.4" rand_xoshiro = { version="0.6", features = ["serde1"] } diff --git a/lace/lace_cc/Cargo.toml b/lace/lace_cc/Cargo.toml index a4017195..08078830 100644 --- a/lace/lace_cc/Cargo.toml +++ b/lace/lace_cc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lace_cc" -version = "0.5.0" +version = "0.6.0" authors = ["Promised AI"] edition = "2021" exclude = ["tests/*", "resources/test/*", "target/*"] @@ -10,12 +10,12 @@ repository = "https://github.com/promised-ai/lace" description = "Core of the Lace cross-categorization engine library" [dependencies] -lace_utils = { path = "../lace_utils", version = "0.2.0" } -lace_stats = { path = "../lace_stats", version = "0.2.1" } -lace_geweke = { path = "../lace_geweke", version = "0.2.1" } +lace_utils = { path = "../lace_utils", version = "0.3.0" } +lace_stats = { path = "../lace_stats", version = "0.3.0" } +lace_geweke = { path = "../lace_geweke", version = "0.3.0" } lace_consts = { path = "../lace_consts", version = "0.2.1" } -lace_data = { path = "../lace_data", version = "0.2.0" } -lace_codebook = { path = "../lace_codebook", version = "0.5.0" } +lace_data = { path = "../lace_data", version = "0.3.0" } +lace_codebook = { path = "../lace_codebook", version = "0.6.0" } rand = {version="0.8", features=["serde1"]} rayon = "1.5" serde = { version = "1", features = ["derive"] } diff --git a/lace/lace_codebook/Cargo.toml b/lace/lace_codebook/Cargo.toml index 9c22b8d3..824a12ba 100644 --- a/lace/lace_codebook/Cargo.toml +++ b/lace/lace_codebook/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lace_codebook" -version = "0.5.0" +version = "0.6.0" authors = ["Promised.ai"] edition = "2021" license = "BUSL-1.1" @@ -10,9 +10,9 @@ description = "Contains the Lace codebook specification as well as utilities for [dependencies] lace_consts = { path = "../lace_consts", version = "0.2.1" } -lace_stats = { path = "../lace_stats", version = "0.2.1" } -lace_utils = { path = "../lace_utils", version = "0.2.0" } -lace_data = { path = "../lace_data", version = "0.2.0" } +lace_stats = { path = "../lace_stats", version = "0.3.0" } +lace_utils = { path = "../lace_utils", version = "0.3.0" } +lace_data = { path = "../lace_data", version = "0.3.0" } serde = { version = "1", features = ["derive"] } serde_yaml = "0.9.4" thiserror = "1.0.11" diff --git a/lace/lace_data/Cargo.toml b/lace/lace_data/Cargo.toml index 2af4a638..bd30776b 100644 --- a/lace/lace_data/Cargo.toml +++ b/lace/lace_data/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lace_data" -version = "0.2.0" +version = "0.3.0" authors = ["Promised AI"] edition = "2021" license = "BUSL-1.1" @@ -9,7 +9,7 @@ repository = "https://github.com/promised-ai/lace" description = "Data definitions and data container definitions for Lace" [dependencies] -lace_utils = { path = "../lace_utils", version = "0.2.0" } +lace_utils = { path = "../lace_utils", version = "0.3.0" } serde = { version = "1", features = ["derive"] } thiserror = "1.0.19" diff --git a/lace/lace_geweke/Cargo.toml b/lace/lace_geweke/Cargo.toml index 2d24d25a..34920f4e 100644 --- a/lace/lace_geweke/Cargo.toml +++ b/lace/lace_geweke/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lace_geweke" -version = "0.2.1" +version = "0.3.0" authors = ["Promised AI"] edition = "2021" license = "BUSL-1.1" @@ -9,8 +9,8 @@ repository = "https://github.com/promised-ai/lace" description = "Geweke tester for Lace" [dependencies] -lace_stats = { path = "../lace_stats", version = "0.2.1" } -lace_utils = { path = "../lace_utils", version = "0.2.0" } +lace_stats = { path = "../lace_stats", version = "0.3.0" } +lace_utils = { path = "../lace_utils", version = "0.3.0" } serde = { version = "1", features = ["derive"] } serde_yaml = "0.9.4" indicatif = "0.17" diff --git a/lace/lace_metadata/Cargo.toml b/lace/lace_metadata/Cargo.toml index 06765057..8662dd51 100644 --- a/lace/lace_metadata/Cargo.toml +++ b/lace/lace_metadata/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lace_metadata" -version = "0.5.0" +version = "0.6.0" authors = ["Promised AI"] edition = "2021" license = "BUSL-1.1" @@ -9,10 +9,10 @@ repository = "https://github.com/promised-ai/lace" description = "Archive of the metadata (savefile) formats for Lace. In charge of versioning and conversion." [dependencies] -lace_stats = { path = "../lace_stats", version = "0.2.1" } -lace_data = { path = "../lace_data", version = "0.2.0" } -lace_codebook = { path = "../lace_codebook", version = "0.5.0" } -lace_cc = { path = "../lace_cc", version = "0.5.0" } +lace_stats = { path = "../lace_stats", version = "0.3.0" } +lace_data = { path = "../lace_data", version = "0.3.0" } +lace_codebook = { path = "../lace_codebook", version = "0.6.0" } +lace_cc = { path = "../lace_cc", version = "0.6.0" } serde = { version = "1", features = ["derive"] } serde_yaml = "0.9.4" serde_json = "1" diff --git a/lace/lace_stats/Cargo.toml b/lace/lace_stats/Cargo.toml index 3d3be881..c402aba6 100644 --- a/lace/lace_stats/Cargo.toml +++ b/lace/lace_stats/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lace_stats" -version = "0.2.1" +version = "0.3.0" rust-version = "1.62.0" authors = ["Promised AI"] edition = "2021" @@ -10,9 +10,9 @@ repository = "https://github.com/promised-ai/lace" description = "Contains component model and hyperprior specifications" [dependencies] -lace_utils = { path = "../lace_utils", version = "0.2.0" } +lace_utils = { path = "../lace_utils", version = "0.3.0" } lace_consts = { path = "../lace_consts", version = "0.2.1" } -lace_data = { path = "../lace_data", version = "0.2.0" } +lace_data = { path = "../lace_data", version = "0.3.0" } special = "0.10" rand = {version="0.8", features=["serde1"]} itertools = "0.12" diff --git a/lace/lace_utils/Cargo.toml b/lace/lace_utils/Cargo.toml index 06d6a7e6..1ce91ab5 100644 --- a/lace/lace_utils/Cargo.toml +++ b/lace/lace_utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lace_utils" -version = "0.2.0" +version = "0.3.0" authors = ["Promised AI"] edition = "2021" license = "BUSL-1.1" diff --git a/pylace/Cargo.toml b/pylace/Cargo.toml index 3a40fd56..cf79975c 100644 --- a/pylace/Cargo.toml +++ b/pylace/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pylace" -version = "0.6.0" +version = "0.7.0" edition = "2021" license = "BUSL-1.1" @@ -9,8 +9,8 @@ name = "lace" crate-type = ["cdylib"] [dependencies] -lace = { path = "../lace", version="0.6.0" } -lace_utils = { path = "../lace/lace_utils", version="0.2.0" } +lace = { path = "../lace", version="0.7.0" } +lace_utils = { path = "../lace/lace_utils", version="0.3.0" } rand = "0.8.5" rand_xoshiro = "0.6.0" pyo3 = { version = "0.20", features = ["extension-module"] } diff --git a/pylace/pyproject.toml b/pylace/pyproject.toml index 7f5c9712..026fbf12 100644 --- a/pylace/pyproject.toml +++ b/pylace/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "maturin" [project] name = "pylace" -version = "0.6.0" +version = "0.7.0" description = "A probabalistic programming ML tool for science" requires-python = ">=3.8" classifiers = [ From 1b335d78efa0c8d849808f4217ce3dfe96293ea1 Mon Sep 17 00:00:00 2001 From: Ken Swanson Date: Tue, 6 Feb 2024 18:11:14 -0600 Subject: [PATCH 2/3] Parsed the `CHANGELOG` and assigned items to the new releases --- CHANGELOG.md | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 665e2885..1cc553d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,20 +7,39 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [python-0.7.0] - 2024-02-07 + +### Added + +- `Engine.update` uses `tqdm.auto` for progress bar reporting, to support progress bars in notebooks +- Added `flat_columns` option to `Engine` constructor to enable creating engines with one view +- Added `variability` method to `Engine` + +### Changed + +- Improved errors in type conversions. +- Rearranged test execution + +### Fixed + +- Default transition sets now hit all required transitions +- Fixed typo in internal `Dimension` class + +## [rust-0.7.0] - 2024-02-07 + ### Added + - `DataParseError::CodebookAndDataRowsMismatch` variant for when the number of rows in the codebook and the number of rows in the data do not match. - `DataParseError::DataFrameMissingColumn` variant for when a column is in the codebook but not in the initial dataframe. -- Python's `Engine.update` uses `tqdm.auto` for progress bar reporting. -- Added `flat_columns` option to pylace `Engine` constructor to enable creating engines with one view +- Added `variability` method to `OraceT` trait ### Changed + - Added parallelism to `Slice` row reassignment kernel. Run time is ~6x faster. -- (Python) Improved errors in type conversions. ### Fixed -- Initializing an engine with a codebook that has a different number of rows than the data will result in an error instead of printing a bunch on nonsense. -- Pylace default transition sets didn't hit all required transitions -- Typo in pylace internal `Dimension` class + +- Initializing an engine with a codebook that has a different number of rows than the data will result in an error instead of printing a bunch of nonsense. ## [python-0.6.0] - 2024-01-23 @@ -242,7 +261,9 @@ Initial release on [PyPi](https://pypi.org/) Initial release on [crates.io](https://crates.io/) -[unreleased]: https://github.com/promised-ai/lace/compare/python-0.6.0...HEAD +[unreleased]: https://github.com/promised-ai/lace/compare/python-0.7.0...HEAD +[python-0.7.0]: https://github.com/promised-ai/lace/compare/python-0.6.0...python-0.7.0 +[rust-0.7.0]: https://github.com/promised-ai/lace/compare/rust-0.6.0...rust-0.7.0 [python-0.6.0]: https://github.com/promised-ai/lace/compare/python-0.5.0...python-0.6.0 [rust-0.6.0]: https://github.com/promised-ai/lace/compare/rust-0.5.0...rust-0.6.0 [python-0.5.0]: https://github.com/promised-ai/lace/compare/python-0.4.1...python-0.5.0 From 89377150f4393458eae01d776ca8502909592368 Mon Sep 17 00:00:00 2001 From: Ken Swanson Date: Tue, 6 Feb 2024 18:14:18 -0600 Subject: [PATCH 3/3] Updated Citation entries --- CITATION.cff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index d912001d..153a78d9 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -34,5 +34,5 @@ keywords: - Bayesian - Machine Learning license: BUSL-1.1 -version: 0.6.0 -date-released: '2024-01-23' +version: 0.7.0 +date-released: '2024-02-07'